Merge remote-tracking branch 'origin/develop' into release/1.3.0-beta

alibaba · Jan 12, 2024 · 0724922 · 0724922
2 parents 684ccb8 + 1132a30
commit 0724922
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git 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
@@ -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<IProps> {
     if (onMount) {
       onMount(this.designer);
     }
-    clipboard.injectCopyPaster(document);
     this.designer.postEvent('mount', this.designer);
   }
 

diff --git 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<IPublicTypeNodeSchema[]> {
           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;
             }