@tmagic/editor 1.7.3 → 1.7.5-beta.1

package/dist/tmagic-editor.js

@@ -1037,33 +1037,65 @@ const setLayout = (node, layout) => {
   return node;
 };
 const change2Fixed = (node, root) => {
+  const style = {
+    ...node.style || {}
+  };
   const path = getNodePath(node.id, root.items);
   const offset = {
     left: 0,
     top: 0
   };
-  path.forEach((value) => {
-    offset.left = offset.left + globalThis.parseFloat(value.style?.left || 0);
-    offset.top = offset.top + globalThis.parseFloat(value.style?.top || 0);
-  });
-  return {
-    ...node.style || {},
-    ...offset
-  };
+  if (!node.style?.right && isNumber(node.style?.left || 0)) {
+    for (const value of path) {
+      if (value.style?.right || !isNumber(value.style?.left || 0)) {
+        offset.left = 0;
+        break;
+      }
+      offset.left = offset.left + Number(value.style?.left || 0);
+    }
+  }
+  if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
+    for (const value of path) {
+      if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
+        offset.top = 0;
+        break;
+      }
+      offset.top = offset.top + Number(value.style?.top || 0);
+    }
+  }
+  if (offset.left) {
+    style.left = offset.left;
+  }
+  if (offset.top) {
+    style.top = offset.top;
+  }
+  return style;
 };
 const Fixed2Other = async (node, root, getLayout) => {
   const path = getNodePath(node.id, root.items);
   const cur = path.pop();
   const offset = {
     left: cur?.style?.left || 0,
-    top: cur?.style?.top || 0,
-    right: "",
-    bottom: ""
+    top: cur?.style?.top || 0
   };
-  path.forEach((value) => {
-    offset.left = offset.left - globalThis.parseFloat(value.style?.left || 0);
-    offset.top = offset.top - globalThis.parseFloat(value.style?.top || 0);
-  });
+  if (!node.style?.right && isNumber(node.style?.left || 0)) {
+    for (const value of path) {
+      if (value.style?.right || !isNumber(value.style?.left || 0)) {
+        offset.left = 0;
+        break;
+      }
+      offset.left = offset.left - Number(value.style?.left || 0);
+    }
+  }
+  if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
+    for (const value of path) {
+      if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
+        offset.top = 0;
+        break;
+      }
+      offset.top = offset.top - Number(value.style?.top || 0);
+    }
+  }
   const style = node.style || {};
   const parent = path.pop();
   if (!parent) {
@@ -1071,9 +1103,14 @@ const Fixed2Other = async (node, root, getLayout) => {
   }
   const layout = await getLayout(parent);
   if (layout !== Layout.RELATIVE) {
+    if (offset.left) {
+      style.left = offset.left;
+    }
+    if (offset.top) {
+      style.top = offset.top;
+    }
     return {
       ...style,
-      ...offset,
       position: "absolute"
     };
   }
@@ -5405,9 +5442,35 @@ const _sfc_main$1f = /* @__PURE__ */ defineComponent({
         }
       }
     ]);
+    const parseContent = (content) => {
+      if (typeof content === "string") {
+        const parseDSL = getEditorConfig("parseDSL");
+        return parseDSL(content);
+      }
+      return content;
+    };
     const submitForm = (values, data) => {
       changedValue.value = void 0;
-      emit("submit", values, data);
+      emit(
+        "submit",
+        {
+          ...values,
+          content: parseContent(values.content)
+        },
+        {
+          ...data,
+          changeRecords: data.changeRecords?.map((record) => {
+            let { value } = record;
+            if (record.propPath === "content" && typeof value === "string") {
+              value = parseContent(value);
+            }
+            return {
+              ...record,
+              value
+            };
+          })
+        }
+      );
     };
     const errorHandler = (error) => {
       tMagicMessage.error(error.message);
@@ -5703,12 +5766,6 @@ const _sfc_main$1e = /* @__PURE__ */ defineComponent({
       });
     };
     const submitCodeHandler = (value, data) => {
-      if (value.content) {
-        const parseDSL = getEditorConfig("parseDSL");
-        if (typeof value.content === "string") {
-          value.content = parseDSL(value.content);
-        }
-      }
       if (editIndex > -1) {
         emit("change", value, {
           modifyKey: editIndex,

package/dist/tmagic-editor.umd.cjs

@@ -5830,33 +5830,65 @@
     return node;
   };
   const change2Fixed = (node, root) => {
+    const style = {
+      ...node.style || {}
+    };
     const path = utils.getNodePath(node.id, root.items);
     const offset = {
       left: 0,
       top: 0
     };
-    path.forEach((value) => {
-      offset.left = offset.left + globalThis.parseFloat(value.style?.left || 0);
-      offset.top = offset.top + globalThis.parseFloat(value.style?.top || 0);
-    });
-    return {
-      ...node.style || {},
-      ...offset
-    };
+    if (!node.style?.right && utils.isNumber(node.style?.left || 0)) {
+      for (const value of path) {
+        if (value.style?.right || !utils.isNumber(value.style?.left || 0)) {
+          offset.left = 0;
+          break;
+        }
+        offset.left = offset.left + Number(value.style?.left || 0);
+      }
+    }
+    if (!node.style?.bottom && utils.isNumber(node.style?.top || 0)) {
+      for (const value of path) {
+        if (value.style?.bottom || !utils.isNumber(value.style?.top || 0)) {
+          offset.top = 0;
+          break;
+        }
+        offset.top = offset.top + Number(value.style?.top || 0);
+      }
+    }
+    if (offset.left) {
+      style.left = offset.left;
+    }
+    if (offset.top) {
+      style.top = offset.top;
+    }
+    return style;
   };
   const Fixed2Other = async (node, root, getLayout) => {
     const path = utils.getNodePath(node.id, root.items);
     const cur = path.pop();
     const offset = {
       left: cur?.style?.left || 0,
-      top: cur?.style?.top || 0,
-      right: "",
-      bottom: ""
+      top: cur?.style?.top || 0
     };
-    path.forEach((value) => {
-      offset.left = offset.left - globalThis.parseFloat(value.style?.left || 0);
-      offset.top = offset.top - globalThis.parseFloat(value.style?.top || 0);
-    });
+    if (!node.style?.right && utils.isNumber(node.style?.left || 0)) {
+      for (const value of path) {
+        if (value.style?.right || !utils.isNumber(value.style?.left || 0)) {
+          offset.left = 0;
+          break;
+        }
+        offset.left = offset.left - Number(value.style?.left || 0);
+      }
+    }
+    if (!node.style?.bottom && utils.isNumber(node.style?.top || 0)) {
+      for (const value of path) {
+        if (value.style?.bottom || !utils.isNumber(value.style?.top || 0)) {
+          offset.top = 0;
+          break;
+        }
+        offset.top = offset.top - Number(value.style?.top || 0);
+      }
+    }
     const style = node.style || {};
     const parent = path.pop();
     if (!parent) {
@@ -5864,9 +5896,14 @@
     }
     const layout = await getLayout(parent);
     if (layout !== Layout.RELATIVE) {
+      if (offset.left) {
+        style.left = offset.left;
+      }
+      if (offset.top) {
+        style.top = offset.top;
+      }
       return {
         ...style,
-        ...offset,
         position: "absolute"
       };
     }
@@ -10198,9 +10235,35 @@
           }
         }
       ]);
+      const parseContent = (content) => {
+        if (typeof content === "string") {
+          const parseDSL = getEditorConfig("parseDSL");
+          return parseDSL(content);
+        }
+        return content;
+      };
       const submitForm = (values, data) => {
         changedValue.value = void 0;
-        emit("submit", values, data);
+        emit(
+          "submit",
+          {
+            ...values,
+            content: parseContent(values.content)
+          },
+          {
+            ...data,
+            changeRecords: data.changeRecords?.map((record) => {
+              let { value } = record;
+              if (record.propPath === "content" && typeof value === "string") {
+                value = parseContent(value);
+              }
+              return {
+                ...record,
+                value
+              };
+            })
+          }
+        );
       };
       const errorHandler = (error) => {
         designPlugin.tMagicMessage.error(error.message);
@@ -10496,12 +10559,6 @@
         });
       };
       const submitCodeHandler = (value, data) => {
-        if (value.content) {
-          const parseDSL = getEditorConfig("parseDSL");
-          if (typeof value.content === "string") {
-            value.content = parseDSL(value.content);
-          }
-        }
         if (editIndex > -1) {
           emit("change", value, {
             modifyKey: editIndex,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.3",
+  "version": "1.7.5-beta.1",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -57,11 +57,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/design": "1.7.3",
-    "@tmagic/stage": "1.7.3",
-    "@tmagic/table": "1.7.3",
-    "@tmagic/utils": "1.7.3",
-    "@tmagic/form": "1.7.3"
+    "@tmagic/form": "1.7.4",
+    "@tmagic/stage": "1.7.4",
+    "@tmagic/utils": "1.7.4",
+    "@tmagic/design": "1.7.4",
+    "@tmagic/table": "1.7.4"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -75,7 +75,7 @@
     "monaco-editor": "^0.48.0",
     "typescript": "^5.9.3",
     "vue": "^3.5.24",
-    "@tmagic/core": "1.7.3"
+    "@tmagic/core": "1.7.4"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/components/CodeBlockEditor.vue

@@ -217,9 +217,38 @@ const functionConfig = computed<FormConfig>(() => [
   },
 ]);
 
+const parseContent = (content: any) => {
+  if (typeof content === 'string') {
+    // 如果是字符串则转换为函数
+    const parseDSL = getEditorConfig('parseDSL');
+    return parseDSL<(..._args: any[]) => any>(content);
+  }
+  return content;
+};
+
 const submitForm = (values: CodeBlockContent, data: ContainerChangeEventData) => {
   changedValue.value = undefined;
-  emit('submit', values, data);
+
+  emit(
+    'submit',
+    {
+      ...values,
+      content: parseContent(values.content),
+    },
+    {
+      ...data,
+      changeRecords: data.changeRecords?.map((record) => {
+        let { value } = record;
+        if (record.propPath === 'content' && typeof value === 'string') {
+          value = parseContent(value);
+        }
+        return {
+          ...record,
+          value,
+        };
+      }),
+    },
+  );
 };
 
 const errorHandler = (error: any) => {

package/src/fields/DataSourceMethods.vue

@@ -31,7 +31,6 @@ import { type ColumnConfig, MagicTable } from '@tmagic/table';
 
 import CodeBlockEditor from '@editor/components/CodeBlockEditor.vue';
 import type { CodeParamStatement } from '@editor/type';
-import { getEditorConfig } from '@editor/utils/config';
 
 defineOptions({
   name: 'MFieldsDataSourceMethods',
@@ -119,13 +118,6 @@ const createCodeHandler = () => {
 };
 
 const submitCodeHandler = (value: CodeBlockContent, data: ContainerChangeEventData) => {
-  if (value.content) {
-    // 在保存的时候转换代码内容
-    const parseDSL = getEditorConfig('parseDSL');
-    if (typeof value.content === 'string') {
-      value.content = parseDSL<(..._args: any[]) => any>(value.content);
-    }
-  }
   if (editIndex > -1) {
     emit('change', value, {
       modifyKey: editIndex,

package/src/utils/editor.ts

@@ -177,21 +177,45 @@ export const setLayout = (node: MNode, layout: Layout) => {
 };
 
 export const change2Fixed = (node: MNode, root: MApp) => {
+  const style = {
+    ...(node.style || {}),
+  };
+
   const path = getNodePath(node.id, root.items);
   const offset = {
     left: 0,
     top: 0,
   };
 
-  path.forEach((value) => {
-    offset.left = offset.left + globalThis.parseFloat(value.style?.left || 0);
-    offset.top = offset.top + globalThis.parseFloat(value.style?.top || 0);
-  });
+  if (!node.style?.right && isNumber(node.style?.left || 0)) {
+    for (const value of path) {
+      if (value.style?.right || !isNumber(value.style?.left || 0)) {
+        offset.left = 0;
+        break;
+      }
+      offset.left = offset.left + Number(value.style?.left || 0);
+    }
+  }
 
-  return {
-    ...(node.style || {}),
-    ...offset,
-  };
+  if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
+    for (const value of path) {
+      if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
+        offset.top = 0;
+        break;
+      }
+      offset.top = offset.top + Number(value.style?.top || 0);
+    }
+  }
+
+  if (offset.left) {
+    style.left = offset.left;
+  }
+
+  if (offset.top) {
+    style.top = offset.top;
+  }
+
+  return style;
 };
 
 export const Fixed2Other = async (
@@ -204,14 +228,28 @@ export const Fixed2Other = async (
   const offset = {
     left: cur?.style?.left || 0,
     top: cur?.style?.top || 0,
-    right: '',
-    bottom: '',
   };
 
-  path.forEach((value) => {
-    offset.left = offset.left - globalThis.parseFloat(value.style?.left || 0);
-    offset.top = offset.top - globalThis.parseFloat(value.style?.top || 0);
-  });
+  if (!node.style?.right && isNumber(node.style?.left || 0)) {
+    for (const value of path) {
+      if (value.style?.right || !isNumber(value.style?.left || 0)) {
+        offset.left = 0;
+        break;
+      }
+      offset.left = offset.left - Number(value.style?.left || 0);
+    }
+  }
+
+  if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
+    for (const value of path) {
+      if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
+        offset.top = 0;
+        break;
+      }
+      offset.top = offset.top - Number(value.style?.top || 0);
+    }
+  }
+
   const style = node.style || {};
 
   const parent = path.pop();
@@ -221,9 +259,16 @@ export const Fixed2Other = async (
 
   const layout = await getLayout(parent);
   if (layout !== Layout.RELATIVE) {
+    if (offset.left) {
+      style.left = offset.left;
+    }
+
+    if (offset.top) {
+      style.top = offset.top;
+    }
+
     return {
       ...style,
-      ...offset,
       position: 'absolute',
     };
   }

package/types/index.d.ts

@@ -1601,8 +1601,7 @@ declare const getInitPositionStyle: (style: Record<string, any> | undefined, lay
 declare const setChildrenLayout: (node: MContainer, layout: Layout) => MContainer;
 declare const setLayout: (node: MNode, layout: Layout) => _tmagic_schema.MComponent | undefined;
 declare const change2Fixed: (node: MNode, root: MApp) => {
-    left: number;
-    top: number;
+    [key: string]: any;
 };
 declare const Fixed2Other: (node: MNode, root: MApp, getLayout: (parent: MNode, node?: MNode) => Promise<Layout>) => Promise<Record<string, any>>;
 declare const getGuideLineFromCache: (key: string) => number[];