@tmagic/editor 1.0.0-rc.3 → 1.0.0-rc.4

package/dist/types/src/services/BaseService.d.ts

@@ -27,7 +27,7 @@ import { EventEmitter } from 'events';
  *    editorService.afterAdd();
  *   }
  *
- * 调用时的参数会透传到before方法的参数中, 然后before的return 会作为原方法的参数和after的参数，after最后一个参数则是原方法的return值;
+ * 调用时的参数会透传到before方法的参数中, 然后before的return 会作为原方法的参数和after的参数，after第一个参数则是原方法的return值;
  * 如需终止后续方法调用可以return new Error();
  *
  * 方法2：

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.4",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,11 +45,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "^1.0.0-rc.3",
-    "@tmagic/form": "^1.0.0-rc.3",
-    "@tmagic/schema": "^1.0.0-rc.3",
-    "@tmagic/stage": "^1.0.0-rc.3",
-    "@tmagic/utils": "^1.0.0-rc.3",
+    "@tmagic/core": "^1.0.0-rc.4",
+    "@tmagic/form": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/utils": "^1.0.0-rc.4",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "element-plus": "^2.2.0",
@@ -88,5 +88,5 @@
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
   },
-  "gitHead": "d9f6ca25a0a6efba35d183e643a306e164b74af7"
+  "gitHead": "28d5ad4573a27fa240f5e7d0902d3368e8d936b6"
 }

package/src/components/ContentMenu.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="menuData.length" v-show="visible" class="magic-editor-content-menu" ref="menu" :style="menuStyle">
+  <div v-if="menuData.length && visible" class="magic-editor-content-menu" ref="menu" :style="menuStyle">
     <div>
       <tool-button
         v-for="(item, index) in menuData"

package/src/layouts/sidebar/TabPane.vue

@@ -30,7 +30,7 @@ export default defineComponent({
 
   props: {
     data: {
-      type: Object as PropType<SideItem>,
+      type: [Object, String] as PropType<SideItem>,
     },
   },
 

package/src/layouts/workspace/ViewerMenu.vue

@@ -69,8 +69,20 @@ export default defineComponent({
           text: '粘贴',
           display: () => canPaste.value,
           handler: () => {
-            const top = menu.value?.$el.offsetTop || 0;
-            const left = menu.value?.$el.offsetLeft || 0;
+            const stage = editorService?.get<StageCore>('stage');
+
+            const rect = menu.value?.$el.getBoundingClientRect();
+            const parentRect = stage?.container?.getBoundingClientRect();
+            let left = (rect?.left || 0) - (parentRect?.left || 0);
+            let top = (rect?.top || 0) - (parentRect?.top || 0);
+
+            if (node.value?.items && stage) {
+              const parentEl = stage.renderer.contentWindow?.document.getElementById(`${node.value.id}`);
+              const parentElRect = parentEl?.getBoundingClientRect();
+              left = left - (parentElRect?.left || 0);
+              top = top - (parentElRect?.top || 0);
+            }
+
             editorService?.paste({ left, top });
           },
         },

package/src/layouts/workspace/Workspace.vue

@@ -82,10 +82,6 @@ export default defineComponent({
       const ctrl = isMac ? 'meta' : 'ctrl';
 
       keycon
-        .keydown((e) => {
-          console.log(e);
-          e.inputEvent.preventDefault();
-        })
         .keyup('delete', (e) => {
           e.inputEvent.preventDefault();
           if (!node.value || isPage(node.value)) return;
@@ -96,63 +92,82 @@ export default defineComponent({
           if (!node.value || isPage(node.value)) return;
           services?.editorService.remove(node.value);
         })
-        .keydown([ctrl, 'c'], () => {
+        .keydown([ctrl, 'c'], (e) => {
+          e.inputEvent.preventDefault();
           node.value && services?.editorService.copy(node.value);
         })
-        .keydown([ctrl, 'v'], () => {
+        .keydown([ctrl, 'v'], (e) => {
+          e.inputEvent.preventDefault();
           node.value && services?.editorService.paste();
         })
-        .keydown([ctrl, 'x'], () => {
+        .keydown([ctrl, 'x'], (e) => {
+          e.inputEvent.preventDefault();
           if (!node.value || isPage(node.value)) return;
           services?.editorService.copy(node.value);
           services?.editorService.remove(node.value);
         })
-        .keydown([ctrl, 'z'], () => {
+        .keydown([ctrl, 'z'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.undo();
         })
-        .keydown([ctrl, 'shift', 'z'], () => {
+        .keydown([ctrl, 'shift', 'z'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.redo();
         })
-        .keydown('up', () => {
+        .keydown('up', (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(0, -1);
         })
-        .keydown('down', () => {
+        .keydown('down', (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(0, 1);
         })
-        .keydown('left', () => {
+        .keydown('left', (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(-1, 0);
         })
-        .keydown('right', () => {
+        .keydown('right', (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(1, 0);
         })
-        .keydown([ctrl, 'up'], () => {
+        .keydown([ctrl, 'up'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(0, -10);
         })
-        .keydown([ctrl, 'down'], () => {
+        .keydown([ctrl, 'down'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(0, 10);
         })
-        .keydown([ctrl, 'left'], () => {
+        .keydown([ctrl, 'left'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(-10, 0);
         })
-        .keydown([ctrl, 'right'], () => {
+        .keydown([ctrl, 'right'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.move(10, 0);
         })
-        .keydown('tab', () => {
+        .keydown('tab', (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.selectNextNode();
         })
-        .keydown([ctrl, 'tab'], () => {
+        .keydown([ctrl, 'tab'], (e) => {
+          e.inputEvent.preventDefault();
           services?.editorService.selectNextPage();
         })
-        .keydown([ctrl, '='], () => {
+        .keydown([ctrl, '='], (e) => {
+          e.inputEvent.preventDefault();
           services?.uiService.zoom(0.1);
         })
-        .keydown([ctrl, 'numpadplus'], () => {
+        .keydown([ctrl, 'numpadplus'], (e) => {
+          e.inputEvent.preventDefault();
           services?.uiService.zoom(0.1);
         })
-        .keydown([ctrl, '-'], () => {
+        .keydown([ctrl, '-'], (e) => {
+          e.inputEvent.preventDefault();
           services?.uiService.zoom(-0.1);
         })
-        .keydown([ctrl, 'numpad-'], () => {
+        .keydown([ctrl, 'numpad-'], (e) => {
+          e.inputEvent.preventDefault();
           services?.uiService.zoom(-0.1);
         });
     });

package/src/services/BaseService.ts

@@ -91,7 +91,7 @@ const doAction = async (
  *    editorService.afterAdd();
  *   }
  *
- * 调用时的参数会透传到before方法的参数中, 然后before的return 会作为原方法的参数和after的参数，after最后一个参数则是原方法的return值;
+ * 调用时的参数会透传到before方法的参数中, 然后before的return 会作为原方法的参数和after的参数，after第一个参数则是原方法的return值;
  * 如需终止后续方法调用可以return new Error();
  *
  * 方法2：

package/src/services/editor.ts

@@ -33,6 +33,7 @@ import {
   change2Fixed,
   COPY_STORAGE_KEY,
   Fixed2Other,
+  generatePageNameByApp,
   getNodeIndex,
   initPosition,
   isFixed,
@@ -194,6 +195,20 @@ class Editor extends BaseService {
       historyService.empty();
     }
 
+    if (node?.id) {
+      this.get<StageCore>('stage')
+        ?.renderer.runtime?.getApp?.()
+        ?.emit(
+          'editor:select',
+          {
+            node,
+            page,
+            parent,
+          },
+          getNodePath(node.id, this.get<MApp>('root').items),
+        );
+    }
+
     this.emit('select', node);
 
     return node!;
@@ -488,6 +503,10 @@ class Editor extends BaseService {
       };
     }
 
+    if (isPage(config)) {
+      config.name = generatePageNameByApp(this.get('root'));
+    }
+
     return await this.add(config);
   }
 
@@ -504,7 +523,18 @@ class Editor extends BaseService {
       return;
     }
 
-    if (parent.style?.width && node.style?.width) {
+    if (!node.style) return;
+
+    const stage = this.get<StageCore>('stage');
+    const doc = stage?.renderer.contentWindow?.document;
+
+    if (doc) {
+      const parentEl = doc.getElementById(`${parent.id}`);
+      const el = doc.getElementById(`${node.id}`);
+      if (parentEl && el) {
+        node.style.left = (parentEl.clientWidth - el.clientWidth) / 2;
+      }
+    } else if (parent.style && isNumber(parent.style?.width) && isNumber(node.style?.width)) {
       node.style.left = (parent.style.width - node.style.width) / 2;
     }