@tmagic/editor 1.0.0-rc.2 → 1.0.0-rc.5

package/dist/tmagic-editor.umd.js

@@ -772,9 +772,12 @@
   };
   const setTop2Middle = (node, parentNode, stage) => {
     const style = node.style || {};
-    const height = style.height || 0;
-    if (!stage || typeof style.top !== "undefined" || !parentNode.style || !utils.isNumber(height))
+    let height = style.height || 0;
+    if (!stage || typeof style.top !== "undefined" || !parentNode.style)
       return style;
+    if (!utils.isNumber(height)) {
+      height = 0;
+    }
     const { height: parentHeight } = parentNode.style;
     if (utils.isPage(parentNode)) {
       const { scrollTop = 0, wrapperHeight } = stage.mask;
@@ -963,6 +966,13 @@
       } else {
         historyService.empty();
       }
+      if (node?.id) {
+        this.get("stage")?.renderer.runtime?.getApp?.()?.emit("editor:select", {
+          node,
+          page,
+          parent
+        }, utils.getNodePath(node.id, this.get("root").items));
+      }
       this.emit("select", node);
       return node;
     }
@@ -1151,6 +1161,9 @@
           ...position
         };
       }
+      if (utils.isPage(config)) {
+        config.name = generatePageNameByApp(this.get("root"));
+      }
       return await this.add(config);
     }
     async alignCenter(config2) {
@@ -1160,7 +1173,17 @@
       if (layout === Layout.RELATIVE) {
         return;
       }
-      if (parent.style?.width && node.style?.width) {
+      if (!node.style)
+        return;
+      const stage = this.get("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 && utils.isNumber(parent.style?.width) && utils.isNumber(node.style?.width)) {
         node.style.left = (parent.style.width - node.style.width) / 2;
       }
       await this.update(node);
@@ -2259,7 +2282,7 @@
         visible.value = false;
       };
       vue.onMounted(() => {
-        globalThis.addEventListener("mousedown", (e) => {
+        globalThis.addEventListener("mouseup", (e) => {
           if (!visible.value || e.target && menu.value?.contains(e.target)) {
             return;
           }
@@ -2283,7 +2306,7 @@
             }
             menuStyle.value = {
               top: `${top}px`,
-              left: `${e.clientX}px`
+              left: `${e.clientX + 2}px`
             };
           });
         },
@@ -2306,7 +2329,7 @@
   function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_tool_button = vue.resolveComponent("tool-button");
     const _component_content_menu = vue.resolveComponent("content-menu", true);
-    return _ctx.menuData.length ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", {
+    return _ctx.menuData.length && _ctx.visible ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,
       class: "magic-editor-content-menu",
       ref: "menu",
@@ -2330,9 +2353,7 @@
           "menu-data": _ctx.subMenuData
         }, null, 8, ["menu-data"])
       ]))
-    ], 4)), [
-      [vue.vShow, _ctx.visible]
-    ]) : vue.createCommentVNode("", true);
+    ], 4)) : vue.createCommentVNode("", true);
   }
   var ContentMenu = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$a]]);
 
@@ -2632,7 +2653,7 @@
     components: { MIcon },
     props: {
       data: {
-        type: Object
+        type: [Object, String]
       }
     },
     setup(props) {
@@ -3235,8 +3256,17 @@
             text: "\u7C98\u8D34",
             display: () => canPaste.value,
             handler: () => {
-              const top = menu.value?.$el.offsetTop || 0;
-              const left = menu.value?.$el.offsetLeft || 0;
+              const stage = editorService?.get("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 });
             }
           },
@@ -3331,6 +3361,7 @@
         type: Function
       },
       runtimeUrl: String,
+      autoScrollIntoView: Boolean,
       canSelect: {
         type: Function,
         default: (el) => Boolean(el.id)
@@ -3366,6 +3397,7 @@
           render: props.render,
           runtimeUrl: props.runtimeUrl,
           zoom: zoom.value,
+          autoScrollIntoView: props.autoScrollIntoView,
           canSelect: (el, event, stop) => {
             const elCanSelect = props.canSelect(el);
             if (uiSelectMode.value && elCanSelect && event.type === "mousedown") {
@@ -3503,6 +3535,7 @@
     },
     props: {
       runtimeUrl: String,
+      autoScrollIntoView: Boolean,
       render: {
         type: Function
       },
@@ -3530,10 +3563,7 @@
         keycon = new KeyController__default["default"](workspace.value);
         const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
         const ctrl = isMac ? "meta" : "ctrl";
-        keycon.keydown((e) => {
-          console.log(e);
-          e.inputEvent.preventDefault();
-        }).keyup("delete", (e) => {
+        keycon.keyup("delete", (e) => {
           e.inputEvent.preventDefault();
           if (!node.value || utils.isPage(node.value))
             return;
@@ -3543,46 +3573,65 @@
           if (!node.value || utils.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 || utils.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);
         });
       });
@@ -3609,10 +3658,11 @@
       (vue.openBlock(), vue.createBlock(_component_magic_stage, {
         key: _ctx.page?.id,
         "runtime-url": _ctx.runtimeUrl,
+        "auto-scroll-into-view": _ctx.autoScrollIntoView,
         render: _ctx.render,
         "moveable-options": _ctx.moveableOptions,
         "can-select": _ctx.canSelect
-      }, null, 8, ["runtime-url", "render", "moveable-options", "can-select"])),
+      }, null, 8, ["runtime-url", "auto-scroll-into-view", "render", "moveable-options", "can-select"])),
       vue.renderSlot(_ctx.$slots, "workspace-content"),
       vue.createVNode(_component_page_bar, null, {
         "page-bar-title": vue.withCtx(({ page }) => [
@@ -3789,6 +3839,7 @@
         type: Function
       },
       runtimeUrl: String,
+      autoScrollIntoView: Boolean,
       propsConfigs: {
         type: Object,
         default: () => ({})
@@ -3889,6 +3940,7 @@
         vue.renderSlot(_ctx.$slots, "workspace", {}, () => [
           vue.createVNode(_component_workspace, {
             "runtime-url": _ctx.runtimeUrl,
+            "auto-scroll-into-view": _ctx.autoScrollIntoView,
             render: _ctx.render,
             "moveable-options": _ctx.moveableOptions,
             "can-select": _ctx.canSelect
@@ -3903,7 +3955,7 @@
               vue.renderSlot(_ctx.$slots, "page-bar-popover", { page })
             ]),
             _: 3
-          }, 8, ["runtime-url", "render", "moveable-options", "can-select"])
+          }, 8, ["runtime-url", "auto-scroll-into-view", "render", "moveable-options", "can-select"])
         ])
       ]),
       propsPanel: vue.withCtx(() => [