@tmagic/editor 1.7.2 → 1.7.4

package/dist/style.css

@@ -1272,9 +1272,6 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-code-select {
   width: 100%;
 }
-.m-fields-code-select .el-card__header {
-  display: none;
-}
 
 .m-fields-event-select {
   width: 100%;

package/dist/tmagic-editor.js

@@ -544,6 +544,10 @@ const _sfc_main$1o = /* @__PURE__ */ defineComponent({
           }
           return Array.isArray(model.codeId) ? model.codeId.join("/") : index;
         }
+        const codeContent = codeBlockService.getCodeContentById(model.codeId);
+        if (codeContent) {
+          return codeContent.name;
+        }
         return model.codeId || index;
       },
       items: [
@@ -5401,9 +5405,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);
@@ -5699,12 +5729,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

@@ -5337,6 +5337,10 @@
             }
             return Array.isArray(model.codeId) ? model.codeId.join("/") : index;
           }
+          const codeContent = codeBlockService.getCodeContentById(model.codeId);
+          if (codeContent) {
+            return codeContent.name;
+          }
           return model.codeId || index;
         },
         items: [
@@ -10194,9 +10198,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);
@@ -10492,12 +10522,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.2",
+  "version": "1.7.4",
   "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.2",
-    "@tmagic/table": "1.7.2",
-    "@tmagic/form": "1.7.2",
-    "@tmagic/stage": "1.7.2",
-    "@tmagic/utils": "1.7.2"
+    "@tmagic/design": "1.7.4",
+    "@tmagic/stage": "1.7.4",
+    "@tmagic/form": "1.7.4",
+    "@tmagic/table": "1.7.4",
+    "@tmagic/utils": "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.2"
+    "@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/CodeSelect.vue

@@ -56,6 +56,13 @@ const codeConfig = computed<GroupListConfig>(() => ({
 
       return Array.isArray(model.codeId) ? model.codeId.join('/') : index;
     }
+
+    const codeContent = codeBlockService.getCodeContentById(model.codeId);
+
+    if (codeContent) {
+      return codeContent.name;
+    }
+
     return model.codeId || index;
   },
   items: [

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/theme/code-block.scss

@@ -1,6 +1,3 @@
 .m-fields-code-select {
   width: 100%;
-  .el-card__header {
-    display: none;
-  }
 }