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

package/dist/style.css

@@ -28,11 +28,11 @@
   z-index: 1;
   align-items: center;
 }
-.m-editor-nav-menu .menu-left {
-  padding-left: 16px;
+.m-editor-nav-menu .menu-center {
+  justify-content: center;
 }
 .m-editor-nav-menu .menu-right {
-  padding-right: 16px;
+  justify-content: flex-end;
 }
 .m-editor-nav-menu .menu-item {
   flex-direction: row;
@@ -493,6 +493,7 @@
   position: relative;
   border: 1px solid #d9dbdd;
   transition: transform 0.3s;
+  box-sizing: content-box;
 }
 .m-editor-stage-container::-webkit-scrollbar {
   width: 0 !important;

package/dist/tmagic-editor.es.js

@@ -2,7 +2,7 @@ import { defineComponent, computed, resolveComponent, openBlock, createBlock, no
 import serialize from 'serialize-javascript';
 import * as monaco from 'monaco-editor';
 import { Plus, Edit, ArrowDown, Grid, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Delete, Files, Coin, CaretBottom } from '@element-plus/icons';
-import { cloneDeep, random } from 'lodash-es';
+import { cloneDeep, random, mergeWith } from 'lodash-es';
 import { toLine, isPop, getNodePath } from '@tmagic/utils';
 import { EventEmitter as EventEmitter$2 } from 'events';
 import { DEFAULT_EVENTS, DEFAULT_METHODS } from '@tmagic/core';
@@ -742,22 +742,6 @@ const Fixed2Other = async (node, root, getLayout) => {
   }
   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(cloneDeep(object[key]), value);
-    }
-  });
-  return object;
-};
 
 const log = (...args) => {
 };
@@ -859,6 +843,9 @@ class Editor$1 extends BaseService {
     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);
@@ -926,7 +913,11 @@ class Editor$1 extends BaseService {
       throw new Error(`\u83B7\u53D6\u4E0D\u5230id\u4E3A${config2.id}\u7684\u8282\u70B9`);
     const node = cloneDeep(toRaw(info.node));
     let newConfig = await this.toggleFixedPosition(toRaw(config2), node, this.get("root"));
-    defaults(newConfig, node);
+    newConfig = mergeWith(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") {
@@ -2929,8 +2920,10 @@ const _sfc_main$b = defineComponent({
     }
   },
   setup(props) {
+    const services = inject("services");
     return {
-      keys: computed(() => Object.keys(props.data))
+      keys: computed(() => Object.keys(props.data)),
+      columnWidth: computed(() => services?.uiService.get("columnWidth"))
     };
   }
 });
@@ -2943,7 +2936,8 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.keys, (key) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(`menu-${key}`),
-        key
+        key,
+        style: normalizeStyle(`width: ${_ctx.columnWidth?.[key]}px`)
       }, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.data[key], (item, index) => {
           return openBlock(), createBlock(_component_tool_button, {
@@ -2951,7 +2945,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
             key: index
           }, null, 8, ["data"]);
         }), 128))
-      ], 2);
+      ], 6);
     }), 128))
   ], 4);
 }
@@ -2966,17 +2960,14 @@ const _sfc_main$a = defineComponent({
     const configForm = ref();
     const curFormConfig = ref([]);
     const services = inject("services");
+    const node = 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) || [];
     };
     watchEffect(init);
@@ -3623,7 +3614,8 @@ class ScrollViewer$1 {
       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;
       }
@@ -3723,10 +3715,11 @@ class ScrollViewer$1 {
       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);
   };
@@ -3803,6 +3796,7 @@ const _sfc_main$4 = defineComponent({
         width: ${props.width}px;
         height: ${props.height}px;
         position: absolute;
+        margin-top: 30px;
       `)
     };
   }
@@ -4465,5 +4459,5 @@ var index = {
   }
 };
 
-export { COPY_STORAGE_KEY, ComponentListPanel, DEFAULT_CONFIG, Fixed2Other, Keys, LayerOffset, LayerPanel, Layout, PropsPanel, CodeEditor as TMagicCodeEditor, Editor as TMagicEditor, change2Fixed, debug, index as default, defaults, editorService, error, eventsService, fillConfig, generateId, generatePageName, generatePageNameByApp, getConfig, getDefaultPropsValue, getNodeIndex, getPageList, getPageNameList, historyService, info, initPosition, isFixed, log, propsService, setConfig, setLayout, setNewItemId, toRelative, uiService, warn };
+export { COPY_STORAGE_KEY, ComponentListPanel, DEFAULT_CONFIG, Fixed2Other, Keys, LayerOffset, LayerPanel, Layout, PropsPanel, CodeEditor as TMagicCodeEditor, Editor as TMagicEditor, change2Fixed, debug, index as default, editorService, error, eventsService, fillConfig, generateId, generatePageName, generatePageNameByApp, getConfig, getDefaultPropsValue, getNodeIndex, getPageList, getPageNameList, historyService, info, initPosition, isFixed, log, propsService, setConfig, setLayout, setNewItemId, toRelative, uiService, warn };
 //# sourceMappingURL=tmagic-editor.es.js.map