@tmagic/editor 1.1.0-beta.11 → 1.1.0-beta.12

package/dist/tmagic-editor.umd.js

@@ -897,6 +897,7 @@
         "getPropsValue",
         "createId",
         "setNewItemId",
+        "fillConfig",
         "getDefaultPropsValue"
       ]);
     }
@@ -906,14 +907,17 @@
       });
       this.emit("props-configs-change");
     }
-    setPropsConfig(type, config) {
-      this.state.propsConfigMap[type] = fillConfig(Array.isArray(config) ? config : [config]);
+    async fillConfig(config) {
+      return fillConfig(config);
+    }
+    async setPropsConfig(type, config) {
+      this.state.propsConfigMap[type] = await this.fillConfig(Array.isArray(config) ? config : [config]);
     }
     async getPropsConfig(type) {
       if (type === "area") {
         return await this.getPropsConfig("button");
       }
-      return lodashEs.cloneDeep(this.state.propsConfigMap[type] || DEFAULT_CONFIG);
+      return lodashEs.cloneDeep(this.state.propsConfigMap[type] || await this.fillConfig([]));
     }
     setPropsValues(values) {
       Object.keys(values).forEach((type) => {
@@ -947,25 +951,14 @@
         ...lodashEs.mergeWith({}, lodashEs.cloneDeep(this.state.propsValueMap[type] || {}), data)
       };
     }
-    guid(digit = 8) {
-      return "x".repeat(digit).replace(/[xy]/g, (c) => {
-        const r = Math.random() * 16 | 0;
-        const v = c == "x" ? r : r & 3 | 8;
-        return v.toString(16);
-      });
-    }
     async createId(type) {
       return `${type}_${this.guid()}`;
     }
-    async setNewItemId(config, parent) {
-      const oldId = config.id;
+    async setNewItemId(config) {
       config.id = await this.createId(config.type || "component");
-      if (utils.isPop(config) && parent?.type === schema.NodeType.PAGE) {
-        updatePopId(oldId, config.id, parent);
-      }
       if (config.items && Array.isArray(config.items)) {
         for (const item of config.items) {
-          await this.setNewItemId(item, config);
+          await this.setNewItemId(item);
         }
       }
       return config;
@@ -983,22 +976,14 @@
         name: type
       };
     }
+    guid(digit = 8) {
+      return "x".repeat(digit).replace(/[xy]/g, (c) => {
+        const r = Math.random() * 16 | 0;
+        const v = c === "x" ? r : r & 3 | 8;
+        return v.toString(16);
+      });
+    }
   }
-  const updatePopId = (oldId, popId, pageConfig) => {
-    pageConfig.items?.forEach((config) => {
-      if (config.pop === oldId) {
-        config.pop = popId;
-        return;
-      }
-      if (config.popId === oldId) {
-        config.popId = popId;
-        return;
-      }
-      if (Array.isArray(config.items)) {
-        updatePopId(oldId, popId, config);
-      }
-    });
-  };
   const propsService = new Props();
 
   const beforePaste = async (position, config) => {
@@ -1018,7 +1003,7 @@
       if (pastePosition.top && configItem.style?.top) {
         pastePosition.top = configItem.style?.top - referenceTop + pastePosition.top;
       }
-      const pasteConfig = await propsService.setNewItemId(configItem, editorService.get("root"));
+      const pasteConfig = await propsService.setNewItemId(configItem);
       if (pasteConfig.style) {
         const { left, top } = pasteConfig.style;
         if (typeof left === "number" || !!left && !isNaN(Number(left))) {
@@ -1089,6 +1074,7 @@
         "sort",
         "copy",
         "paste",
+        "doPaste",
         "duAlignCenter",
         "alignCenter",
         "moveLayer",
@@ -1270,7 +1256,7 @@
       }
       this.pushHistoryState();
       this.emit("add", newNodes);
-      return newNodes.length > 1 ? newNodes[0] : newNodes;
+      return Array.isArray(addNode) ? newNodes : newNodes[0];
     }
     async doRemove(node) {
       const root = this.get("root");
@@ -1364,7 +1350,7 @@
       const newNodes = await Promise.all(nodes.map((node) => this.doUpdate(node)));
       this.pushHistoryState();
       this.emit("update", newNodes);
-      return newNodes.length > 1 ? newNodes[0] : newNodes;
+      return Array.isArray(config) ? newNodes : newNodes[0];
     }
     async sort(id1, id2) {
       const node = this.get("node");
@@ -1393,9 +1379,13 @@
       const config = await storageService.getItem(COPY_STORAGE_KEY);
       if (!Array.isArray(config))
         return;
-      const pasteConfigs = await beforePaste(position, config);
+      const pasteConfigs = await this.doPaste(config, position);
       return this.add(pasteConfigs);
     }
+    async doPaste(config, position = {}) {
+      const pasteConfigs = await beforePaste(position, lodashEs.cloneDeep(config));
+      return pasteConfigs;
+    }
     async doAlignCenter(config) {
       const parent = this.getParentById(config.id);
       if (!parent)
@@ -1440,11 +1430,14 @@
       } else {
         brothers.splice(index + parseInt(`${offset}`, 10), 0, brothers.splice(index, 1)[0]);
       }
+      const grandparent = this.getParentById(parent.id);
       this.get("stage")?.update({
         config: lodashEs.cloneDeep(vue.toRaw(parent)),
-        parentId: parent.id,
+        parentId: grandparent?.id,
         root: lodashEs.cloneDeep(this.get("root"))
       });
+      this.addModifiedNodeId(parent.id);
+      this.pushHistoryState();
     }
     async moveToContainer(config, targetId) {
       const { node, parent } = this.getNodeInfo(config.id, false);
@@ -1464,7 +1457,8 @@
         newConfig.style = getInitPositionStyle(newConfig.style, layout);
         target.items.push(newConfig);
         await stage.select(targetId);
-        await stage.update({ config: lodashEs.cloneDeep(target), parentId: parent.id, root });
+        const targetParent = this.getParentById(target.id);
+        await stage.update({ config: lodashEs.cloneDeep(target), parentId: targetParent?.id, root });
         await this.select(newConfig);
         stage.select(newConfig.id);
         this.addModifiedNodeId(target.id);
@@ -1827,7 +1821,6 @@
       ]
     }
   ];
-  const DEFAULT_CONFIG = fillConfig([]);
 
   const log = (...args) => {
     if (process.env.NODE_ENV === "development") {
@@ -3364,7 +3357,7 @@
                       content: item.name
                     }, {
                       default: vue.withCtx(() => [
-                        vue.createElementVNode("span", null, vue.toDisplayString(item.name), 1)
+                        vue.createElementVNode("span", null, vue.toDisplayString(item.name || item.id), 1)
                       ]),
                       _: 2
                     }, 1032, ["content"])
@@ -4098,9 +4091,11 @@
     const _component_magic_stage = vue.resolveComponent("magic-stage");
     const _component_page_bar = vue.resolveComponent("page-bar");
     return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-      (vue.openBlock(), vue.createBlock(_component_magic_stage, {
-        key: _ctx.page?.id
-      })),
+      vue.renderSlot(_ctx.$slots, "stage", {}, () => [
+        (vue.openBlock(), vue.createBlock(_component_magic_stage, {
+          key: _ctx.page?.id
+        }))
+      ]),
       vue.renderSlot(_ctx.$slots, "workspace-content"),
       vue.createVNode(_component_page_bar, null, {
         "page-bar-title": vue.withCtx(({ page }) => [
@@ -4433,6 +4428,9 @@
       workspace: vue.withCtx(() => [
         vue.renderSlot(_ctx.$slots, "workspace", { editorService: _ctx.editorService }, () => [
           vue.createVNode(_component_workspace, null, {
+            stage: vue.withCtx(() => [
+              vue.renderSlot(_ctx.$slots, "stage")
+            ]),
             "workspace-content": vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "workspace-content", { editorService: _ctx.editorService })
             ]),
@@ -4485,7 +4483,6 @@
 
   exports.COPY_STORAGE_KEY = COPY_STORAGE_KEY;
   exports.ComponentListPanel = ComponentListPanel;
-  exports.DEFAULT_CONFIG = DEFAULT_CONFIG;
   exports.Fixed2Other = Fixed2Other;
   exports.H_GUIDE_LINE_STORAGE_KEY = H_GUIDE_LINE_STORAGE_KEY;
   exports.Keys = Keys;