@tmagic/editor 1.1.0-beta.4 → 1.1.0-beta.5

package/dist/tmagic-editor.es.js

@@ -622,7 +622,15 @@ var historyService = new History();
 
 class Props extends BaseService {
   constructor() {
-    super(["setPropsConfig", "getPropsConfig", "setPropsValue", "getPropsValue", "createId", "setNewItemId"]);
+    super([
+      "setPropsConfig",
+      "getPropsConfig",
+      "setPropsValue",
+      "getPropsValue",
+      "createId",
+      "setNewItemId",
+      "getDefaultPropsValue"
+    ]);
     this.state = reactive({
       propsConfigMap: {},
       propsValueMap: {}
@@ -661,10 +669,17 @@ class Props extends BaseService {
       }
       return value;
     }
-    const data = cloneDeep(defaultValue);
-    await this.setNewItemId(data);
+    const [id, defaultPropsValue, data] = await Promise.all([
+      this.createId(type),
+      this.getDefaultPropsValue(type),
+      this.setNewItemId(cloneDeep({
+        type,
+        ...defaultValue
+      }))
+    ]);
     return {
-      ...getDefaultPropsValue(type, await this.createId(type)),
+      id,
+      ...defaultPropsValue,
       ...mergeWith(cloneDeep(this.state.propsValueMap[type] || {}), data)
     };
   }
@@ -682,6 +697,20 @@ class Props extends BaseService {
         await this.setNewItemId(item, config);
       }
     }
+    return config;
+  }
+  async getDefaultPropsValue(type) {
+    return ["page", "container"].includes(type) ? {
+      type,
+      layout: "absolute",
+      style: {},
+      name: type,
+      items: []
+    } : {
+      type,
+      style: {},
+      name: type
+    };
   }
 }
 const updatePopId = (oldId, popId, pageConfig) => {
@@ -1037,9 +1066,10 @@ class Editor$1 extends BaseService {
     if (!isPage2) {
       this.pushHistoryState();
     }
-    stage?.select(newNode.id);
     if (isPage2) {
       this.state.pageLength += 1;
+    } else {
+      stage?.select(newNode.id);
     }
     this.emit("add", newNode);
     return newNode;
@@ -1157,7 +1187,7 @@ class Editor$1 extends BaseService {
       console.error(e);
       return;
     }
-    await propsService.setNewItemId(config, this.get("root"));
+    config = await propsService.setNewItemId(config, this.get("root"));
     if (config.style) {
       config.style = {
         ...config.style,
@@ -1595,19 +1625,6 @@ const fillConfig = (config = []) => [
   }
 ];
 const DEFAULT_CONFIG = fillConfig([]);
-const getDefaultPropsValue = (type, id) => ["page", "container"].includes(type) ? {
-  type,
-  id,
-  layout: "absolute",
-  style: {},
-  name: type,
-  items: []
-} : {
-  type,
-  id,
-  style: {},
-  name: type
-};
 
 const log = (...args) => {
 };
@@ -2615,9 +2632,17 @@ const useDrop = (tree, editorService) => ({
       return true;
     return false;
   },
-  handleDragEnd() {
+  async handleDragEnd(e) {
     if (!tree.value)
       return;
+    const { data: node } = e;
+    const parent = editorService?.getParentById(node.id, false);
+    const layout = await editorService?.getLayout(parent);
+    node.style.position = layout;
+    if (layout === Layout.RELATIVE) {
+      node.style.top = 0;
+      node.style.left = 0;
+    }
     const { data } = tree.value;
     const [page] = data;
     editorService?.update(page);
@@ -4207,5 +4232,5 @@ var 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, ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, generatePageName, generatePageNameByApp, getConfig, getDefaultPropsValue, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, setConfig, setLayout, uiService, warn };
+export { COPY_STORAGE_KEY, ComponentListPanel, DEFAULT_CONFIG, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, Keys, LayerOffset, LayerPanel, Layout, PropsPanel, CodeEditor as TMagicCodeEditor, Editor as TMagicEditor, ToolButton, V_GUIDE_LINE_STORAGE_KEY, change2Fixed, debug, index as default, editorService, error, eventsService, fillConfig, fixNodeLeft, generatePageName, generatePageNameByApp, getConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getRelativeStyle, historyService, info, isFixed, log, propsService, setConfig, setLayout, uiService, warn };
 //# sourceMappingURL=tmagic-editor.es.js.map