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

package/dist/tmagic-editor.mjs

@@ -879,6 +879,7 @@ class Props extends BaseService {
       "getPropsValue",
       "createId",
       "setNewItemId",
+      "fillConfig",
       "getDefaultPropsValue"
     ]);
   }
@@ -888,14 +889,17 @@ class Props extends BaseService {
     });
     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 cloneDeep(this.state.propsConfigMap[type] || DEFAULT_CONFIG);
+    return cloneDeep(this.state.propsConfigMap[type] || await this.fillConfig([]));
   }
   setPropsValues(values) {
     Object.keys(values).forEach((type) => {
@@ -929,25 +933,14 @@ class Props extends BaseService {
       ...mergeWith({}, 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 (isPop(config) && parent?.type === 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;
@@ -965,22 +958,14 @@ class Props extends BaseService {
       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) => {
@@ -1000,7 +985,7 @@ const beforePaste = async (position, config) => {
     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))) {
@@ -1071,6 +1056,7 @@ class Editor$1 extends BaseService {
       "sort",
       "copy",
       "paste",
+      "doPaste",
       "duAlignCenter",
       "alignCenter",
       "moveLayer",
@@ -1252,7 +1238,7 @@ class Editor$1 extends BaseService {
     }
     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");
@@ -1346,7 +1332,7 @@ class Editor$1 extends BaseService {
     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");
@@ -1375,9 +1361,13 @@ class Editor$1 extends BaseService {
     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, cloneDeep(config));
+    return pasteConfigs;
+  }
   async doAlignCenter(config) {
     const parent = this.getParentById(config.id);
     if (!parent)
@@ -1422,11 +1412,14 @@ class Editor$1 extends BaseService {
     } else {
       brothers.splice(index + parseInt(`${offset}`, 10), 0, brothers.splice(index, 1)[0]);
     }
+    const grandparent = this.getParentById(parent.id);
     this.get("stage")?.update({
       config: cloneDeep(toRaw(parent)),
-      parentId: parent.id,
+      parentId: grandparent?.id,
       root: cloneDeep(this.get("root"))
     });
+    this.addModifiedNodeId(parent.id);
+    this.pushHistoryState();
   }
   async moveToContainer(config, targetId) {
     const { node, parent } = this.getNodeInfo(config.id, false);
@@ -1446,7 +1439,8 @@ class Editor$1 extends BaseService {
       newConfig.style = getInitPositionStyle(newConfig.style, layout);
       target.items.push(newConfig);
       await stage.select(targetId);
-      await stage.update({ config: cloneDeep(target), parentId: parent.id, root });
+      const targetParent = this.getParentById(target.id);
+      await stage.update({ config: cloneDeep(target), parentId: targetParent?.id, root });
       await this.select(newConfig);
       stage.select(newConfig.id);
       this.addModifiedNodeId(target.id);
@@ -1809,7 +1803,6 @@ const fillConfig = (config = []) => [
     ]
   }
 ];
-const DEFAULT_CONFIG = fillConfig([]);
 
 const log = (...args) => {
   if (process.env.NODE_ENV === "development") {
@@ -3346,7 +3339,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                     content: item.name
                   }, {
                     default: withCtx(() => [
-                      createElementVNode("span", null, toDisplayString(item.name), 1)
+                      createElementVNode("span", null, toDisplayString(item.name || item.id), 1)
                     ]),
                     _: 2
                   }, 1032, ["content"])
@@ -4080,9 +4073,11 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_magic_stage = resolveComponent("magic-stage");
   const _component_page_bar = resolveComponent("page-bar");
   return openBlock(), createElementBlock("div", _hoisted_1, [
-    (openBlock(), createBlock(_component_magic_stage, {
-      key: _ctx.page?.id
-    })),
+    renderSlot(_ctx.$slots, "stage", {}, () => [
+      (openBlock(), createBlock(_component_magic_stage, {
+        key: _ctx.page?.id
+      }))
+    ]),
     renderSlot(_ctx.$slots, "workspace-content"),
     createVNode(_component_page_bar, null, {
       "page-bar-title": withCtx(({ page }) => [
@@ -4415,6 +4410,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     workspace: withCtx(() => [
       renderSlot(_ctx.$slots, "workspace", { editorService: _ctx.editorService }, () => [
         createVNode(_component_workspace, null, {
+          stage: withCtx(() => [
+            renderSlot(_ctx.$slots, "stage")
+          ]),
           "workspace-content": withCtx(() => [
             renderSlot(_ctx.$slots, "workspace-content", { editorService: _ctx.editorService })
           ]),
@@ -4465,5 +4463,5 @@ const index = {
   }
 };
 
-export { COPY_STORAGE_KEY, ComponentListPanel, DEFAULT_CONFIG, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, Keys, LayerOffset, LayerPanel, Layout, PropsPanel, CodeEditor as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$f as ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, setConfig, setLayout, storageService, uiService, warn };
+export { COPY_STORAGE_KEY, ComponentListPanel, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, Keys, LayerOffset, LayerPanel, Layout, PropsPanel, CodeEditor as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$f as ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, setConfig, setLayout, storageService, uiService, warn };
 //# sourceMappingURL=tmagic-editor.mjs.map