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

package/dist/tmagic-editor.umd.js

@@ -640,7 +640,15 @@
 
   class Props extends BaseService {
     constructor() {
-      super(["setPropsConfig", "getPropsConfig", "setPropsValue", "getPropsValue", "createId", "setNewItemId"]);
+      super([
+        "setPropsConfig",
+        "getPropsConfig",
+        "setPropsValue",
+        "getPropsValue",
+        "createId",
+        "setNewItemId",
+        "getDefaultPropsValue"
+      ]);
       this.state = vue.reactive({
         propsConfigMap: {},
         propsValueMap: {}
@@ -679,10 +687,17 @@
         }
         return value;
       }
-      const data = lodashEs.cloneDeep(defaultValue);
-      await this.setNewItemId(data);
+      const [id, defaultPropsValue, data] = await Promise.all([
+        this.createId(type),
+        this.getDefaultPropsValue(type),
+        this.setNewItemId(lodashEs.cloneDeep({
+          type,
+          ...defaultValue
+        }))
+      ]);
       return {
-        ...getDefaultPropsValue(type, await this.createId(type)),
+        id,
+        ...defaultPropsValue,
         ...lodashEs.mergeWith(lodashEs.cloneDeep(this.state.propsValueMap[type] || {}), data)
       };
     }
@@ -700,6 +715,20 @@
           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) => {
@@ -1055,9 +1084,10 @@
       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;
@@ -1175,7 +1205,7 @@
         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,
@@ -1613,19 +1643,6 @@
     }
   ];
   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) => {
   };
@@ -2633,9 +2650,17 @@
         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);
@@ -4250,7 +4275,6 @@
   exports.generatePageName = generatePageName;
   exports.generatePageNameByApp = generatePageNameByApp;
   exports.getConfig = getConfig;
-  exports.getDefaultPropsValue = getDefaultPropsValue;
   exports.getGuideLineFromCache = getGuideLineFromCache;
   exports.getInitPositionStyle = getInitPositionStyle;
   exports.getNodeIndex = getNodeIndex;