@tmagic/editor 1.0.0-beta.4 → 1.0.0-beta.7

package/dist/tmagic-editor.umd.js

@@ -761,22 +761,6 @@
     }
     return toRelative(node);
   };
-  const defaults = (object, source) => {
-    let o = source;
-    if (Array.isArray(object)) {
-      o = object;
-    }
-    Object.entries(o).forEach(([key, value]) => {
-      if (typeof object[key] === "undefined") {
-        object[key] = value;
-        return;
-      }
-      if (value && typeof value !== "string" && Object.keys(value).length) {
-        object[key] = defaults(lodashEs.cloneDeep(object[key]), value);
-      }
-    });
-    return object;
-  };
 
   const log = (...args) => {
   };
@@ -878,6 +862,9 @@
       const { node, parent, page } = this.getNodeInfo(id);
       if (!node)
         throw new Error("\u83B7\u53D6\u4E0D\u5230\u7EC4\u4EF6\u4FE1\u606F");
+      if (node.id === this.state.root?.id) {
+        throw new Error("\u4E0D\u80FD\u9009\u6839\u8282\u70B9");
+      }
       this.set("node", node);
       this.set("page", page || null);
       this.set("parent", parent || null);
@@ -945,7 +932,11 @@
         throw new Error(`\u83B7\u53D6\u4E0D\u5230id\u4E3A${config2.id}\u7684\u8282\u70B9`);
       const node = lodashEs.cloneDeep(vue.toRaw(info.node));
       let newConfig = await this.toggleFixedPosition(vue.toRaw(config2), node, this.get("root"));
-      defaults(newConfig, node);
+      newConfig = lodashEs.mergeWith(lodashEs.cloneDeep(node), newConfig, (objValue, srcValue) => {
+        if (Array.isArray(srcValue)) {
+          return srcValue;
+        }
+      });
       if (!newConfig.type)
         throw new Error("\u914D\u7F6E\u7F3A\u5C11type\u503C");
       if (newConfig.type === "app") {
@@ -2948,8 +2939,10 @@
       }
     },
     setup(props) {
+      const services = vue.inject("services");
       return {
-        keys: vue.computed(() => Object.keys(props.data))
+        keys: vue.computed(() => Object.keys(props.data)),
+        columnWidth: vue.computed(() => services?.uiService.get("columnWidth"))
       };
     }
   });
@@ -2962,7 +2955,8 @@
       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.keys, (key) => {
         return vue.openBlock(), vue.createElementBlock("div", {
           class: vue.normalizeClass(`menu-${key}`),
-          key
+          key,
+          style: vue.normalizeStyle(`width: ${_ctx.columnWidth?.[key]}px`)
         }, [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.data[key], (item, index) => {
             return vue.openBlock(), vue.createBlock(_component_tool_button, {
@@ -2970,7 +2964,7 @@
               key: index
             }, null, 8, ["data"]);
           }), 128))
-        ], 2);
+        ], 6);
       }), 128))
     ], 4);
   }
@@ -2985,17 +2979,14 @@
       const configForm = vue.ref();
       const curFormConfig = vue.ref([]);
       const services = vue.inject("services");
+      const node = vue.computed(() => services?.editorService.get("node"));
       const init = async () => {
-        const node = services?.editorService.get("node");
-        if (!node) {
+        if (!node.value) {
           curFormConfig.value = [];
           return;
         }
-        if (node.devconfig && node.style && !isNaN(+node.style.height) && !isNaN(+node.style.width)) {
-          node.devconfig.ratio = node.style.height / node.style.width || 1;
-        }
-        values.value = node;
-        const type = node.type || (node.items ? "container" : "text");
+        values.value = node.value;
+        const type = node.value.type || (node.value.items ? "container" : "text");
         curFormConfig.value = await services?.propsService.getPropsConfig(type) || [];
       };
       vue.watchEffect(init);
@@ -3642,7 +3633,8 @@
         const { width, height } = contentRect;
         const targetRect = this.target.getBoundingClientRect();
         const targetWidth = targetRect.width * this.zoom;
-        const targetHeight = targetRect.height * this.zoom;
+        const targetMarginTop = Number(this.target.style.marginTop) || 0;
+        const targetHeight = (targetRect.height + targetMarginTop) * this.zoom;
         if (targetWidth < width) {
           this.target._left = 0;
         }
@@ -3742,10 +3734,11 @@
         event.preventDefault();
         event.stopImmediatePropagation();
         event.stopPropagation();
-      } else if (this.keydown)
+      }
+      if (event.code !== Keys.ESCAPE || !this.enter || this.keydown) {
         return;
+      }
       this.keydown = true;
-      event.preventDefault();
       this.target.style.cursor = "grab";
       this.container.addEventListener("mousedown", this.mousedownHandler);
     };
@@ -3822,6 +3815,7 @@
         width: ${props.width}px;
         height: ${props.height}px;
         position: absolute;
+        margin-top: 30px;
       `)
       };
     }
@@ -4498,7 +4492,6 @@
   exports.change2Fixed = change2Fixed;
   exports.debug = debug;
   exports["default"] = index;
-  exports.defaults = defaults;
   exports.editorService = editorService;
   exports.error = error;
   exports.eventsService = eventsService;