Merge branch 'main' into 'main_dev'

Main

See merge request yunteng/thingskit-front!1456

-import { DeviceInfoItemType, DeviceTypeItem, PageParams, ScriptTestParams } from './model';
+import {
+  DeviceInfoItemType,
+  DeviceTypeItem,
+  PageParams,
+  QueryItemType,
+  ScriptTestParams,
+} from './model';
 import { TBPaginationResult } from '/#/axios';
 import { ScriptLanguageEnum } from '/@/enums/scriptEnum';
 import { defHttp } from '/@/utils/http/axios';
@@ -6,7 +12,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   GET_DEVICE_INFOS = '/tenant/deviceInfos',
   GET_DEVICE_TYPE = '/device/types',
-  TENANT_QUEUE = '/tenant/queues',
+  QUEUE = '/queues',
   TEST_SCRIPT = '/ruleChain/testScript',
 }
 
@@ -39,10 +45,10 @@ export const getDeviceTypes = () => {
   );
 };
 
-export const getTenantQueue = (params: Recordable) => {
-  return defHttp.get<string[]>(
+export const getQueue = (params: Recordable) => {
+  return defHttp.get<TBPaginationResult<QueryItemType>>(
     {
-      url: Api.TENANT_QUEUE,
+      url: Api.QUEUE,
       params,
     },
     { joinPrefix: false }

@@ -62,3 +62,31 @@ export interface ScriptTestParams {
   scriptType?: string;
   needMetadataAndMsgType?: boolean;
 }
+
+export interface QueryItemType {
+  id: Id;
+  createdTime: number;
+  additionalInfo: any;
+  tenantId: Id;
+  name: string;
+  topic: string;
+  pollInterval: number;
+  partitions: number;
+  consumerPerPartition: boolean;
+  packProcessingTimeout: number;
+  submitStrategy: SubmitStrategy;
+  processingStrategy: ProcessingStrategy;
+}
+
+export interface SubmitStrategy {
+  type: string;
+  batchSize: number;
+}
+
+export interface ProcessingStrategy {
+  type: string;
+  retries: number;
+  failurePercentage: number;
+  pauseBetweenRetries: number;
+  maxPauseBetweenRetries: number;
+}

@@ -16,6 +16,7 @@ import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
 import { getDeviceProfileOtaPackages, getOtaPackageInfo } from '/@/api/ota';
 import { QueryDeviceProfileOtaPackagesType } from '/@/api/ota/model';
 import { OTAPackageType } from '/@/enums/otaEnum';
+import { createPickerSearch } from '/@/utils/pickerSearch';
 
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('LockControlGroup', LockControlGroup);
@@ -176,10 +177,8 @@ export const step1Schemas: FormSchema[] = [
                 });
             }
           },
-          showSearch: true,
           placeholder: '请选择产品',
-          filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
-            option.label.includes(inputValue),
+          ...createPickerSearch(),
         },
       };
     },
@@ -364,6 +363,7 @@ export const step1Schemas: FormSchema[] = [
             result && setFieldsValue({ sensorOrganizationId: result?.organizationId });
           }
         },
+        ...createPickerSearch(),
       };
     },
   },

@@ -15,6 +15,8 @@ export enum AssignToCustomerFieldsNameEnum {
 export enum ClearAlarmFieldsEnum {
   ALARM_TYPE = 'alarmType',
   ALARM_DETAILS_BUILD_JS = 'alarmDetailsBuildJs',
+  ALARM_DETAILS_BUILD_TBEL = 'alarmDetailsBuildTbel',
+  SCRIPT_LANG = 'scriptLang',
 }
 
 export enum ClearAlarmFieldsNameEnum {

 import { ClearAlarmFieldsEnum, ClearAlarmFieldsNameEnum } from '../../../enum/formField/action';
-import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '../../../src/components/JavaScriptFilterModal';
+import { DefaultNodeConfig } from '../../../types/node';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 
@@ -7,6 +11,17 @@ const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [ClearAlarmFieldsEnum.ALARM_DETAILS_BUILD_JS]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig {
+  alarmDetailsBuildJs: string;
+  alarmDetailsBuildTbel: string;
+  alarmType: string;
+  scriptLang: string;
+}
+
 export const formSchemas: FormSchema[] = [
   {
     field: ClearAlarmFieldsEnum.ALARM_DETAILS_BUILD_JS,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { NodeConfigValue, FormFieldsValue, formSchemas } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,29 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { alarmDetailsBuildJs, ...restParams } = value;
+    const { scriptLang, jsScript, tbelScript } = alarmDetailsBuildJs || {};
+
+    return {
+      ...restParams,
+      scriptLang,
+      alarmDetailsBuildJs: jsScript,
+      alarmDetailsBuildTbel: tbelScript,
+    };
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { alarmDetailsBuildJs, alarmDetailsBuildTbel, scriptLang } = value || {};
+    setFieldsValue({
+      ...value,
+      alarmDetailsBuildJs: {
+        jsScript: alarmDetailsBuildJs,
+        tbelScript: alarmDetailsBuildTbel,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -27,8 +27,11 @@ export const ClearAlarmConfig: NodeItemConfigType = {
       ruleChainNode: false,
       defaultConfiguration: {
         alarmType: 'General Alarm',
+        scriptLang: 'TBEL',
         alarmDetailsBuildJs:
           'var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n    //remove prevAlarmDetails from metadata\n    delete metadata.prevAlarmDetails;\n    //now metadata is the same as it comes IN this rule node\n}\n\n\nreturn details;',
+        alarmDetailsBuildTbel:
+          "var details = {};\nif (metadata.prevAlarmDetails != null) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n    //remove prevAlarmDetails from metadata\n    metadata.remove('prevAlarmDetails');\n    //now metadata is the same as it comes IN this rule node\n}\n\n\nreturn details;",
       },
       uiResources: ['static/rulenode/rulenode-core-config.js'],
       configDirective: 'tbActionNodeClearAlarmConfig',

 import { CreateAlarmFieldsEnum, CreateAlarmFieldsNameEnum } from '../../../enum/formField/action';
-import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '../../../src/components/JavaScriptFilterModal';
+import { DefaultNodeConfig } from '../../../types/node';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -8,6 +12,16 @@ const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [CreateAlarmFieldsEnum.ALARM_DETAILS_BUILD_JS]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig {
+  alarmDetailsBuildJs: string;
+  alarmDetailsBuildTbel: string;
+  scriptLang: string;
+}
+
 export const formSchemas: FormSchema[] = [
   {
     field: CreateAlarmFieldsEnum.USE_MESSAGE_ALARM_DATA,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,28 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { alarmDetailsBuildJs, ...resetParams } = value;
+    const { scriptLang, tbelScript, jsScript } = alarmDetailsBuildJs;
+    return {
+      ...resetParams,
+      alarmDetailsBuildJs: jsScript,
+      alarmDetailsBuildTbel: tbelScript,
+      scriptLang,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { alarmDetailsBuildJs, alarmDetailsBuildTbel, scriptLang } = value;
+    setFieldsValue({
+      ...value,
+      alarmDetailsBuildJs: {
+        jsScript: alarmDetailsBuildJs,
+        tbelScript: alarmDetailsBuildTbel,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -27,8 +27,11 @@ export const CreateAlarmConfig: NodeItemConfigType = {
       ruleChainNode: false,
       defaultConfiguration: {
         alarmType: 'General Alarm',
+        scriptLang: 'TBEL',
         alarmDetailsBuildJs:
           'var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n    //remove prevAlarmDetails from metadata\n    delete metadata.prevAlarmDetails;\n    //now metadata is the same as it comes IN this rule node\n}\n\n\nreturn details;',
+        alarmDetailsBuildTbel:
+          "var details = {};\nif (metadata.prevAlarmDetails != null) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n    //remove prevAlarmDetails from metadata\n    metadata.remove('prevAlarmDetails');\n    //now metadata is the same as it comes IN this rule node\n}\n\n\nreturn details;",
         severity: 'CRITICAL',
         propagate: false,
         propagateToOwner: false,

 import { EntityTypeEnum, EntityTypeNameEnum } from '../../../enum/form';
 import { GeneratorFieldsEnum, GeneratorFieldsNameEnum } from '../../../enum/formField/action';
-import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '../../../src/components/JavaScriptFilterModal';
+import { DefaultNodeConfig } from '../../../types/node';
 import { getEntityIdSelect } from '../../Filter/CheckRelation/create.config';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -9,6 +13,12 @@ const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [GeneratorFieldsEnum.JS_SCRIPT]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig, ScriptEditorValueType {}
+
 export const formSchemas: FormSchema[] = [
   {
     field: GeneratorFieldsEnum.MSG_COUNT,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,25 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { jsScript, ...resetParams } = value;
+    return {
+      ...resetParams,
+      ...jsScript,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { jsScript, tbelScript, scriptLang } = value;
+    setFieldsValue({
+      ...value,
+      jsScript: {
+        jsScript,
+        tbelScript,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -31,8 +31,11 @@ export const GeneratorConfig: NodeItemConfigType = {
         periodInSeconds: 1,
         originatorId: null,
         originatorType: null,
+        scriptLang: 'TBEL',
         jsScript:
           'var msg = { temp: 42, humidity: 77 };\nvar metadata = { data: 40 };\nvar msgType = "POST_TELEMETRY_REQUEST";\n\nreturn { msg: msg, metadata: metadata, msgType: msgType };',
+        tbelScript:
+          'var msg = { temp: 42, humidity: 77 };\nvar metadata = { data: 40 };\nvar msgType = "POST_TELEMETRY_REQUEST";\n\nreturn { msg: msg, metadata: metadata, msgType: msgType };',
       },
       uiResources: ['static/rulenode/rulenode-core-config.js'],
       configDirective: 'tbActionNodeGeneratorConfig',

 import { LogFieldsEnum, LogFieldsNameEnum } from '../../../enum/formField/action';
-import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '../../../src/components/JavaScriptFilterModal';
+import { DefaultNodeConfig } from '../../../types/node';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [LogFieldsEnum.JS_SCRIPT]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig, ScriptEditorValueType {}
+
 export const formSchemas: FormSchema[] = [
   {
     field: LogFieldsEnum.JS_SCRIPT,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,25 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { jsScript, ...resetParams } = value;
+    return {
+      ...resetParams,
+      ...jsScript,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { jsScript, tbelScript, scriptLang } = value;
+    setFieldsValue({
+      ...value,
+      jsScript: {
+        jsScript,
+        tbelScript,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -26,8 +26,11 @@ export const LogConfig: NodeItemConfigType = {
       customRelations: false,
       ruleChainNode: false,
       defaultConfiguration: {
+        scriptLang: 'TBEL',
         jsScript:
-          "return 'Incoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);",
+          "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);",
+        tbelScript:
+          "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);",
       },
       uiResources: ['static/rulenode/rulenode-core-config.js'],
       configDirective: 'tbActionNodeLogConfig',

 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import HelpMessage from './HelpMessage.vue';
-import { JavascriptEditorWithTestModal } from '/@/views/rule/designer/src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '/@/views/rule/designer/src/components/JavaScriptFilterModal';
 import { ScriptFieldsEnum, ScriptFieldsNameEnum } from '../../../enum/formField/filter';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { h } from 'vue';
+import { DefaultNodeConfig } from '../../../types/node';
 
 const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [ScriptFieldsEnum.JS_SCRIPT]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig, ScriptEditorValueType {}
+
 export const formSchemas: FormSchema[] = [
   {
     field: ScriptFieldsEnum.JS_SCRIPT,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,25 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { jsScript, ...resetParams } = value;
+    return {
+      ...resetParams,
+      ...jsScript,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { jsScript, tbelScript, scriptLang } = value;
+    setFieldsValue({
+      ...value,
+      jsScript: {
+        jsScript,
+        tbelScript,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -26,7 +26,9 @@ export const ScriptConfig: NodeItemConfigType = {
       customRelations: false,
       ruleChainNode: false,
       defaultConfiguration: {
+        scriptLang: 'TBEL',
         jsScript: 'return msg.temperature > 20;',
+        tbelScript: 'return msg.temperature > 20;',
       },
       uiResources: ['static/rulenode/rulenode-core-config.js'],
       configDirective: 'tbFilterNodeScriptConfig',

 import { SwitchFieldsEnum, SwitchFieldsNameEnum } from '../../../enum/formField/filter';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
-import { JavascriptEditorWithTestModal } from '/@/views/rule/designer/src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '/@/views/rule/designer/src/components/JavaScriptFilterModal';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { DefaultNodeConfig } from '../../../types/node';
 
 const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [SwitchFieldsEnum.JS_SCRIPT]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig, ScriptEditorValueType {}
+
 export const formSchemas: FormSchema[] = [
   {
     field: SwitchFieldsEnum.JS_SCRIPT,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
 
   defineProps<{
@@ -15,13 +15,25 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    return value;
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { jsScript, ...resetParams } = value;
+    return {
+      ...resetParams,
+      ...jsScript,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
-    setFieldsValue(value);
+    const { jsScript, tbelScript, scriptLang } = value;
+    setFieldsValue({
+      ...value,
+      jsScript: {
+        jsScript,
+        tbelScript,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -26,8 +26,11 @@ export const SwitchConfig: NodeItemConfigType = {
       customRelations: true,
       ruleChainNode: false,
       defaultConfiguration: {
+        scriptLang: 'TBEL',
         jsScript:
           "function nextRelation(metadata, msg) {\n    return ['one','nine'];\n}\nif(msgType === 'POST_TELEMETRY_REQUEST') {\n    return ['two'];\n}\nreturn nextRelation(metadata, msg);",
+        tbelScript:
+          "function nextRelation(metadata, msg) {\n    return ['one','nine'];\n}\nif(msgType == 'POST_TELEMETRY_REQUEST') {\n    return ['two'];\n}\nreturn nextRelation(metadata, msg);",
       },
       uiResources: ['static/rulenode/rulenode-core-config.js'],
       configDirective: 'tbFilterNodeSwitchConfig',

 import { CheckPointFieldsEnum, CheckPointFieldsNameEnum } from '../../../enum/formField/flow';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import ApiComplete from './ApiComplete.vue';
-import { getTenantQueue } from '/@/api/ruleChainDesigner';
+import { getQueue } from '/@/api/ruleChainDesigner';
 
 import { useI18n } from '/@/hooks/web/useI18n';
 
@@ -23,10 +23,16 @@ export const formSchemas: FormSchema[] = [
         placeholder: `请选择${t(CheckPointFieldsNameEnum.QUEUE_NAME)}`,
         getPopupContainer: () => document.body,
         api: async (params: Recordable) => {
-          const options = await getTenantQueue(params);
-          return options.map((value) => ({ label: value, value }));
+          const options = await getQueue(params);
+          return options.data.map((value) => ({ label: value.name, value: value.name }));
+        },
+        params: {
+          serviceType: 'TB_RULE_ENGINE',
+          page: 0,
+          pageSize: 10,
+          sortProperty: 'name',
+          sortOrder: 'ASC',
         },
-        params: { serviceType: 'TB_RULE_ENGINE' },
       };
     },
   },

 import { ScriptFieldsEnum, ScriptFieldsNameEnum } from '../../../enum/formField/transformation';
-import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import {
+  JavascriptEditorWithTestModal,
+  ScriptEditorValueType,
+} from '../../../src/components/JavaScriptFilterModal';
+import { DefaultNodeConfig } from '../../../types/node';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 
@@ -7,6 +11,12 @@ const { t } = useI18n();
 
 useComponentRegister('JavascriptEditorWithTestModal', JavascriptEditorWithTestModal);
 
+export interface FormFieldsValue {
+  [ScriptFieldsEnum.JS_SCRIPT]: ScriptEditorValueType;
+}
+
+export interface NodeConfigValue extends DefaultNodeConfig, ScriptEditorValueType {}
+
 export const formSchemas: FormSchema[] = [
   {
     field: ScriptFieldsEnum.JS_SCRIPT,

 <script lang="ts" setup>
   import type { CreateModalDefineExposeType } from '../../../types';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchemas } from './create.config';
+  import { FormFieldsValue, formSchemas, NodeConfigValue } from './create.config';
   import { NodeData } from '../../../types/node';
-  import { ScriptEditorValueType } from '/@/views/rule/designer/src/components/JavaScriptFilterModal';
-  import { ScriptFieldsEnum } from '../../../enum/formField/transformation';
 
   defineProps<{
     config: NodeData;
@@ -17,16 +15,25 @@
 
   const getValue: CreateModalDefineExposeType['getFieldsValue'] = async () => {
     await validate();
-    const value = getFieldsValue() || {};
-    const { scriptLang, jsScript, tbelScript } = (value || {})?.jsScript as ScriptEditorValueType;
-    return { scriptLang, jsScript, tbelScript };
+    const value = (getFieldsValue() || {}) as FormFieldsValue;
+    const { jsScript, ...resetParams } = value;
+    return {
+      ...resetParams,
+      ...jsScript,
+    } as NodeConfigValue;
   };
 
-  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value) => {
+  const setValue: CreateModalDefineExposeType['setFieldsValue'] = (value: NodeConfigValue) => {
     resetFields();
+    const { jsScript, tbelScript, scriptLang } = value;
     setFieldsValue({
-      [ScriptFieldsEnum.JS_SCRIPT]: value,
-    });
+      ...value,
+      jsScript: {
+        jsScript,
+        tbelScript,
+        scriptLang,
+      },
+    } as FormFieldsValue);
   };
 
   defineExpose({

@@ -58,7 +58,7 @@
   const getValue = computed<string>({
     get() {
       const { scriptLang, jsScript = '', tbelScript = '' } = props.value || {};
-      return scriptLang === ScriptLanguageEnum.JavaScript ? jsScript : tbelScript;
+      return scriptLang === ScriptLanguageEnum.TBEL ? tbelScript : jsScript;
     },
     set(value) {
       const { jsScript, tbelScript } = props.value || {};