Merge branch 'fix/tenant-config-add-config' into 'main_dev'

fix: 租户配置添加独立规则链的配置

See merge request yunteng/thingskit-front!1450

+<template>
+  <BasicForm @register="registerForm">
+    <template #nameSlot="{ model }">
+      <Input
+        :disabled="model.disabled"
+        v-model:value="model.name"
+        @change="handleNameChange"
+        placeholder="请输入"
+      />
+    </template>
+  </BasicForm>
+
+  <CollapseContainer
+    title="提交设置"
+    style="box-shadow: 0 3px 1px -2px #0003, 0 2px 2px #00000024, 0 1px 5px #0000001f"
+  >
+    <BasicForm @register="registerSubmitStrategyForm" />
+  </CollapseContainer>
+
+  <CollapseContainer
+    title="重试处理设置"
+    class="my-2 retry"
+    style="box-shadow: 0 3px 1px -2px #0003, 0 2px 2px #00000024, 0 1px 5px #0000001f"
+  >
+    <BasicForm @register="registerProcessingStrategyForm" />
+  </CollapseContainer>
+  <CollapseContainer
+    title="轮询设置"
+    style="box-shadow: 0 3px 1px -2px #0003, 0 2px 2px #00000024, 0 1px 5px #0000001f"
+  >
+    <BasicForm @register="registerPollingSettingsForm" />
+  </CollapseContainer>
+</template>
+
+<script lang="ts" setup>
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { Input } from 'ant-design-vue';
+  import {
+    formSchema,
+    submitStrategySchema,
+    processingStrategySchema,
+    pollingSettingsSchema,
+  } from './config';
+  import { CollapseContainer } from '/@/components/Container/index';
+
+  // const props = defineProps({
+  //   record: { type: Object },
+  // });
+
+  const emit = defineEmits(['handleNameChange']);
+
+  const [registerForm, { validate, getFieldsValue, setFieldsValue }] = useForm({
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [
+    registerSubmitStrategyForm,
+    {
+      validate: validateSubmitStrategy,
+      getFieldsValue: getFieldsValueSubmitStrategy,
+      setFieldsValue: setFieldsValueSubmitStrategy,
+    },
+  ] = useForm({
+    schemas: submitStrategySchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 12 },
+    wrapperCol: { span: 18 },
+  });
+  const [
+    registerProcessingStrategyForm,
+    {
+      validate: validateProcessingStrategy,
+      setFieldsValue: setFieldsValueProcessingStrategy,
+      getFieldsValue: getFieldsValueProcessingStrategy,
+    },
+  ] = useForm({
+    schemas: processingStrategySchema,
+    showActionButtonGroup: false,
+    // baseColProps: { span: 12 },
+    // wrapperCol: { span: 18 },
+  });
+  const [
+    registerPollingSettingsForm,
+    {
+      validate: validatePollingSettings,
+      getFieldsValue: getFieldsValuePollingSettings,
+      setFieldsValue: setFieldsValuePollingSettings,
+    },
+  ] = useForm({
+    schemas: pollingSettingsSchema,
+    showActionButtonGroup: false,
+    // baseColProps: { span: 12 },
+    // wrapperCol: { span: 18 },
+  });
+
+  const validateAll = async () => {
+    await validate();
+    await validateSubmitStrategy();
+    await validateProcessingStrategy();
+    await validatePollingSettings();
+  };
+
+  const getAllFieldsValue = () => {
+    const { name, description, customProperties, nameOnly, topic } = getFieldsValue() || {};
+    const additionalInfo = { description, customProperties };
+    const processingStrategy = getFieldsValueProcessingStrategy();
+    const submitStrategy = getFieldsValueSubmitStrategy();
+    const values = getFieldsValuePollingSettings();
+    const valuesInfo = {
+      name,
+      nameOnly,
+      additionalInfo,
+      processingStrategy,
+      submitStrategy,
+      topic,
+      ...values,
+    };
+    return valuesInfo;
+  };
+
+  const setAllFieldsValue = (record: any) => {
+    // disabled 只是用来禁用名称输入 Main  HighPriority SequentialByOriginator 默认是禁用  编辑的时候全部也是禁用
+    const { name, additionalInfo, processingStrategy, disabled, submitStrategy, topic, ...values } =
+      record || {};
+    setFieldsValue({ name, ...additionalInfo, disabled, topic });
+    setFieldsValueSubmitStrategy(submitStrategy);
+    setFieldsValueProcessingStrategy(processingStrategy);
+    setFieldsValuePollingSettings({ ...values });
+  };
+
+  const handleNameChange = ({ target }) => {
+    emit('handleNameChange', target?.value);
+  };
+
+  defineExpose({ getAllFieldsValue, setAllFieldsValue, setFieldsValue, validateAll });
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-input-number) {
+    width: 95% !important;
+  }
+
+  :deep(.ant-select) {
+    width: 95% !important;
+  }
+
+  .retry {
+    :deep(.ant-select) {
+      width: 97.5% !important;
+    }
+  }
+</style>

+import { FormSchema } from '/@/components/Form';
+
+const PolicyTypeEnum = {
+  SEQUENTIAL_BY_ORIGINATOR: 'SEQUENTIAL_BY_ORIGINATOR',
+  SEQUENTIAL_BY_TENANT: 'SEQUENTIAL_BY_TENANT',
+  SEQUENTIAL: 'SEQUENTIAL',
+  BURST: 'BURST',
+  BATCH: 'BATCH',
+};
+const PolicyTypeLabelEnum = {
+  SEQUENTIAL_BY_ORIGINATOR: '按发起者顺序处理',
+  SEQUENTIAL_BY_TENANT: '按租户顺序处理',
+  SEQUENTIAL: '顺序处理',
+  BURST: '突发处理',
+  BATCH: '批量处理',
+};
+
+const ProcessTypeEnum = {
+  RETRY_FAILED_AND_TIMED_OUT: 'RETRY_FAILED_AND_TIMED_OUT',
+  SKIP_ALL_FAILURES: 'SKIP_ALL_FAILURES',
+  SKIP_ALL_FAILURES_AND_TIMED_OUT: 'SKIP_ALL_FAILURES_AND_TIMED_OUT',
+  RETRY_ALL: 'RETRY_ALL',
+  RETRY_FAILED: 'RETRY_FAILED',
+  RETRY_TIMED_OUT: 'RETRY_TIMED_OUT',
+};
+
+const ProcessTypeLabelEnum = {
+  RETRY_FAILED_AND_TIMED_OUT: '失败与超时重试',
+  SKIP_ALL_FAILURES: '跳过所有失败',
+  SKIP_ALL_FAILURES_AND_TIMED_OUT: '跳过所有失败和超时',
+  RETRY_ALL: '全部重试',
+  RETRY_FAILED: '失败重试',
+  RETRY_TIMED_OUT: '超时重试',
+};
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '名称',
+    component: 'Input',
+    required: true,
+    rules: [
+      {
+        pattern: /^[A-Za-z0-9._-]*$/,
+        message: "不能包含ASCII字母数字以外的字符, '.', '_' 和 '-'等",
+      },
+      {
+        required: true,
+      },
+    ],
+    slot: 'nameSlot',
+  },
+  {
+    field: 'disabled',
+    label: '',
+    component: 'Checkbox',
+    ifShow: false,
+  },
+  {
+    // 用于判断名称是否是唯一的
+    field: 'nameOnly',
+    label: '',
+    defaultValue: true,
+    component: 'Checkbox',
+    ifShow: false,
+  },
+  {
+    field: 'topic',
+    label: '',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
+    field: 'customProperties',
+    label: '自定义属性',
+    component: 'Input',
+    helpMessage: [
+      '自定义队列（主题）创建属性，例如:retention.ms:604800000;retention.bytes:1048576000',
+    ],
+  },
+  {
+    field: 'description',
+    label: '说明',
+    component: 'InputTextArea',
+    helpMessage: ['此文本将显示在队列说明中，而不是所选策略中'],
+  },
+];
+
+export const submitStrategySchema: FormSchema[] = [
+  {
+    field: 'type',
+    label: '策略类型',
+    component: 'Select',
+    helpMessage: [
+      '按发起者顺序处理：在确认设备A的前一条消息之前,不会提交设备A的新消息',
+      '按租户顺序处理：在确认租户A的前一条消息之前,不会提交租户A的新消息',
+      '顺序处理：在确认前一条消息之前,不会提交新消息',
+      '突发处理：所有消息都按到达顺序提交到规则链',
+      '批量处理：在确认前一批消息之前，不会提交新批',
+    ],
+    defaultValue: PolicyTypeEnum.BURST,
+    componentProps: {
+      options: Object.keys(PolicyTypeLabelEnum).map((item) => ({
+        label: PolicyTypeLabelEnum[item],
+        value: PolicyTypeEnum[item],
+      })),
+    },
+  },
+  {
+    field: 'batchSize',
+    label: '批量处理大小',
+    required: true,
+    component: 'InputNumber',
+    ifShow: ({ model }) => model.type === PolicyTypeEnum.BATCH,
+  },
+];
+
+export const processingStrategySchema: FormSchema[] = [
+  {
+    field: 'type',
+    label: '处理类型',
+    component: 'Select',
+    colProps: { span: 24 },
+    required: true,
+    componentProps: {
+      options: Object.keys(ProcessTypeLabelEnum).map((item) => ({
+        label: ProcessTypeLabelEnum[item],
+        value: ProcessTypeEnum[item],
+      })),
+    },
+    helpMessage: [
+      '失败与超时重试：重试处理包重所有失败和超时的消息',
+      '跳过所有失败：忽略所有失败',
+      '跳过所有失败和超时：忽略所有失败和超时',
+      '全部重试：重试处理包中的所有消息',
+      '失败重试：重试处理包重的所有失败消息',
+      '超时重试：重试处理包中的所有超时消息',
+    ],
+    defaultValue: ProcessTypeEnum.SKIP_ALL_FAILURES,
+  },
+  {
+    field: 'retries',
+    label: '重试次数（0-无限制）',
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 12 },
+  },
+
+  {
+    field: 'failurePercentage',
+    label: '跳过重试的失败消息百分比',
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'pauseBetweenRetries',
+    label: '重试间隔（秒）',
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'maxPauseBetweenRetries',
+    label: '最大重试间隔（秒）',
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 12 },
+  },
+];
+
+export const pollingSettingsSchema: FormSchema[] = [
+  {
+    field: 'pollInterval',
+    label: '轮询间隔',
+    required: true,
+    colProps: { span: 12 },
+    component: 'InputNumber',
+  },
+  {
+    field: 'partitions',
+    label: '分区',
+    required: true,
+    colProps: { span: 12 },
+    component: 'InputNumber',
+  },
+  {
+    field: 'consumerPerPartition',
+    label: '每个分区消费者单独轮询消息',
+    required: true,
+    colProps: { span: 12 },
+    component: 'Checkbox',
+  },
+  {
+    field: 'packProcessingTimeout',
+    label: '处理超时（毫秒）',
+    required: true,
+    colProps: { span: 12 },
+    component: 'InputNumber',
+  },
+];

@@ -55,29 +55,42 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入名称',
     },
   },
+  // {
+  //   field: 'isolatedTbRuleEngine',
+  //   label: '',
+  //   component: 'Checkbox',
+  //   ifShow: false,
+  //   renderComponentContent: () => {
+  //     return h('span', {}, [
+  //       h('span', {}, '隔离板芯容器中的加工'),
+  //       h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
+  //     ]);
+  //   },
+  // },
+  // {
+  //   field: 'isolatedTbCore',
+  //   label: '',
+  //   component: 'Checkbox',
+  //   ifShow: false,
+  //   renderComponentContent: () => {
+  //     return h('span', {}, [
+  //       h('span', {}, '在独立的规则引擎中处理'),
+  //       h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
+  //     ]);
+  //   },
+  // },
   {
     field: 'isolatedTbRuleEngine',
     label: '',
     component: 'Checkbox',
-    ifShow: false,
+    // ifShow: false,
     renderComponentContent: () => {
       return h('span', {}, [
-        h('span', {}, '隔离板芯容器中的加工'),
-        h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
-      ]);
-    },
-  },
-  {
-    field: 'isolatedTbCore',
-    label: '',
-    component: 'Checkbox',
-    ifShow: false,
-    renderComponentContent: () => {
-      return h('span', {}, [
-        h('span', {}, '在独立的规则引擎中处理'),
-        h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
+        h('span', {}, '使用独立的规则引擎服务'),
+        h('span', { style: { color: 'grey' } }, '每个独立租户需要单独的规则引擎微服务'),
       ]);
     },
+    slot: 'isolatedTbRuleEngine',
   },
   {
     field: 'description',

@@ -19,7 +19,12 @@
 
   const speedData = ref<{ value: string | number; second: string | number; uuid?: string }[]>([]);
   const handleSuccess = (values) => {
-    if (values.length) speedData.value = values;
+    if (!values?.length) {
+      speedData.value = [];
+      emit('update:value', []);
+      return;
+    }
+    speedData.value = values;
     const items = values.map((item) => `${item.value}:${item.second}`).join(',');
     emit('update:value', items);
   };

@@ -9,8 +9,50 @@
       width="700px"
       @ok="handleSubmit"
     >
-      <BasicForm @register="registerForm" />
+      <BasicForm @register="registerForm">
+        <template #isolatedTbRuleEngine="{ model }">
+          <div class="flex items-center">
+            <Checkbox v-model:checked="model.isolatedTbRuleEngine" @change="handleCheckbox" />
+            <span>使用独立的规则引擎服务</span>
+            <span style="color: grey">(每个独立租户需要单独的规则引擎微服务)</span>
+          </div>
+        </template>
+      </BasicForm>
       <!-- <CpnsTenantSet ref="getChildData" :parentData="parentSetData" /> -->
+
+      <CollapseContainer
+        title="队列"
+        :defaultExpand="true"
+        v-if="isolatedTbRuleEngine"
+        class="mb-2"
+      >
+        <CollapseContainer
+          v-for="(item, index) in queueConfiguration"
+          :key="item.id"
+          :title="item.name"
+          :defaultExpand="true"
+          class="my-4"
+          style="box-shadow: 0 3px 1px -2px #0003, 0 2px 2px #00000024, 0 1px 5px #0000001f"
+        >
+          <template #action v-if="item.name !== 'Main'">
+            <Tooltip title="删除">
+              <Icon
+                class="ml-2 cursor-pointer"
+                icon="fluent:delete-off-20-regular"
+                size="20"
+                @click="handleDeleteTenant(index)"
+              />
+            </Tooltip>
+          </template>
+          <TenantConfig
+            ref="getTenantConfig"
+            :record="item"
+            @handleNameChange="(name) => handleNameChange(index, name)"
+          />
+        </CollapseContainer>
+
+        <Button @click="handleCreateQueue" type="primary" class="my-3">添加队列</Button>
+      </CollapseContainer>
       <CollapseContainer title="实体 (0-无限制)" :defaultExpand="false">
         <Entity ref="getEntity" />
       </CollapseContainer>
@@ -36,7 +78,15 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
+  import {
+    defineComponent,
+    ref,
+    computed,
+    unref,
+    getCurrentInstance,
+    reactive,
+    nextTick,
+  } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -51,6 +101,9 @@
   import { saveTenantProfileApi } from '/@/api/tenant/tenantApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { CollapseContainer } from '/@/components/Container/index';
+  import { Checkbox, Tooltip, Button } from 'ant-design-vue';
+  import TenantConfig from './components/TenantConfig.vue';
+  import { buildUUID } from '/@/utils/uuid';
 
   export default defineComponent({
     name: 'ConfigDrawer',
@@ -66,6 +119,10 @@
       Ota,
       Speed,
       Entity,
+      Checkbox,
+      Tooltip,
+      Button,
+      TenantConfig,
     },
     emits: ['success', 'register'],
     setup(_, { emit }) {
@@ -84,15 +141,177 @@
       const getOta = ref(null);
       const getWs = ref(null);
       const getSpeed = ref(null);
+      const getTenantConfig = ref(null);
 
       const editGetId: any = ref('');
       const isDefault = ref(false);
       const createTime = ref<string>('');
+
+      // 独立规则引擎默认的三项Main不能删除其他能删除
+      const defaultQueueConfiguration = () => {
+        return [
+          {
+            name: 'Main',
+            topic: 'tb_rule_engine.main',
+            pollInterval: 2000,
+            partitions: 1,
+            consumerPerPartition: false,
+            packProcessingTimeout: 10000,
+            submitStrategy: {
+              type: 'BURST',
+              batchSize: 1000,
+            },
+            processingStrategy: {
+              type: 'SKIP_ALL_FAILURES',
+              retries: 3,
+              failurePercentage: 0,
+              pauseBetweenRetries: 3,
+              maxPauseBetweenRetries: 3,
+            },
+            id: buildUUID(),
+            disabled: true,
+            nameOnly: true,
+            additionalInfo: {
+              description: '',
+              customProperties: '',
+            },
+          },
+          {
+            name: 'HighPriority',
+            topic: 'tb_rule_engine.hp',
+            pollInterval: 2000,
+            partitions: 1,
+            consumerPerPartition: false,
+            packProcessingTimeout: 10000,
+            submitStrategy: {
+              type: 'BURST',
+              batchSize: 100,
+            },
+            processingStrategy: {
+              type: 'RETRY_FAILED_AND_TIMED_OUT',
+              retries: 0,
+              failurePercentage: 0,
+              pauseBetweenRetries: 5,
+              maxPauseBetweenRetries: 5,
+            },
+            id: buildUUID(),
+            disabled: true,
+            nameOnly: true,
+            additionalInfo: {
+              description: '',
+              customProperties: '',
+            },
+          },
+          {
+            name: 'SequentialByOriginator',
+            topic: 'tb_rule_engine.sq',
+            pollInterval: 2000,
+            partitions: 1,
+            consumerPerPartition: false,
+            packProcessingTimeout: 10000,
+            submitStrategy: {
+              type: 'SEQUENTIAL_BY_ORIGINATOR',
+              batchSize: 100,
+            },
+            processingStrategy: {
+              type: 'RETRY_FAILED_AND_TIMED_OUT',
+              retries: 3,
+              failurePercentage: 0,
+              pauseBetweenRetries: 5,
+              maxPauseBetweenRetries: 5,
+            },
+            id: buildUUID(),
+            disabled: true,
+            nameOnly: true,
+            additionalInfo: {
+              description: '',
+              customProperties: '',
+            },
+          },
+        ];
+      };
+      const queueConfiguration = ref<any>([]);
+
       const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         schemas: formSchema,
         showActionButtonGroup: false,
       });
 
+      // 判断是否启用独立规则引擎
+      const isolatedTbRuleEngine = ref<boolean>(false);
+      const handleCheckbox = (checkedValue) => {
+        const {
+          target: { checked },
+        } = checkedValue || {};
+        isolatedTbRuleEngine.value = checked;
+        if (checked && !unref(isUpdate)) {
+          queueConfiguration.value = defaultQueueConfiguration();
+          nextTick(() => {
+            unref(queueConfiguration).forEach((item, index) => {
+              proxy.$refs.getTenantConfig[index]?.setAllFieldsValue(item);
+            });
+          });
+        }
+      };
+
+      // 删除队列
+      const handleDeleteTenant = (index: number) => {
+        queueConfiguration.value.splice(index, 1);
+      };
+
+      const handleNameChange = async (index: number, name: string) => {
+        const isRepeat = unref(queueConfiguration).every((item) => item.name !== name);
+        nextTick(() => {
+          queueConfiguration.value[index].name = name;
+        });
+        if (!isRepeat) {
+          createMessage.warning('队列名称必须唯一。');
+          proxy.$refs.getTenantConfig[index]?.setFieldsValue({
+            nameOnly: false,
+            topic: 'tb_rule_engine.' + name,
+          });
+          return;
+        }
+        proxy.$refs.getTenantConfig[index]?.setFieldsValue({
+          nameOnly: true,
+          topic: 'tb_rule_engine.' + name,
+        });
+      };
+
+      const handleCreateQueue = () => {
+        const values = {
+          name: '',
+          pollInterval: 2000,
+          partitions: 1,
+          consumerPerPartition: false,
+          packProcessingTimeout: 10000,
+          submitStrategy: {
+            type: 'BURST',
+            batchSize: 1000,
+          },
+          processingStrategy: {
+            type: 'SKIP_ALL_FAILURES',
+            retries: 3,
+            failurePercentage: 0,
+            pauseBetweenRetries: 3,
+            maxPauseBetweenRetries: 3,
+          },
+          disabled: false,
+          id: buildUUID(),
+          nameOnly: true,
+          additionalInfo: {
+            description: '',
+            customProperties: '',
+          },
+        };
+        queueConfiguration.value.push(values);
+        nextTick(() => {
+          proxy.$refs.getTenantConfig[unref(queueConfiguration).length - 1]?.setAllFieldsValue(
+            values
+          );
+        });
+      };
+
       const funcResetFields = () => {
         proxy.$refs.getEntity.funcResetFields();
         proxy.$refs.getRuleEngine.funcResetFields();
@@ -128,6 +347,28 @@
           await setFieldsValue({
             ...data.record,
           });
+          const { isolatedTbRuleEngine: dataIsolatedTbRuleEngine } = data.record || {};
+          isolatedTbRuleEngine.value = dataIsolatedTbRuleEngine;
+
+          const oldQueueConfiguration = data.record.profileData.queueConfiguration;
+          //独立规则引擎服务赋值
+          if (dataIsolatedTbRuleEngine && oldQueueConfiguration?.length) {
+            queueConfiguration.value =
+              oldQueueConfiguration.map((item) => {
+                return {
+                  ...item,
+                  id: buildUUID(),
+                  disabled: true,
+                  nameOnly: true,
+                };
+              }) || defaultQueueConfiguration();
+            nextTick(() => {
+              unref(queueConfiguration).forEach((item, index) => {
+                proxy.$refs.getTenantConfig[index]?.setAllFieldsValue(item);
+              });
+            });
+          }
+
           createTime.value = data.record.createdTime;
           updateStatusSchema(true);
         }
@@ -142,12 +383,12 @@
               disabled: status,
             },
           },
-          {
-            field: 'isolatedTbCore',
-            componentProps: {
-              disabled: status,
-            },
-          },
+          // {
+          //   field: 'isolatedTbRuleEngine',
+          //   componentProps: {
+          //     disabled: status,
+          //   },
+          // },
         ]);
       };
 
@@ -205,15 +446,52 @@
         try {
           if (!unref(isUpdate)) {
             await getAllFieldsFunc();
-            // return;
-            await saveTenantProfileApi({ ...postAllData, isolatedTbRuleEngine: null });
+            const getTenantConfigRefs = proxy.$refs.getTenantConfig;
+            const queueConfigValues: any = [];
+            for (let i = 0; i < getTenantConfigRefs?.length; i++) {
+              await proxy.$refs.getTenantConfig[i].validateAll();
+              const values = proxy.$refs.getTenantConfig[i].getAllFieldsValue();
+              queueConfigValues.push({ ...values, nameOnly: undefined });
+              const { nameOnly } = values || {};
+              if (!nameOnly) {
+                createMessage.success('队列名称必须唯一。');
+                return false;
+              }
+            }
+            const {
+              profileData: { configuration },
+            } = postAllData || {};
+            await saveTenantProfileApi({
+              ...postAllData,
+              profileData: { configuration, queueConfiguration: queueConfigValues },
+            });
             createMessage.success('租户配置新增成功');
+
             closeDrawer();
             emit('success');
             resetFields();
           } else {
             await getAllFieldsFunc(true);
-            await saveTenantProfileApi({ ...postAllData, isolatedTbRuleEngine: null });
+            const getTenantConfigRefs = proxy.$refs.getTenantConfig;
+            // proxy.$refs.getTenantConfig[index].getAllFieldsValue();
+            const queueConfigValues: any = [];
+            for (let i = 0; i < getTenantConfigRefs?.length; i++) {
+              await proxy.$refs.getTenantConfig[i].validateAll();
+              const values = proxy.$refs.getTenantConfig[i].getAllFieldsValue();
+              queueConfigValues.push({ ...values, nameOnly: undefined });
+              const { nameOnly } = values || {};
+              if (!nameOnly) {
+                createMessage.warning('队列名称必须唯一。');
+                return false;
+              }
+            }
+            const {
+              profileData: { configuration },
+            } = postAllData || {};
+            await saveTenantProfileApi({
+              ...postAllData,
+              profileData: { configuration, queueConfiguration: queueConfigValues },
+            });
             createMessage.success('租户配置编辑成功');
             closeDrawer();
             emit('success');
@@ -239,6 +517,13 @@
         getOta,
         getWs,
         getSpeed,
+        handleCheckbox,
+        isolatedTbRuleEngine,
+        handleDeleteTenant,
+        queueConfiguration,
+        getTenantConfig,
+        handleNameChange,
+        handleCreateQueue,
       };
     },
   });