Merge branch 'fix/script-manage' into 'main_dev'

fix: 修复测试转换脚本保存时数据结构不正确

See merge request yunteng/thingskit-front!1415

@@ -96,7 +96,7 @@
   };
 
   const set = (val: string, cursorPos?: number) => {
-    return unref(editorInstance)?.setValue(val, cursorPos);
+    return unref(editorInstance)?.setValue(unref(val), cursorPos);
   };
 
   function destroy() {

@@ -12,13 +12,7 @@
   import { isFunction, isString } from '/@/utils/is';
   import { ScriptLanguageEnum } from '/@/enums/scriptEnum';
   import { ScriptTestParams } from '/@/api/ruleChainDesigner/model';
-
-  interface Value {
-    msg: Recordable;
-    metadata: Recordable;
-    msgType: MessageTypesEnum;
-    javascriptFunction: string;
-  }
+  import { TestModalValueType } from '.';
 
   const props = withDefaults(
     defineProps<{
@@ -45,8 +39,8 @@
 
   const emit = defineEmits<{
     (eventName: 'cancel'): void;
-    (eventName: 'test', value: Value): void;
-    (eventName: 'save', value: Value): void;
+    (eventName: 'test', value: TestModalValueType): void;
+    (eventName: 'save', value: TestModalValueType): void;
   }>();
 
   const jsonEditor = ref<InstanceType<typeof JSONEditor>>();
@@ -85,7 +79,7 @@
     return true;
   };
 
-  const getValue = (): Value => {
+  const getValue = (): TestModalValueType => {
     const msg = unref(messageContent);
     const msgType = unref(messageType);
     const javascriptFunction = unref(scriptContent);
@@ -138,14 +132,13 @@
 
     const result = await executeTestScript();
 
-    outputContent.value = result;
+    outputContent.value = result || '';
     await nextTick();
     unref(jsonEditor)?.handleFormat();
   };
 
   const handleSave = async () => {
     const flag = await handleValidate();
-
     flag && emit('save', getValue());
   };
 

@@ -6,7 +6,7 @@
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { computed, ref, toRaw, unref, watch } from 'vue';
   import { ScriptLanguageEnum } from '/@/enums/scriptEnum';
-  import { ScriptEditorValueType } from '.';
+  import { ScriptEditorValueType, TestModalValueType } from '.';
   import { ScriptTestParams } from '/@/api/ruleChainDesigner/model';
 
   const props = withDefaults(
@@ -74,14 +74,14 @@
     },
   });
 
-  const handleSave = (value: Record<'javascriptFunction', string>) => {
+  const handleSave = ({ javascriptFunction }: TestModalValueType) => {
     const { jsScript, tbelScript } = props.value || {};
     const scriptLang = unref(activeLanguage);
     emit(
       'update:value',
       toRaw({
-        jsScript: scriptLang === ScriptLanguageEnum.JavaScript ? value : jsScript,
-        tbelScript: scriptLang === ScriptLanguageEnum.TBEL ? value : tbelScript,
+        jsScript: scriptLang === ScriptLanguageEnum.JavaScript ? javascriptFunction : jsScript,
+        tbelScript: scriptLang === ScriptLanguageEnum.TBEL ? javascriptFunction : tbelScript,
         scriptLang,
       } as ScriptEditorValueType)
     );

+import { MessageTypesEnum } from '../../../enum/form';
 import { ScriptLanguageEnum } from '/@/enums/scriptEnum';
 
 export { default as JavaScriptTestModal } from './JavaScriptTestModal.vue';
@@ -9,3 +10,10 @@ export interface ScriptEditorValueType {
   jsScript: string;
   tbelScript: string;
 }
+
+export interface TestModalValueType {
+  msg: Recordable;
+  metadata: Recordable;
+  msgType: MessageTypesEnum;
+  javascriptFunction: string;
+}