@tmagic/editor 1.3.0 → 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);
         }
       });
@@ -10587,6 +10595,7 @@
   exports.log = log;
   exports.propsService = propsService;
   exports.serializeConfig = serializeConfig;
+  exports.setChilrenLayout = setChilrenLayout;
   exports.setConfig = setConfig;
   exports.setLayout = setLayout;
   exports.storageService = storageService;