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

fix: 修复超级管理员在编辑租户配置时，数据格式不一致问题

See merge request yunteng/thingskit-front!1349

@@ -132,6 +132,7 @@ export type ComponentType =
   | 'ControlGroup'
   | 'JSONEditor'
   | 'OrgTreeSelect'
+  | 'CreateSpeed'
   | 'ExtendDesc'
   | 'JavaScriptFunctionEditor'
   | 'JavascriptEditorWithTestModal'

@@ -59,6 +59,7 @@ export const formSchema: FormSchema[] = [
     field: 'isolatedTbRuleEngine',
     label: '',
     component: 'Checkbox',
+    ifShow: false,
     renderComponentContent: () => {
       return h('span', {}, [
         h('span', {}, '隔离板芯容器中的加工'),
@@ -70,6 +71,7 @@ export const formSchema: FormSchema[] = [
     field: 'isolatedTbCore',
     label: '',
     component: 'Checkbox',
+    ifShow: false,
     renderComponentContent: () => {
       return h('span', {}, [
         h('span', {}, '在独立的规则引擎中处理'),

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { alarmSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: alarmSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+import { FormSchema, useComponentRegister } from '/@/components/Form';
+
+import CreateSpeed from './createSpeed.vue';
+useComponentRegister('CreateSpeed', CreateSpeed);
+
+export const entityFormSchema: FormSchema[] = [
+  {
+    field: 'maxDevices',
+    required: true,
+
+    label: '最大设备数',
+    component: 'InputNumber',
+    defaultValue: '0',
+    colProps: { span: 12 },
+    componentProps: {
+      placeholder: '请输入最大设备数（请输入数字）',
+    },
+  },
+
+  {
+    field: 'maxDashboards',
+    required: true,
+    defaultValue: '0',
+    label: '最大仪表板数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入仪表板的最大数量（请输入数字）',
+    },
+  },
+  {
+    field: 'maxAssets',
+    required: true,
+    defaultValue: '0',
+    label: '最大资产数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大资产（请输入数字）',
+    },
+  },
+  {
+    field: 'maxUsers',
+    required: true,
+    defaultValue: '0',
+    label: '最大用户数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大用户数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxCustomers',
+    required: true,
+    defaultValue: '0',
+
+    label: '最大客户数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大客户数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxRuleChains',
+    required: true,
+    defaultValue: '0',
+    label: '最大规则链数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大规则链数（请输入数字）',
+    },
+  },
+];
+
+export const ruleEngineSchema: FormSchema[] = [
+  {
+    field: 'maxREExecutions',
+    required: true,
+    defaultValue: '0',
+    label: '最大规则引擎数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大规则引擎数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxTransportMessages',
+    required: true,
+    defaultValue: '0',
+
+    label: '最大传输消息数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大传输消息数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxJSExecutions',
+    required: true,
+    defaultValue: '0',
+
+    label: '最大JavaScript执行数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大JavaScript执行数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxTbelExecutions',
+    required: true,
+    defaultValue: '0',
+    label: '最大TBEL执行数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大TBEL执行数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxRuleNodeExecutionsPerMessage',
+    required: true,
+    defaultValue: '0',
+    label: '每条消息的最大规则节点执行数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入每条消息的最大规则节点执行数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxTransportDataPoints',
+    required: true,
+    defaultValue: '0',
+    label: '最大传输数据点数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大传输数据点数（请输入数字）',
+    },
+  },
+];
+
+export const ttlSchema: FormSchema[] = [
+  {
+    field: 'maxDPStorageDays',
+    required: true,
+    defaultValue: '0',
+    label: '最大存储点天',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大存储点天（请输入数字）',
+    },
+  },
+  {
+    field: 'alarmsTtlDays',
+    required: true,
+    defaultValue: '0',
+
+    label: '告警TTL天数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入告警存储天数（请输入数字）',
+    },
+  },
+  {
+    field: 'defaultStorageTtlDays',
+    required: true,
+    defaultValue: '0',
+
+    label: '默认存储TTL天数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入默认存储天数（请输入数字）',
+    },
+  },
+  {
+    field: 'rpcTtlDays',
+    required: true,
+    defaultValue: '0',
+
+    label: 'RPC TTL天数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入RPC TTL天数（请输入数字）',
+    },
+  },
+  {
+    field: 'queueStatsTtlDays',
+    required: true,
+    defaultValue: '0',
+
+    label: '队列统计信息TTL天数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入队列统计信息TTL天数（请输入数字）',
+    },
+  },
+  {
+    field: 'ruleEngineExceptionsTtlDays',
+    required: true,
+    defaultValue: '0',
+
+    label: '规则引擎异常TTL天数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入规则引擎异常TTL天数（请输入数字）',
+    },
+  },
+];
+
+export const alarmSchema: FormSchema[] = [
+  {
+    field: 'smsEnabled',
+    label: '启用短信',
+    defaultValue: true,
+    component: 'Switch',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        checkedValue: true,
+        unCheckedValue: false,
+        checkedChildren: '开',
+        unCheckedChildren: '关',
+        onChange: () => {
+          setFieldsValue({
+            maxSms: 0,
+          });
+        },
+      };
+    },
+  },
+  {
+    field: 'maxSms',
+    required: true,
+    defaultValue: '0',
+    label: '发送的最大短信数',
+    colProps: { span: 12 },
+    ifShow: ({ model }) => model.smsEnabled,
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入发送的最大短信数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxEmails',
+    required: true,
+    label: '最大电子邮件发送数',
+    colProps: { span: 12 },
+    defaultValue: '0',
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大电子邮件发送数（请输入数字）',
+    },
+  },
+  {
+    field: 'maxCreatedAlarms',
+    required: true,
+    defaultValue: '0',
+
+    label: '最大创建告警数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入最大创建告警数（请输入数字）',
+    },
+  },
+];
+export const otaSchema: FormSchema[] = [
+  {
+    field: 'maxResourcesInBytes',
+    required: true,
+    defaultValue: '0',
+    label: '资源文件总大小',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxOtaPackagesInBytes',
+    required: true,
+    defaultValue: '0',
+    label: 'Ota包文件大小',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxResourceSize',
+    required: true,
+    defaultValue: '0',
+    label: '最大资源文件大小',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+];
+
+export const wsSchema: FormSchema[] = [
+  {
+    field: 'maxWsSessionsPerTenant',
+    required: true,
+    defaultValue: '0',
+    label: '租户最大会话数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSubscriptionsPerTenant',
+    required: true,
+    defaultValue: '0',
+    label: '租户最大订阅数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSessionsPerCustomer',
+    required: true,
+    defaultValue: '0',
+    label: '客户最大会话数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSubscriptionsPerCustomer',
+    required: true,
+    defaultValue: '0',
+    label: '客户最大订阅数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+
+  {
+    field: 'maxWsSessionsPerPublicUser',
+    required: true,
+    defaultValue: '0',
+    label: '公共用户最大会话数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSubscriptionsPerPublicUser',
+    required: true,
+    defaultValue: '0',
+    label: '公共用户最大订阅数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSessionsPerRegularUser',
+    required: true,
+    defaultValue: '0',
+    label: '普通用户最大会话数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'maxWsSubscriptionsPerRegularUser',
+    required: true,
+    defaultValue: '0',
+    label: '普通用户最大订阅数',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+  {
+    field: 'wsMsgQueueLimitPerSession',
+    required: true,
+    defaultValue: '0',
+    helpMessage: ' 队列的大小也受系统配置的限制。',
+    label: '会话最大消息队列大小',
+    colProps: { span: 12 },
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+    },
+  },
+];
+
+export const speedSchema: FormSchema[] = [
+  {
+    field: 'transportTenantMsgRateLimit',
+    label: '传输租户信息',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    defaultValue: '0',
+    changeEvent: 'update:value',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输租户信息',
+    },
+  },
+  {
+    field: 'transportDeviceMsgRateLimit',
+    defaultValue: '0',
+    label: '传输设备信息',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输设备信息',
+    },
+  },
+  {
+    field: 'transportTenantTelemetryMsgRateLimit',
+    defaultValue: '0',
+    label: '传输租户遥测消息',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输租户遥测消息',
+    },
+  },
+  {
+    field: 'transportDeviceTelemetryMsgRateLimit',
+    defaultValue: '0',
+    label: '传输设备遥测消息',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输设备遥测消息',
+    },
+  },
+  {
+    field: 'transportTenantTelemetryDataPointsRateLimit',
+    label: '传输租户遥测数据点',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输租户遥测数据点',
+    },
+  },
+  {
+    field: 'transportDeviceTelemetryDataPointsRateLimit',
+    label: '传输设备遥测数据点',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '传输设备遥测数据点',
+    },
+  },
+  {
+    field: 'tenantServerRestLimitsConfiguration',
+    label: '租户REST请求',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '租户REST请求',
+    },
+  },
+  {
+    field: 'customerServerRestLimitsConfiguration',
+    label: '客户REST请求',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '客户REST请求',
+    },
+  },
+  {
+    field: 'tenantEntityExportRateLimit',
+    label: '实体版本创建',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '实体版本创建',
+    },
+  },
+  {
+    field: 'tenantEntityImportRateLimit',
+    label: '实体版本加载',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '实体版本加载',
+    },
+  },
+  {
+    field: 'wsUpdatesPerSessionRateLimit',
+    label: '会话WS更新',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '会话WS更新',
+    },
+  },
+  {
+    field: 'cassandraQueryTenantRateLimitsConfiguration',
+    label: '租户Cassandra查询',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '租户Cassandra查询',
+    },
+  },
+  {
+    field: 'tenantNotificationRequestsRateLimit',
+    label: '通知请求',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '通知请求',
+    },
+  },
+  {
+    field: 'tenantNotificationRequestsPerRuleRateLimit',
+    label: '每个通知规则的通知请求',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: '每个通知规则的通知请求',
+    },
+  },
+  {
+    field: 'edgeEventRateLimits',
+    label: 'Edge events',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: 'Edge events',
+    },
+  },
+  {
+    field: 'edgeEventRateLimitsPerEdge',
+    label: 'Edge events per edge',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: 'Edge events per edge',
+    },
+  },
+  {
+    field: 'edgeUplinkMessagesRateLimits',
+    label: 'Edge uplink message',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: 'Edge uplink message',
+    },
+  },
+  {
+    field: 'edgeUplinkMessagesRateLimitsPerEdge',
+    label: 'Edge uplink message per edge',
+    colProps: { span: 12 },
+    component: 'CreateSpeed',
+    componentProps: {
+      placeholder: '请输入（请输入数字）',
+      title: 'Edge uplink message per edge',
+    },
+  },
+];

+<script lang="ts" setup>
+  import { Card, Tag } from 'ant-design-vue';
+  import CreateSpeedModel from './createSpeedModel.vue';
+  import { ref, watch, unref } from 'vue';
+  import { useModal } from '/@/components/Modal';
+  import { PlusCircleOutlined } from '@ant-design/icons-vue';
+  import { generateUUID } from '/@/hooks/web/useGenerateUUID';
+
+  const props = withDefaults(
+    defineProps<{
+      value: any;
+      title?: string;
+    }>(),
+    {
+      title: '编辑传输租户消息速率配置',
+    }
+  );
+  const emit = defineEmits(['update:value']);
+
+  const speedData = ref<{ value: string | number; second: string | number; uuid?: string }[]>([]);
+  const handleSuccess = (values) => {
+    if (values.length) speedData.value = values;
+    const items = values.map((item) => `${item.value}:${item.second}`).join(',');
+    emit('update:value', items);
+  };
+  const handleOpenCreate = () => {
+    openModal(true, {
+      title: props.title,
+      data: unref(speedData),
+    });
+  };
+
+  const objectArray = (values) => {
+    return values?.map((item) => {
+      const [value, second] = item.split(':');
+      return {
+        value: parseInt(value, 10),
+        second: parseInt(second || value, 10),
+        uuid: generateUUID(),
+      };
+    });
+  };
+
+  watch(
+    () => props.value,
+    (target) => {
+      if (target && typeof target === 'string' && target !== '0') {
+        const values = target.split(',');
+        speedData.value = objectArray(values);
+      }
+    },
+    { immediate: true }
+  );
+
+  // watch(
+  //   () => speedData,
+  //   () => {
+  //     emit('update:value', unref(speedData));
+  //   }
+  // );
+
+  const [registerModal, { openModal }] = useModal();
+</script>
+<template>
+  <section class="!flex items-center">
+    <div class="flex flex-col justify-start items-start w-4/5">
+      <Card class="w-full">
+        <div
+          class="flex flex-col"
+          v-if="speedData && speedData.length >= 1 && speedData?.[0].value && speedData?.[0].second"
+        >
+          <div v-for="(item, index) in speedData" :key="item.value">
+            <Tag color="blue" v-if="index === 0 && item.value && item.second"
+              >{{ item.value }}条消息每{{ item.second }}秒</Tag
+            >
+            <Tag color="blue" v-else v-show="item.value && item.second"
+              >但小于{{ item.value }}条消息每{{ item.second }}秒</Tag
+            >
+          </div>
+        </div>
+
+        <div v-else>
+          <span class="font-bold">未配置</span>
+        </div>
+      </Card>
+    </div>
+    <PlusCircleOutlined
+      class="ml-2"
+      style="color: #377dff; font-size: 24px"
+      @click="handleOpenCreate"
+    />
+    <CreateSpeedModel @register="registerModal" @success="handleSuccess" />
+  </section>
+</template>
+
+<style lang="less" scoped>
+  :deep(.ant-card-body) {
+    padding: 12px;
+    max-height: 110px;
+    overflow-y: auto;
+  }
+</style>

+<script setup lang="ts">
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { Button, Form, InputNumber, Card, Tag, Space } from 'ant-design-vue';
+  import { DeleteOutlined } from '@ant-design/icons-vue';
+  import { ref } from 'vue';
+  import { unref } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { generateUUID } from '/@/hooks/web/useGenerateUUID';
+  import { reactive } from 'vue';
+
+  const emit = defineEmits(['success', 'register']);
+
+  // const formdata = ref<any[]>([{ value: '', second: '', uuid: generateUUID() }]);
+
+  interface User {
+    value: string;
+    second: string;
+    uuid: any;
+  }
+
+  const formref = ref();
+
+  const formdata = reactive<{ users: User[] }>({
+    users: [],
+  });
+
+  const title = ref<string>('');
+
+  const [registerModal, { closeModal }] = useModalInner((data) => {
+    const { title: propTitle } = data || {};
+    title.value = propTitle;
+    formdata.users = [...data.data] || [];
+  });
+
+  const { createMessage } = useMessage();
+
+  const handleOk = async () => {
+    await formref.value.validate();
+    closeModal();
+    emit('success', formdata.users);
+  };
+
+  const handleCreate = () => {
+    if (unref(formdata).users.length >= 10) {
+      createMessage.warning('添加的消息速率限制不能超过10条');
+      return;
+    }
+    formdata.users.push({ value: '', second: '', uuid: generateUUID() });
+  };
+
+  const handleDelete = (index: number) => {
+    formdata.users.splice(index, 1);
+  };
+</script>
+<template>
+  <BasicModal @register="registerModal" :title="title" @ok="handleOk">
+    <div class="!w-full">
+      <Form
+        style="width: 100%"
+        ref="formref"
+        :model="formdata"
+        layout="inline"
+        name="basic"
+        :label-col="{ style: { width: '100px' } }"
+        :wrapper-col="{ span: 16 }"
+        autocomplete="off"
+      >
+        <Space
+          class="flex i mt-1 mb-2"
+          v-for="(item, index) in formdata.users"
+          :key="item.uuid"
+          align="baseline"
+        >
+          <Form.Item
+            label="消息数量"
+            :rules="{ required: true, message: '消息数量必填' }"
+            :name="['users', index as unknown as string, 'value']"
+          >
+            <InputNumber v-model:value="item.value" :min="0" />
+          </Form.Item>
+          <Form.Item
+            label="每秒"
+            :rules="{ required: true, message: '时间比例必填' }"
+            :name="['users', index as unknown as string, 'second']"
+          >
+            <InputNumber v-model:value="item.second" :min="0" />
+          </Form.Item>
+
+          <DeleteOutlined @click="handleDelete(index)" class="ml-0.5" style="color: red" />
+        </Space>
+      </Form>
+    </div>
+    <Button class="my-2" type="primary" @click="handleCreate">添加限制</Button>
+    <div class="flex flex-col justify-start items-start w-full">
+      <Card title="预览" class="w-full">
+        <div class="flex flex-col" v-if="formdata.users && formdata.users.length >= 1">
+          <div v-for="(item, index) in formdata.users" :key="item.value">
+            <Tag color="blue" v-if="index === 0 && item.value && item.second"
+              >{{ item.value }}条消息每{{ item.second }}秒</Tag
+            >
+            <Tag color="blue" v-else v-show="item.value && item.second"
+              >但小于{{ item.value }}条消息每{{ item.second }}秒</Tag
+            >
+          </div>
+        </div>
+
+        <div v-if="!formdata.users?.[0]?.value || !formdata.users?.[0]?.second">
+          <span class="font-bold">未配置</span>
+        </div>
+      </Card>
+    </div>
+  </BasicModal>
+</template>
+
+<style lang="less" scoped>
+  :deep(.ant-card-head) {
+    height: 40px;
+
+    .ant-card-head-wrapper {
+      height: 40px;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { entityFormSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: entityFormSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { otaSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: otaSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { ruleEngineSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: ruleEngineSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { speedSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: speedSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { ttlSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: ttlSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <BasicForm @register="registerForm" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { wsSchema } from './config';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: wsSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

+<template>
+  <div class="tenant-class">
+    <CollapseContainer title="队列">
+      <BasicForm @register="registerForm" />
+    </CollapseContainer>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './config';
+  import { CollapseContainer } from '/@/components/Container/index';
+
+  export default defineComponent({
+    name: 'Index',
+    components: { BasicForm, CollapseContainer },
+    emits: ['success', 'register', 'funcResetFields'],
+    setup() {
+      const getValueData: any = ref({});
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+      const setFieldsValueFunc = (v) => {
+        setFieldsValue(v);
+      };
+      function getAllFields(getV) {
+        const values = getFieldsValue();
+        getValueData.value = values;
+        getV = getValueData.value;
+        return getV;
+      }
+      function funcResetFields() {
+        resetFields();
+      }
+      return {
+        setFieldsValueFunc,
+        funcResetFields,
+        getAllFields,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 95% !important;
+    }
+  }
+</style>

@@ -5,11 +5,33 @@
       @register="registerDrawer"
       showFooter
       :title="getTitle"
+      :destroyOnClose="true"
       width="700px"
       @ok="handleSubmit"
     >
       <BasicForm @register="registerForm" />
-      <CpnsTenantSet ref="getChildData" :parentData="parentSetData" />
+      <!-- <CpnsTenantSet ref="getChildData" :parentData="parentSetData" /> -->
+      <CollapseContainer title="实体 (0-无限制)" :defaultExpand="false">
+        <Entity ref="getEntity" />
+      </CollapseContainer>
+      <CollapseContainer title="规则引擎 (0-无限制)" :defaultExpand="false">
+        <RuleEngine ref="getRuleEngine" />
+      </CollapseContainer>
+      <CollapseContainer title="TTL (0-无限制)" :defaultExpand="false">
+        <Ttl ref="getTtl" />
+      </CollapseContainer>
+      <CollapseContainer title="告警与通知 (0-无限制)" :defaultExpand="false">
+        <Alarm ref="getAlarm" />
+      </CollapseContainer>
+      <CollapseContainer title="OTA文件（字节）(0-无限制)" :defaultExpand="false">
+        <Ota ref="getOta" />
+      </CollapseContainer>
+      <CollapseContainer title="WS (0-无限制)" :defaultExpand="false">
+        <Ws ref="getWs" />
+      </CollapseContainer>
+      <CollapseContainer title="速率限制" :defaultExpand="false">
+        <Speed ref="getSpeed" />
+      </CollapseContainer>
     </BasicDrawer>
   </div>
 </template>
@@ -18,13 +40,33 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import CpnsTenantSet from './cpns/index.vue';
+  // import CpnsTenantSet from './cpns/index.vue';
+  import Entity from './configuration/entity.vue';
+  import Ttl from './configuration/ttl.vue';
+  import Alarm from './configuration/alarm.vue';
+  import Ota from './configuration/ota.vue';
+  import Ws from './configuration/ws.vue';
+  import Speed from './configuration/speed.vue';
+  import RuleEngine from './configuration/ruleEngine.vue';
   import { saveTenantProfileApi } from '/@/api/tenant/tenantApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { CollapseContainer } from '/@/components/Container/index';
 
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicForm, CpnsTenantSet },
+    components: {
+      BasicDrawer,
+      BasicForm,
+      CollapseContainer,
+      // CpnsTenantSet,
+      Ws,
+      RuleEngine,
+      Ttl,
+      Alarm,
+      Ota,
+      Speed,
+      Entity,
+    },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
@@ -34,6 +76,15 @@
       let getValuesFormData: any = reactive({});
       const { proxy } = getCurrentInstance() as any;
       const getChildData = ref(null);
+
+      const getEntity = ref(null);
+      const getRuleEngine = ref(null);
+      const getTtl = ref(null);
+      const getAlarm = ref(null);
+      const getOta = ref(null);
+      const getWs = ref(null);
+      const getSpeed = ref(null);
+
       const editGetId: any = ref('');
       const isDefault = ref(false);
       const createTime = ref<string>('');
@@ -41,9 +92,20 @@
         schemas: formSchema,
         showActionButtonGroup: false,
       });
+
+      const funcResetFields = () => {
+        proxy.$refs.getEntity.funcResetFields();
+        proxy.$refs.getRuleEngine.funcResetFields();
+        proxy.$refs.getTtl.funcResetFields();
+        proxy.$refs.getAlarm.funcResetFields();
+        proxy.$refs.getOta.funcResetFields();
+        proxy.$refs.getWs.funcResetFields();
+        proxy.$refs.getSpeed.funcResetFields();
+      };
+
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         //清除表单值
-        proxy.$refs.getChildData.funcResetFields();
+        funcResetFields();
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
@@ -54,7 +116,13 @@
         //编辑
         if (unref(isUpdate)) {
           parentSetData.value = { ...data.record.profileData.configuration };
-          proxy.$refs.getChildData.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getEntity.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getRuleEngine.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getTtl.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getAlarm.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getOta.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getWs.setFieldsValueFunc(parentSetData.value);
+          proxy.$refs.getSpeed.setFieldsValueFunc(parentSetData.value);
           editGetId.value = data.record.id;
           isDefault.value = data.record.default;
           await setFieldsValue({
@@ -86,9 +154,25 @@
       const getAllFieldsFunc = async (isUpdate?: boolean) => {
         getValuesFormData = await validate();
         if (!getValuesFormData) return;
-        let getChildValues = proxy.$refs.getChildData.getAllFields();
+        let getEntity = proxy.$refs.getEntity.getAllFields();
+        let getRuleEngine = proxy.$refs.getRuleEngine.getAllFields();
+        let getTtl = proxy.$refs.getTtl.getAllFields();
+        let getAlarm = proxy.$refs.getAlarm.getAllFields();
+        let getOta = proxy.$refs.getOta.getAllFields();
+        let getWs = proxy.$refs.getWs.getAllFields();
+        let getSpeed = proxy.$refs.getSpeed.getAllFields();
         let profileData1 = {
-          configuration: getChildValues,
+          configuration: {
+            ...getEntity,
+            ...getRuleEngine,
+            ...getTtl,
+            ...getAlarm,
+            ...getOta,
+            ...getWs,
+            ...getSpeed,
+            type: 'DEFAULT',
+          },
+          queueConfiguration: null,
         };
         const id: any = {
           id: unref(isUpdate) ? editGetId.value : '',
@@ -121,6 +205,7 @@
         try {
           if (!unref(isUpdate)) {
             await getAllFieldsFunc();
+            // return;
             await saveTenantProfileApi(postAllData);
             createMessage.success('租户配置新增成功');
             closeDrawer();
@@ -147,6 +232,13 @@
         registerForm,
         getTitle,
         handleSubmit,
+        getEntity,
+        getRuleEngine,
+        getTtl,
+        getAlarm,
+        getOta,
+        getWs,
+        getSpeed,
       };
     },
   });