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

package/dist/tmagic-editor.es.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeStyle, ref, watchEffect, inject, markRaw, createElementBlock, createVNode, withCtx, withModifiers, createCommentVNode, createTextVNode, toDisplayString, watch, onMounted, onUnmounted, reactive, toRaw, createElementVNode, renderSlot, Fragment, normalizeClass, resolveDynamicComponent, renderList, normalizeProps, mergeProps, getCurrentInstance, nextTick, withDirectives, Teleport, vShow, toHandlers, createSlots, provide } from 'vue';
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, normalizeStyle, ref, watchEffect, inject, markRaw, createElementBlock, createVNode, withCtx, withModifiers, createCommentVNode, createTextVNode, toDisplayString, watch, onMounted, onUnmounted, reactive, toRaw, createElementVNode, renderSlot, Fragment, normalizeClass, resolveDynamicComponent, renderList, normalizeProps, mergeProps, getCurrentInstance, nextTick, Teleport, toHandlers, createSlots, provide } from 'vue';
 import serialize from 'serialize-javascript';
 import { Delete, Pointer, Close, Plus, Edit, ArrowDown, Grid, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Files, DocumentCopy, Coin, ArrowLeftBold, ArrowRightBold, CaretBottom, Top, Bottom } from '@element-plus/icons';
 import { throttle, cloneDeep, mergeWith, random } from 'lodash-es';
@@ -666,10 +666,10 @@ class Props extends BaseService {
       }
       return value;
     }
-    return cloneDeep({
+    return {
       ...getDefaultPropsValue(type),
-      ...mergeWith(this.state.propsValueMap[type] || {}, defaultValue)
-    });
+      ...mergeWith(cloneDeep(this.state.propsValueMap[type] || {}), cloneDeep(defaultValue))
+    };
   }
 }
 var propsService = new Props();
@@ -754,9 +754,12 @@ const toRelative = (node) => {
 };
 const setTop2Middle = (node, parentNode, stage) => {
   const style = node.style || {};
-  const height = style.height || 0;
-  if (!stage || typeof style.top !== "undefined" || !parentNode.style || !isNumber(height))
+  let height = style.height || 0;
+  if (!stage || typeof style.top !== "undefined" || !parentNode.style)
     return style;
+  if (!isNumber(height)) {
+    height = 0;
+  }
   const { height: parentHeight } = parentNode.style;
   if (isPage(parentNode)) {
     const { scrollTop = 0, wrapperHeight } = stage.mask;
@@ -945,6 +948,13 @@ class Editor$1 extends BaseService {
     } else {
       historyService.empty();
     }
+    if (node?.id) {
+      this.get("stage")?.renderer.runtime?.getApp?.()?.emit("editor:select", {
+        node,
+        page,
+        parent
+      }, getNodePath(node.id, this.get("root").items));
+    }
     this.emit("select", node);
     return node;
   }
@@ -1133,6 +1143,9 @@ class Editor$1 extends BaseService {
         ...position
       };
     }
+    if (isPage(config)) {
+      config.name = generatePageNameByApp(this.get("root"));
+    }
     return await this.add(config);
   }
   async alignCenter(config2) {
@@ -1142,7 +1155,17 @@ class Editor$1 extends BaseService {
     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 && isNumber(parent.style?.width) && isNumber(node.style?.width)) {
       node.style.left = (parent.style.width - node.style.width) / 2;
     }
     await this.update(node);
@@ -1156,9 +1179,9 @@ class Editor$1 extends BaseService {
     const node = this.get("node");
     const brothers = parent?.items || [];
     const index = brothers.findIndex((item) => `${item.id}` === `${node?.id}`);
-    if (offset === LayerOffset.BOTTOM) {
+    if (offset === LayerOffset.TOP) {
       brothers.splice(brothers.length - 1, 0, brothers.splice(index, 1)[0]);
-    } else if (offset === LayerOffset.TOP) {
+    } else if (offset === LayerOffset.BOTTOM) {
       brothers.splice(0, 0, brothers.splice(index, 1)[0]);
     } else {
       brothers.splice(index + parseInt(`${offset}`, 10), 0, brothers.splice(index, 1)[0]);
@@ -2226,9 +2249,14 @@ const _sfc_main$a = defineComponent({
     menuData: {
       type: Array,
       default: () => []
+    },
+    isSubMenu: {
+      type: Boolean,
+      default: false
     }
   },
-  setup() {
+  emits: ["hide", "show"],
+  setup(props, { emit }) {
     const menu = ref();
     const subMenu = ref();
     const visible = ref(false);
@@ -2238,15 +2266,31 @@ const _sfc_main$a = defineComponent({
       top: "0"
     });
     const hide = () => {
+      if (!visible.value)
+        return;
       visible.value = false;
+      subMenu.value?.hide();
+      emit("hide");
+    };
+    const hideHandler = (e) => {
+      const target = e.target;
+      if (!visible.value || !target) {
+        return;
+      }
+      if (menu.value?.contains(target) || subMenu.value?.$el?.contains(target)) {
+        return;
+      }
+      hide();
     };
     onMounted(() => {
-      globalThis.addEventListener("mousedown", (e) => {
-        if (!visible.value || e.target && menu.value?.contains(e.target)) {
-          return;
-        }
-        hide();
-      }, true);
+      if (props.isSubMenu)
+        return;
+      globalThis.addEventListener("mousedown", hideHandler, true);
+    });
+    onUnmounted(() => {
+      if (props.isSubMenu)
+        return;
+      globalThis.removeEventListener("mousedown", hideHandler, true);
     });
     return {
       menu,
@@ -2256,18 +2300,21 @@ const _sfc_main$a = defineComponent({
       subMenuData,
       hide,
       show(e) {
-        visible.value = true;
-        nextTick(() => {
-          const menuHeight = menu.value?.clientHeight || 0;
-          let top = e.clientY;
-          if (menuHeight + e.clientY > document.body.clientHeight) {
-            top = document.body.clientHeight - menuHeight;
-          }
-          menuStyle.value = {
-            top: `${top}px`,
-            left: `${e.clientX}px`
-          };
-        });
+        setTimeout(() => {
+          visible.value = true;
+          nextTick(() => {
+            const menuHeight = menu.value?.clientHeight || 0;
+            let top = e.clientY;
+            if (menuHeight + e.clientY > document.body.clientHeight) {
+              top = document.body.clientHeight - menuHeight;
+            }
+            menuStyle.value = {
+              top: `${top}px`,
+              left: `${e.clientX}px`
+            };
+            emit("show");
+          });
+        }, 300);
       },
       showSubMenu(item) {
         const menuItem = item;
@@ -2288,7 +2335,7 @@ const _sfc_main$a = defineComponent({
 function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_tool_button = resolveComponent("tool-button");
   const _component_content_menu = resolveComponent("content-menu", true);
-  return _ctx.menuData.length ? withDirectives((openBlock(), createElementBlock("div", {
+  return _ctx.menuData.length && _ctx.visible ? (openBlock(), createElementBlock("div", {
     key: 0,
     class: "magic-editor-content-menu",
     ref: "menu",
@@ -2309,12 +2356,12 @@ function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
       createVNode(_component_content_menu, {
         class: "sub-menu",
         ref: "subMenu",
-        "menu-data": _ctx.subMenuData
-      }, null, 8, ["menu-data"])
+        "menu-data": _ctx.subMenuData,
+        "is-sub-menu": true,
+        onHide: _ctx.hide
+      }, null, 8, ["menu-data", "onHide"])
     ]))
-  ], 4)), [
-    [vShow, _ctx.visible]
-  ]) : createCommentVNode("", true);
+  ], 4)) : createCommentVNode("", true);
 }
 var ContentMenu = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$a]]);
 
@@ -2327,6 +2374,7 @@ const _sfc_main$9 = defineComponent({
     const isRoot = computed(() => node.value?.type === NodeType.ROOT);
     const isPage = computed(() => node.value?.type === NodeType.PAGE);
     const componentList = computed(() => services?.componentListService.getList() || []);
+    const layerContentMenu = inject("layerContentMenu", []);
     const createMenuItems = (group) => group.items.map((component) => ({
       text: component.text,
       type: "button",
@@ -2391,7 +2439,8 @@ const _sfc_main$9 = defineComponent({
           handler: () => {
             node.value && services?.editorService.remove(node.value);
           }
-        }
+        },
+        ...layerContentMenu
       ]),
       show(e) {
         menu.value?.show(e);
@@ -2614,7 +2663,7 @@ const _sfc_main$7 = defineComponent({
   components: { MIcon },
   props: {
     data: {
-      type: Object
+      type: [Object, String]
     }
   },
   setup(props) {
@@ -3182,6 +3231,7 @@ const _sfc_main$3 = defineComponent({
     const node = computed(() => editorService?.get("node"));
     const parent = computed(() => editorService?.get("parent"));
     const isPage = computed(() => node.value?.type === NodeType.PAGE);
+    const stageContentMenu = inject("stageContentMenu", []);
     onMounted(() => {
       const data = globalThis.localStorage.getItem(COPY_STORAGE_KEY);
       canPaste.value = data !== "undefined" && !!data;
@@ -3217,8 +3267,17 @@ const _sfc_main$3 = defineComponent({
           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 });
           }
         },
@@ -3285,7 +3344,8 @@ const _sfc_main$3 = defineComponent({
           handler: () => {
             editorService?.get("stage").clearGuides();
           }
-        }
+        },
+        ...stageContentMenu
       ]),
       show(e) {
         menu.value?.show(e);
@@ -3515,10 +3575,7 @@ const _sfc_main$1 = defineComponent({
       keycon = new KeyController(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 || isPage(node.value))
           return;
@@ -3528,46 +3585,65 @@ const _sfc_main$1 = 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);
       });
     });
@@ -3767,6 +3843,14 @@ const _sfc_main = defineComponent({
     sidebar: {
       type: Object
     },
+    layerContentMenu: {
+      type: Array,
+      default: () => []
+    },
+    stageContentMenu: {
+      type: Array,
+      default: () => []
+    },
     menu: {
       type: Object,
       default: () => ({ left: [], right: [] })
@@ -3852,6 +3936,8 @@ const _sfc_main = defineComponent({
       uiService
     };
     provide("services", services);
+    provide("layerContentMenu", props.layerContentMenu);
+    provide("stageContentMenu", props.stageContentMenu);
     return services;
   }
 });