@tmagic/editor 1.3.0-beta.8 → 1.3.1

package/dist/tmagic-editor.umd.cjs

@@ -1635,23 +1635,27 @@
     }
     return style;
   };
-  const setLayout = (node, layout) => {
+  const setChilrenLayout = (node, layout) => {
     node.items?.forEach((child) => {
-      if (utils.isPop(child))
-        return;
-      const style = child.style || {};
-      if (style.position === "fixed")
-        return;
-      if (layout !== Layout.RELATIVE) {
-        style.position = "absolute";
-      } else {
-        child.style = getRelativeStyle(style);
-        child.style.right = "auto";
-        child.style.bottom = "auto";
-      }
+      setLayout(child, layout);
     });
     return node;
   };
+  const setLayout = (node, layout) => {
+    if (utils.isPop(node))
+      return;
+    const style = node.style || {};
+    if (style.position === "fixed")
+      return;
+    if (layout !== Layout.RELATIVE) {
+      style.position = "absolute";
+    } else {
+      node.style = getRelativeStyle(style);
+      node.style.right = "auto";
+      node.style.bottom = "auto";
+    }
+    return node;
+  };
   const change2Fixed = (node, root) => {
     const path = utils.getNodePath(node.id, root.items);
     const offset = {
@@ -2506,8 +2510,8 @@
         throw new Error("更新的节点未找到");
       const newLayout = await this.getLayout(newConfig);
       const layout = await this.getLayout(node);
-      if (newLayout !== layout) {
-        newConfig = setLayout(newConfig, newLayout);
+      if (Array.isArray(newConfig.items) && newLayout !== layout) {
+        newConfig = setChilrenLayout(newConfig, newLayout);
       }
       parentNodeItems[index] = newConfig;
       const nodes = this.get("nodes");
@@ -2729,6 +2733,11 @@
           targetIndex -= 1;
         }
       }
+      const layout = await this.getLayout(parent);
+      const newLayout = await this.getLayout(targetParent);
+      if (newLayout !== layout) {
+        setLayout(config, newLayout);
+      }
       parent.items?.splice(index, 1);
       targetParent.items?.splice(targetIndex, 0, config);
       const page = this.get("page");
@@ -6152,7 +6161,6 @@
       const tree = vue.ref();
       __expose({
         filter(val) {
-          debugger;
           tree.value?.filter(val);
         }
       });
@@ -8824,11 +8832,6 @@
           return;
         stage.setZoom(zoom2);
       });
-      vue.watch(root, (root2) => {
-        if (runtime && root2) {
-          runtime.updateRootConfig?.(lodashEs.cloneDeep(vue.toRaw(root2)));
-        }
-      });
       vue.watch(page, (page2) => {
         if (runtime && page2) {
           runtime.updatePageId?.(page2.id);
@@ -8837,6 +8840,12 @@
           });
         }
       });
+      const rootChangeHandler = (root2) => {
+        if (runtime && root2) {
+          runtime.updateRootConfig?.(lodashEs.cloneDeep(vue.toRaw(root2)));
+        }
+      };
+      services?.editorService.on("root-change", rootChangeHandler);
       const resizeObserver = new ResizeObserver((entries) => {
         for (const { contentRect } of entries) {
           services?.uiService.set("stageContainerRect", {
@@ -8856,6 +8865,7 @@
         resizeObserver.disconnect();
         services?.editorService.set("stage", null);
         services?.keybindingService.unregisteEl("stage");
+        services?.editorService.off("root-change", rootChangeHandler);
       });
       const parseDSL = getConfig("parseDSL");
       const contextmenuHandler = (e) => {
@@ -10204,23 +10214,6 @@
       depService.addTarget(createDataSourceCondTarget(ds.id));
     };
     const rootChangeHandler = async (value, preValue) => {
-      const nodeId = editorService.get("node")?.id || props.defaultSelected;
-      let node;
-      if (nodeId) {
-        node = editorService.getNodeById(nodeId);
-      }
-      if (node && node !== value) {
-        await editorService.select(node.id);
-      } else if (value?.items?.length) {
-        await editorService.select(value.items[0]);
-      } else if (value?.id) {
-        editorService.set("nodes", [value]);
-        editorService.set("parent", null);
-        editorService.set("page", null);
-      }
-      if (vue.toRaw(value) !== vue.toRaw(preValue)) {
-        emit("update:modelValue", value);
-      }
       if (!value)
         return;
       value.codeBlocks = value.codeBlocks || {};
@@ -10234,12 +10227,29 @@
       value.dataSources.forEach((ds) => {
         initDataSourceDepTarget(ds);
       });
-      if (value && Array.isArray(value.items)) {
+      if (Array.isArray(value.items)) {
         depService.collect(value.items, true);
       } else {
         depService.clear();
         delete value.dataSourceDeps;
       }
+      const nodeId = editorService.get("node")?.id || props.defaultSelected;
+      let node;
+      if (nodeId) {
+        node = editorService.getNodeById(nodeId);
+      }
+      if (node && node !== value) {
+        await editorService.select(node.id);
+      } else if (value.items?.length) {
+        await editorService.select(value.items[0]);
+      } else if (value.id) {
+        editorService.set("nodes", [value]);
+        editorService.set("parent", null);
+        editorService.set("page", null);
+      }
+      if (vue.toRaw(value) !== vue.toRaw(preValue)) {
+        emit("update:modelValue", value);
+      }
     };
     const nodeAddHandler = (nodes) => {
       depService.collect(nodes);
@@ -10585,6 +10595,7 @@
   exports.log = log;
   exports.propsService = propsService;
   exports.serializeConfig = serializeConfig;
+  exports.setChilrenLayout = setChilrenLayout;
   exports.setConfig = setConfig;
   exports.setLayout = setLayout;
   exports.storageService = storageService;