@tmagic/editor 1.3.0 → 1.3.1

package/dist/tmagic-editor.js

@@ -1626,23 +1626,27 @@ const getInitPositionStyle = (style = {}, layout) => {
   }
   return style;
 };
-const setLayout = (node, layout) => {
+const setChilrenLayout = (node, layout) => {
   node.items?.forEach((child) => {
-    if (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 (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 = getNodePath(node.id, root.items);
   const offset = {
@@ -2497,8 +2501,8 @@ class Editor extends BaseService {
       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");
@@ -2720,6 +2724,11 @@ class Editor extends BaseService {
         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");
@@ -6143,7 +6152,6 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
     const tree = ref();
     __expose({
       filter(val) {
-        debugger;
         tree.value?.filter(val);
       }
     });
@@ -10502,5 +10510,5 @@ const index = {
   }
 };
 
-export { CODE_DRAFT_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$P as CodeBlockEditor, _sfc_main$r as CodeBlockList, _sfc_main$q as CodeBlockListPanel, CodeDeleteErrorType, _sfc_main$Q as CodeSelect, _sfc_main$M as CodeSelectCol, ColumnLayout, _sfc_main$f as ComponentListPanel, _sfc_main$k as ContentMenu, _sfc_main$K as DataSourceFieldSelect, _sfc_main$L as DataSourceFields, _sfc_main$J as DataSourceInput, _sfc_main$H as DataSourceMethodSelect, _sfc_main$I as DataSourceMethods, _sfc_main$G as DataSourceMocks, _sfc_main$F as DataSourceSelect, DepTargetType, DragType, _sfc_main$E as EventSelect, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$N as Icon, KeyBindingCommand, _sfc_main$D as KeyValue, Keys, LayerOffset, _sfc_main$g as LayerPanel, Layout, _sfc_main$A as LayoutContainer, _sfc_main$v as PropsPanel, _sfc_main$B as Resizer, _sfc_main$A as SplitView, _sfc_main$T as TMagicCodeEditor, _sfc_main as TMagicEditor, _sfc_main$x as ToolButton, UI_SELECT_MODE_EVENT_NAME, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, beforePaste, change2Fixed, codeBlockService, dataSourceService, debug, index as default, depService, displayTabConfig, editorService, error, eventTabConfig, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getConfig, getDefaultConfig, getDisplayField, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, isFixed, log, propsService, serializeConfig, setConfig, setLayout, storageService, styleTabConfig, traverseNode, uiService, useCodeBlockEdit, useDataSourceMethod, useStage, warn };
+export { CODE_DRAFT_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$P as CodeBlockEditor, _sfc_main$r as CodeBlockList, _sfc_main$q as CodeBlockListPanel, CodeDeleteErrorType, _sfc_main$Q as CodeSelect, _sfc_main$M as CodeSelectCol, ColumnLayout, _sfc_main$f as ComponentListPanel, _sfc_main$k as ContentMenu, _sfc_main$K as DataSourceFieldSelect, _sfc_main$L as DataSourceFields, _sfc_main$J as DataSourceInput, _sfc_main$H as DataSourceMethodSelect, _sfc_main$I as DataSourceMethods, _sfc_main$G as DataSourceMocks, _sfc_main$F as DataSourceSelect, DepTargetType, DragType, _sfc_main$E as EventSelect, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$N as Icon, KeyBindingCommand, _sfc_main$D as KeyValue, Keys, LayerOffset, _sfc_main$g as LayerPanel, Layout, _sfc_main$A as LayoutContainer, _sfc_main$v as PropsPanel, _sfc_main$B as Resizer, _sfc_main$A as SplitView, _sfc_main$T as TMagicCodeEditor, _sfc_main as TMagicEditor, _sfc_main$x as ToolButton, UI_SELECT_MODE_EVENT_NAME, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, beforePaste, change2Fixed, codeBlockService, dataSourceService, debug, index as default, depService, displayTabConfig, editorService, error, eventTabConfig, eventsService, fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getConfig, getDefaultConfig, getDisplayField, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, isFixed, log, propsService, serializeConfig, setChilrenLayout, setConfig, setLayout, storageService, styleTabConfig, traverseNode, uiService, useCodeBlockEdit, useDataSourceMethod, useStage, warn };
 //# sourceMappingURL=tmagic-editor.js.map