From 34a5a11b49cac4eddd0a4871cf0bb7e16543a493 Mon Sep 17 00:00:00 2001 From: liujuping Date: Fri, 12 Jan 2024 15:51:18 +0800 Subject: [PATCH 1/2] fix: fix clipboard.setData fial in workspace mode --- packages/designer/src/designer/clipboard.ts | 4 ++++ packages/designer/src/designer/designer-view.tsx | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/designer/src/designer/clipboard.ts b/packages/designer/src/designer/clipboard.ts index 941f91442..26f57f811 100644 --- a/packages/designer/src/designer/clipboard.ts +++ b/packages/designer/src/designer/clipboard.ts @@ -36,6 +36,10 @@ class Clipboard implements IClipboard { private waitFn?: (data: any, e: ClipboardEvent) => void; + constructor() { + this.injectCopyPaster(document); + } + isCopyPasteEvent(e: Event) { this.isCopyPaster(e.target); } diff --git a/packages/designer/src/designer/designer-view.tsx b/packages/designer/src/designer/designer-view.tsx index 0db2a3fa3..aaf0c9583 100644 --- a/packages/designer/src/designer/designer-view.tsx +++ b/packages/designer/src/designer/designer-view.tsx @@ -4,7 +4,6 @@ import BuiltinDragGhostComponent from './drag-ghost'; import { Designer, DesignerProps } from './designer'; import { ProjectView } from '../project'; import './designer.less'; -import { clipboard } from './clipboard'; type IProps = DesignerProps & { designer?: Designer; @@ -44,7 +43,6 @@ export class DesignerView extends Component { if (onMount) { onMount(this.designer); } - clipboard.injectCopyPaster(document); this.designer.postEvent('mount', this.designer); } From 1132a30483e31d82e33d8aa036f6733bfad67483 Mon Sep 17 00:00:00 2001 From: liujuping Date: Fri, 12 Jan 2024 15:52:36 +0800 Subject: [PATCH 2/2] feat: update context-menu message --- .../src/inner-plugins/default-context-menu.ts | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/engine/src/inner-plugins/default-context-menu.ts b/packages/engine/src/inner-plugins/default-context-menu.ts index c8997aa7e..81978d920 100644 --- a/packages/engine/src/inner-plugins/default-context-menu.ts +++ b/packages/engine/src/inner-plugins/default-context-menu.ts @@ -8,7 +8,7 @@ import { IPublicTypeNodeSchema, } from '@alilc/lowcode-types'; import { isProjectSchema } from '@alilc/lowcode-utils'; -import { Notification } from '@alifd/next'; +import { Message } from '@alifd/next'; import { intl } from '../locale'; function getNodesSchema(nodes: IPublicModelNode[]) { @@ -27,19 +27,13 @@ async function getClipboardText(): Promise { if (isProjectSchema(data)) { resolve(data.componentsTree); } else { - Notification.open({ - content: intl('NotValidNodeData'), - type: 'error', - }); + Message.error(intl('NotValidNodeData')); reject( new Error(intl('NotValidNodeData')), ); } } catch (error) { - Notification.open({ - content: intl('NotValidNodeData'), - type: 'error', - }); + Message.error(intl('NotValidNodeData')); reject(error); } }, @@ -143,10 +137,7 @@ export const defaultContextMenu = (ctx: IPublicModelPluginContext) => { return doc?.checkNesting(parent, dragNodeObject); }); if (canAddNodes.length === 0) { - Notification.open({ - content: `${nodeSchema.map(d => utilsIntl(d.title || d.componentName)).join(',')}等组件无法放置到${utilsIntl(parent.title || parent.componentName as any)}内`, - type: 'error', - }); + Message.error(`${nodeSchema.map(d => utilsIntl(d.title || d.componentName)).join(',')}等组件无法放置到${utilsIntl(parent.title || parent.componentName as any)}内`); return; } const nodes: IPublicModelNode[] = []; @@ -194,10 +185,7 @@ export const defaultContextMenu = (ctx: IPublicModelPluginContext) => { return doc?.checkNesting(node, dragNodeObject); }); if (canAddNodes.length === 0) { - Notification.open({ - content: `${nodeSchema.map(d => utilsIntl(d.title || d.componentName)).join(',')}等组件无法放置到${utilsIntl(node.title || node.componentName as any)}内`, - type: 'error', - }); + Message.error(`${nodeSchema.map(d => utilsIntl(d.title || d.componentName)).join(',')}等组件无法放置到${utilsIntl(node.title || node.componentName as any)}内`); return; }