Merge branch 'fix/DEFECT-208622' into 'v1.4.0_dev'

fix: TCP转换脚本点击确认时，提示Validation error: scriptType 脚本类型不能为空

See merge request yunteng/thingskit-front!1343

@@ -23,12 +23,14 @@
       if ([DataActionModeEnum.UPDATE, DataActionModeEnum.READ].includes(mode)) {
       if ([DataActionModeEnum.UPDATE, DataActionModeEnum.READ].includes(mode)) {
         const { name, description, convertTbel, convertJs, scriptLanguage, serviceType } =
         const { name, description, convertTbel, convertJs, scriptLanguage, serviceType } =
           record || {};
           record || {};
+        activeLanguage.value = scriptLanguage;
         setFieldsValue({
         setFieldsValue({
           name,
           name,
           description,
           description,
           serviceType,
           serviceType,
+          language: scriptLanguage,
           scriptContent: {
           scriptContent: {
-            scriptLanguage,
+            scriptLanguage: 'JS',
             value: convertJs,
             value: convertJs,
           },
           },
           tbelContent: {
           tbelContent: {
@@ -60,6 +62,7 @@
         description,
         description,
         scriptContent: { value },
         scriptContent: { value },
         language,
         language,
+        scriptType,
         tbelContent: { value: taelValue },
         tbelContent: { value: taelValue },
         serviceType,
         serviceType,
       } = getFieldsValue() as FormFieldsValueType;
       } = getFieldsValue() as FormFieldsValueType;
@@ -68,6 +71,7 @@
         name,
         name,
         description,
         description,
         status: 1,
         status: 1,
+        scriptType,
         scriptLanguage: language,
         scriptLanguage: language,
         serviceType,
         serviceType,
       };
       };

@@ -41,6 +41,23 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    label: '脚本类型',
+    field: 'scriptType',
+    required: true,
+    component: 'ApiRadioGroup',
+    defaultValue: 'TRANSPORT_TCP_UP',
+    componentProps: () => {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'script_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+      };
+    },
+  },
+  {
     label: '脚本服务类型',
     label: '脚本服务类型',
     field: FormFieldsEnum.ServiceType,
     field: FormFieldsEnum.ServiceType,
     component: 'ApiRadioGroup',
     component: 'ApiRadioGroup',
@@ -81,7 +98,7 @@ export const formSchemas: FormSchema[] = [
     label: '',
     label: '',
     field: FormFieldsEnum.ScriptContent,
     field: FormFieldsEnum.ScriptContent,
     component: 'JavascriptEditorWithTestModal',
     component: 'JavascriptEditorWithTestModal',
-    show: ({ model }) => {
+    ifShow: ({ model }) => {
       return model.language === ScriptLanguageEnum.JavaScript;
       return model.language === ScriptLanguageEnum.JavaScript;
     },
     },
     componentProps: {
     componentProps: {
@@ -167,7 +184,7 @@ export const formSchemas: FormSchema[] = [
     label: '',
     label: '',
     field: FormFieldsEnum.TbelContent,
     field: FormFieldsEnum.TbelContent,
     component: 'JavascriptEditorWithTestModal',
     component: 'JavascriptEditorWithTestModal',
-    show: ({ model }) => {
+    ifShow: ({ model }) => {
       return model.language === ScriptLanguageEnum.TBEL;
       return model.language === ScriptLanguageEnum.TBEL;
     },
     },
     componentProps: {
     componentProps: {

@@ -37,10 +37,10 @@ export const aceEditorOptions = {
   enableEmmet: true,
   enableEmmet: true,
 };
 };
 
 
-// const scriptTypeInfo = {
-//   TRANSPORT_TCP_UP: '上行数据解析',
-//   TRANSPORT_TCP_AUTH: '设备鉴权',
-// };
+export const scriptTypeInfo = {
+  TRANSPORT_TCP_UP: '上行数据解析',
+  TRANSPORT_TCP_AUTH: '设备鉴权',
+};
 
 
 // 表格配置
 // 表格配置
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [