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

package/dist/tmagic-editor.umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('serialize-javascript'), require('@element-plus/icons'), require('lodash-es'), require('monaco-editor'), require('@tmagic/schema'), require('@tmagic/utils'), require('events'), require('@tmagic/core'), require('gesto'), require('element-plus'), require('keycon'), require('@tmagic/stage')) :
   typeof define === 'function' && define.amd ? define(['exports', 'vue', 'serialize-javascript', '@element-plus/icons', 'lodash-es', 'monaco-editor', '@tmagic/schema', '@tmagic/utils', 'events', '@tmagic/core', 'gesto', 'element-plus', 'keycon', '@tmagic/stage'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicEditor = {}, global.vue, global.serialize, global.icons, global.lodashEs, global.monaco, global.schema, global.utils, global.events, global.core, global.Gesto, global.elementPlus, global.KeyController, global.StageCore));
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicEditor = {}, global.Vue, global.serialize, global.icons, global.lodashEs, global.monaco, global.schema, global.utils, global.events, global.core, global.Gesto, global.ElementPlus, global.KeyController, global.StageCore));
 })(this, (function (exports, vue, serialize, icons, lodashEs, monaco, schema, utils, events, core, Gesto, elementPlus, KeyController, StageCore) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -684,10 +684,10 @@
         }
         return value;
       }
-      return lodashEs.cloneDeep({
+      return {
         ...getDefaultPropsValue(type),
-        ...lodashEs.mergeWith(this.state.propsValueMap[type] || {}, defaultValue)
-      });
+        ...lodashEs.mergeWith(lodashEs.cloneDeep(this.state.propsValueMap[type] || {}), lodashEs.cloneDeep(defaultValue))
+      };
     }
   }
   var propsService = new Props();
@@ -1197,9 +1197,9 @@
       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]);
@@ -2267,9 +2267,14 @@
       menuData: {
         type: Array,
         default: () => []
+      },
+      isSubMenu: {
+        type: Boolean,
+        default: false
       }
     },
-    setup() {
+    emits: ["hide", "show"],
+    setup(props, { emit }) {
       const menu = vue.ref();
       const subMenu = vue.ref();
       const visible = vue.ref(false);
@@ -2279,15 +2284,31 @@
         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();
       };
       vue.onMounted(() => {
-        globalThis.addEventListener("mouseup", (e) => {
-          if (!visible.value || e.target && menu.value?.contains(e.target)) {
-            return;
-          }
-          hide();
-        }, true);
+        if (props.isSubMenu)
+          return;
+        globalThis.addEventListener("mousedown", hideHandler, true);
+      });
+      vue.onUnmounted(() => {
+        if (props.isSubMenu)
+          return;
+        globalThis.removeEventListener("mousedown", hideHandler, true);
       });
       return {
         menu,
@@ -2297,18 +2318,21 @@
         subMenuData,
         hide,
         show(e) {
-          visible.value = true;
-          vue.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 + 2}px`
-            };
-          });
+          setTimeout(() => {
+            visible.value = true;
+            vue.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;
@@ -2350,8 +2374,10 @@
         vue.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)) : vue.createCommentVNode("", true);
   }
@@ -2366,6 +2392,7 @@
       const isRoot = vue.computed(() => node.value?.type === schema.NodeType.ROOT);
       const isPage = vue.computed(() => node.value?.type === schema.NodeType.PAGE);
       const componentList = vue.computed(() => services?.componentListService.getList() || []);
+      const layerContentMenu = vue.inject("layerContentMenu", []);
       const createMenuItems = (group) => group.items.map((component) => ({
         text: component.text,
         type: "button",
@@ -2430,7 +2457,8 @@
             handler: () => {
               node.value && services?.editorService.remove(node.value);
             }
-          }
+          },
+          ...layerContentMenu
         ]),
         show(e) {
           menu.value?.show(e);
@@ -3221,6 +3249,7 @@
       const node = vue.computed(() => editorService?.get("node"));
       const parent = vue.computed(() => editorService?.get("parent"));
       const isPage = vue.computed(() => node.value?.type === schema.NodeType.PAGE);
+      const stageContentMenu = vue.inject("stageContentMenu", []);
       vue.onMounted(() => {
         const data = globalThis.localStorage.getItem(COPY_STORAGE_KEY);
         canPaste.value = data !== "undefined" && !!data;
@@ -3333,7 +3362,8 @@
             handler: () => {
               editorService?.get("stage").clearGuides();
             }
-          }
+          },
+          ...stageContentMenu
         ]),
         show(e) {
           menu.value?.show(e);
@@ -3831,6 +3861,14 @@
       sidebar: {
         type: Object
       },
+      layerContentMenu: {
+        type: Array,
+        default: () => []
+      },
+      stageContentMenu: {
+        type: Array,
+        default: () => []
+      },
       menu: {
         type: Object,
         default: () => ({ left: [], right: [] })
@@ -3916,6 +3954,8 @@
         uiService
       };
       vue.provide("services", services);
+      vue.provide("layerContentMenu", props.layerContentMenu);
+      vue.provide("stageContentMenu", props.stageContentMenu);
       return services;
     }
   });