Merge branch 'ft' into 'main_dev'

fix: 修复Teambition上的问题

See merge request yunteng/thingskit-front!917

@@ -25,7 +25,7 @@ module.exports = defineConfig({
     'plugin:jest/recommended',
   ],
   rules: {
-    'no-console': 'error',
+    'no-console': 'off',
     'vue/script-setup-uses-vars': 'error',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

@@ -394,6 +394,13 @@
       //.ant-table-tbody > tr.ant-table-row-selected td {
       //background-color: fade(@primary-color, 8%) !important;
       //}
+      .ant-table-placeholder {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 670px;
+        max-height: 670px;
+      }
     }
 
     .ant-pagination {

@@ -20,6 +20,12 @@
   import { useFingerprint } from '/@/utils/useFingerprint';
   import { GetResult } from '@fingerprintjs/fingerprintjs';
 
+  const props = defineProps({
+    mode: {
+      type: String,
+      default: PageMode.SPLIT_SCREEN_MODE,
+    },
+  });
   type CameraRecordItem = CameraRecord & {
     canPlay?: boolean;
     isTransform?: boolean;
@@ -252,7 +258,11 @@
               </Authority>
             </div>
             <Space>
-              <Button type="primary" @click="handleChangeMode(PageMode.SPLIT_SCREEN_MODE)">
+              <Button
+                v-if="props.mode !== PageMode.SPLIT_SCREEN_MODE"
+                type="primary"
+                @click="handleChangeMode(PageMode.SPLIT_SCREEN_MODE)"
+              >
                 分屏模式
               </Button>
               <Button type="primary" @click="handleChangeMode(PageMode.LIST_MODE)">

@@ -12,7 +12,11 @@
 
 <template>
   <div>
-    <SplitScreenMode v-if="mode == PageMode.SPLIT_SCREEN_MODE" @switchMode="handleSwitchMode" />
+    <SplitScreenMode
+      :mode="mode"
+      v-if="mode == PageMode.SPLIT_SCREEN_MODE"
+      @switchMode="handleSwitchMode"
+    />
     <ListMode v-if="mode === PageMode.LIST_MODE" @switchMode="handleSwitchMode" />
   </div>
 </template>

@@ -131,14 +131,19 @@ export const formSchema: FormSchema[] = [
         onChange: async (value) => {
           const res = await findMessageConfig({});
           let typeId: Nullable<string> = null;
-          const options = res.map((item) => {
-            if (item.messageType === value) typeId = item.id;
-            return {
-              disabled: item.messageType !== value,
-              label: item.configName,
-              value: item.id,
-            };
-          });
+          const options = res
+            .map((item) => {
+              if (item.messageType === value && item.status === 1) {
+                typeId = item.id;
+              }
+              return {
+                disabled: item.messageType !== value,
+                label: item.configName,
+                value: item.id,
+                status: item.status,
+              };
+            })
+            .filter((item) => item.status === 1);
           await formActionType.setFieldsValue({ messageConfigId: typeId });
           await formActionType.updateSchema({
             field: 'messageConfigId',
@@ -155,14 +160,25 @@ export const formSchema: FormSchema[] = [
     label: '配置名称',
     required: true,
     component: 'ApiSelect',
-    componentProps: {
-      api: findMessageConfig,
-      params: {
-        messageType: ({ values }) => Reflect.get(values, 'messageType'),
-      },
-      immediate: true,
-      labelField: 'configName',
-      valueField: 'id',
+    componentProps: () => {
+      return {
+        api: async (params: Recordable) => {
+          try {
+            const record = await findMessageConfig(params);
+            return record.filter((item) => item.status === 1);
+          } catch (error) {
+            console.log(error);
+            return [];
+          }
+        },
+        params: {
+          messageType: ({ values }) => Reflect.get(values, 'messageType'),
+        },
+        immediate: true,
+        labelField: 'configName',
+        valueField: 'id',
+        getPopupContainer: () => document.body,
+      };
     },
   },
   {

@@ -465,14 +465,15 @@ export const formSchema: BFormSchema[] = [
   },
   {
     field: 'dateGroupGap',
-    label: '分组间隔',
+    label: '间隔时间',
     component: 'Select',
     colProps: { span: 24 },
-    dynamicRules: ({ model }) => {
+    dynamicRules: () => {
       return [
         {
-          required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
-          message: '分组间隔为必填项',
+          // required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
+          required: true,
+          message: '间隔时间为必填项',
           type: 'number',
         },
       ];

-import { FormSchema } from '/@/components/Form';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { h, ref, unref } from 'vue';
-import { isExistDataManagerNameApi } from '/@/api/datamanager/dataManagerApi';
-import { getDeviceProfile } from '/@/api/alarm/position';
-import { BasicColumn, BasicTableProps } from '/@/components/Table';
-import { devicePage } from '/@/api/device/deviceManager';
-import { Tag } from 'ant-design-vue';
-import { DeviceRecord } from '/@/api/device/model/deviceModel';
-import { FETCH_SETTING } from '/@/components/Table/src/const';
-import { useClipboard } from '@vueuse/core';
-import { useMessage } from '/@/hooks/web/useMessage';
-
-const typeValue = ref('');
-export enum CredentialsEnum {
-  IS_ANONYMOUS = 'anonymous',
-  IS_BASIC = 'basic',
-  IS_PEM = 'pem',
-}
-export const isBasic = (type: string) => {
-  return type === CredentialsEnum.IS_BASIC;
-};
-export const isPem = (type: string) => {
-  return type === CredentialsEnum.IS_PEM;
-};
-
-export enum DataSourceType {
-  ALL = 'ALL',
-  PRODUCT = 'PRODUCTS',
-  DEVICE = 'DEVICES',
-}
-
-export enum BasicInfoFormField {
-  DATA_SOURCE_TYPE = 'datasourceType',
-  DATA_SOURCE_PRODUCT = 'datasourceProduct',
-  DATA_SOURCE_DEVICE = 'datasourceDevice',
-  CONVERT_CONFIG_ID = 'convertConfigId',
-}
-
-export enum DeviceStatusEnum {
-  OFFLINE = 'OFFLINE',
-  ONLINE = 'ONLINE',
-  INACTIVE = 'INACTIVE',
-}
-
-export enum DeviceStatusNameEnum {
-  OFFLINE = '离线',
-  ONLINE = '在线',
-  INACTIVE = '待激活',
-}
-
-export enum DeviceTypeEnum {
-  SENSOR = 'SENSOR',
-  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
-  GATEWAY = 'GATEWAY',
-}
-
-export enum DeviceTypeNameEnum {
-  SENSOR = '网关子设备',
-  DIRECT_CONNECTION = '直连设备',
-  GATEWAY = '网关设备',
-}
-
-const handleGroupDevice = (options: DeviceRecord[]) => {
-  const map = new Map<string, string[]>();
-  options.forEach((item) => {
-    if (map.has(item.profileId)) {
-      const deviceList = map.get(item.profileId)!;
-      deviceList.push(item.tbDeviceId);
-    } else {
-      map.set(item.profileId, [item.tbDeviceId]);
-    }
-  });
-  const value = Array.from(map.entries()).map(([product, devices]) => ({ product, devices }));
-
-  return value;
-};
-
-const deviceTableFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: '设备名称',
-    component: 'Input',
-    colProps: { span: 9 },
-    componentProps: {
-      placeholder: '请输入设备名称',
-    },
-  },
-  {
-    field: 'deviceType',
-    label: '设备类型',
-    component: 'ApiSelect',
-    colProps: { span: 9 },
-    componentProps: {
-      placeholder: '请选择设备类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'device_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-  },
-];
-const { copied, copy } = useClipboard({ legacy: true });
-const { createMessage } = useMessage();
-const deviceTableColumn: BasicColumn[] = [
-  {
-    title: '状态',
-    dataIndex: 'deviceState',
-    customRender: ({ text }) => {
-      return h(
-        Tag,
-        {
-          color:
-            text === DeviceStatusEnum.INACTIVE
-              ? 'warning'
-              : text === DeviceStatusEnum.OFFLINE
-              ? 'error'
-              : 'success',
-        },
-        () => DeviceStatusNameEnum[text]
-      );
-    },
-  },
-  {
-    title: '别名/设备名称',
-    dataIndex: 'name',
-    customRender: ({ record }) => {
-      return h('div', [
-        h(
-          'div',
-          {
-            class: 'cursor-pointer',
-            onClick: async () => {
-              await copy(record.name);
-              if (unref(copied)) createMessage.success('复制成功~');
-            },
-          },
-          [
-            record.alias && h('div', { class: 'truncate' }, record.alias),
-            h('div', { class: 'text-blue-400 truncate' }, record.name),
-          ]
-        ),
-      ]);
-    },
-  },
-  {
-    title: '设备类型',
-    dataIndex: 'deviceType',
-    customRender: ({ text }) => {
-      return h(Tag, { color: 'success' }, () => DeviceTypeNameEnum[text]);
-    },
-  },
-  {
-    title: '所属产品',
-    dataIndex: 'deviceProfile.name',
-  },
-  {
-    title: '所属组织',
-    dataIndex: 'organizationDTO.name',
-  },
-];
-
-const TransferTableProps: BasicTableProps = {
-  formConfig: {
-    layout: 'inline',
-    labelWidth: 80,
-    schemas: deviceTableFormSchema,
-    actionColOptions: { span: 6 },
-  },
-  size: 'small',
-  maxHeight: 240,
-  useSearchForm: true,
-  columns: deviceTableColumn,
-  showIndexColumn: false,
-  fetchSetting: FETCH_SETTING,
-} as BasicTableProps;
-
-export const modeForm = (submitFn?: Function): FormSchema[] => {
-  return [
-    {
-      field: BasicInfoFormField.CONVERT_CONFIG_ID,
-      label: '',
-      component: 'Input',
-      show: false,
-    },
-    {
-      field: BasicInfoFormField.DATA_SOURCE_TYPE,
-      label: '数据源',
-      component: 'RadioGroup',
-      defaultValue: DataSourceType.ALL,
-      componentProps: {
-        options: [
-          { label: '全部', value: DataSourceType.ALL },
-          { label: '产品', value: DataSourceType.PRODUCT },
-          { label: '设备', value: DataSourceType.DEVICE },
-        ],
-      },
-    },
-    {
-      field: BasicInfoFormField.DATA_SOURCE_PRODUCT,
-      label: '数据源产品',
-      component: 'TransferModal',
-      ifShow: ({ model }) => {
-        return model[BasicInfoFormField.DATA_SOURCE_TYPE] !== DataSourceType.ALL;
-      },
-      valueField: 'value',
-      changeEvent: 'update:value',
-      componentProps: ({ formActionType }) => {
-        const { setFieldsValue } = formActionType;
-        return {
-          api: getDeviceProfile,
-          labelField: 'name',
-          valueField: 'tbProfileId',
-          transferProps: {
-            listStyle: { height: '400px' },
-            showSearch: true,
-            filterOption: (inputValue: string, option: Recordable) => {
-              const upperCaseInputValue = inputValue.toUpperCase();
-              const upperCaseOptionValue = option.name.toUpperCase();
-              return upperCaseOptionValue.includes(upperCaseInputValue);
-            },
-          },
-          onChange: () => {
-            setFieldsValue({ [BasicInfoFormField.DATA_SOURCE_DEVICE]: [] });
-          },
-        };
-      },
-    },
-    {
-      field: BasicInfoFormField.DATA_SOURCE_DEVICE,
-      label: '数据源设备',
-      component: 'TransferTableModal',
-      ifShow: ({ model }) => {
-        return model[BasicInfoFormField.DATA_SOURCE_TYPE] === DataSourceType.DEVICE;
-      },
-      valueField: 'value',
-      changeEvent: 'update:value',
-      componentProps: ({ formActionType }) => {
-        const { getFieldsValue } = formActionType;
-        const values = getFieldsValue();
-        const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-        const devices = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_DEVICE);
-
-        return {
-          labelField: 'name',
-          valueField: 'tbDeviceId',
-          primaryKey: 'tbDeviceId',
-          pendingTableProps: {
-            ...TransferTableProps,
-            api: devicePage,
-            beforeFetch: (params) => {
-              const values = getFieldsValue();
-              const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
-              const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-              if (convertConfigId) {
-                Object.assign(params, { convertConfigId, selected: false });
-              }
-              return { ...params, deviceProfileIds };
-            },
-          } as BasicTableProps,
-          selectedTableProps: {
-            ...TransferTableProps,
-            // api
-            api: !!(convertConfigId && devices) ? devicePage : undefined,
-            beforeFetch: (params) => {
-              const values = getFieldsValue();
-              const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
-              const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-              if (convertConfigId) {
-                Object.assign(params, { convertConfigId, selected: true });
-              }
-              return { ...params, deviceProfileIds };
-            },
-          } as BasicTableProps,
-          initSelectedOptions: async ({ setSelectedTotal }) => {
-            const values = getFieldsValue();
-            const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
-            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
-            const devices = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_DEVICE);
-            if (convertConfigId && devices) {
-              const { items, total } = await devicePage({
-                page: 1,
-                pageSize: 10,
-                convertConfigId: values[BasicInfoFormField.CONVERT_CONFIG_ID],
-                deviceProfileIds,
-                selected: true,
-              });
-              setSelectedTotal(total);
-              return items;
-            }
-            return [];
-          },
-          onSelectedAfter: async () => {
-            submitFn && (await submitFn(false));
-          },
-          onRemoveAfter: async ({ reloadSelected }) => {
-            submitFn && (await submitFn(false));
-            reloadSelected();
-          },
-          transformValue: (_selectedRowKeys: string[], selectedRows: DeviceRecord[]) => {
-            return handleGroupDevice(selectedRows);
-          },
-        };
-      },
-    },
-    {
-      field: 'type',
-      label: '转换方式',
-      component: 'ApiSelect',
-      required: true,
-      colProps: {
-        span: 24,
-      },
-      componentProps({}) {
-        return {
-          api: findDictItemByCode,
-          params: {
-            dictCode: 'convert_data_to',
-          },
-          labelField: 'itemText',
-          valueField: 'itemValue',
-          onChange(value) {
-            typeValue.value = value;
-          },
-        };
-      },
-    },
-    {
-      field: 'remark',
-      label: '描述',
-      colProps: { span: 24 },
-      component: 'Input',
-      componentProps: {
-        maxLength: 255,
-        placeholder: '请输入描述',
-      },
-    },
-  ];
-};
-
-export const modeKafkaForm: FormSchema[] = [
-  {
-    field: 'name',
-    label: '名称',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入名称',
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator(_, value) {
-            return new Promise((resolve, reject) => {
-              if (value == '') {
-                reject('请输入名称');
-              } else {
-                resolve();
-              }
-            });
-          },
-        },
-      ];
-    },
-  },
-  {
-    field: 'topicPattern',
-    label: '消息主题',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    defaultValue: 'my-topic',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入消息主题',
-    },
-  },
-  {
-    field: 'bootstrapServers',
-    label: '服务器',
-    colProps: { span: 12 },
-    component: 'Input',
-    defaultValue: 'localhost:9092',
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'localhost:9092',
-    },
-  },
-  {
-    field: 'retries',
-    label: '重连次数',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-  {
-    field: 'batchSize',
-    label: '生产者并发',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 16384,
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-  {
-    field: 'linger',
-    label: '缓存时间',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-  {
-    field: 'bufferMemory',
-    label: '最大缓存',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 33554432,
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-  {
-    field: 'acks',
-    component: 'Select',
-    label: '响应码',
-    colProps: { span: 12 },
-    defaultValue: '-1',
-    componentProps: {
-      placeholder: '请选择响应码',
-      options: [
-        { label: 'all', value: 'all' },
-        { label: '-1', value: '-1' },
-        { label: '0', value: '0' },
-        { label: '1', value: '1' },
-      ],
-    },
-  },
-  {
-    field: 'keySerializer',
-    label: '键序列化',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'org.apache.kafka.common.serialization.StringSerializer',
-    },
-  },
-  {
-    field: 'valueSerializer',
-    label: '值序列化',
-    colProps: { span: 24 },
-    required: true,
-    component: 'Input',
-    defaultValue: 'org.apache.kafka.common.serialization.StringSerializer',
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'org.apache.kafka.common.serialization.StringSerializer',
-    },
-  },
-  {
-    field: 'otherProperties',
-    label: '其他属性',
-    colProps: { span: 24 },
-    component: 'JAddInput',
-    subLabel: '不可重复',
-  },
-  {
-    field: 'addMetadataKeyValuesAsKafkaHeaders',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '将消息的元数据以键值对的方式添加到Kafka消息头中',
-  },
-  {
-    field: 'kafkaHeadersCharset',
-    component: 'Select',
-    label: '字符集',
-    required: true,
-    colProps: { span: 12 },
-    defaultValue: 'UTF-8',
-    componentProps: {
-      placeholder: '请选择字符集编码',
-      options: [
-        { label: 'US-ASCII', value: 'US' },
-        { label: 'ISO-8859-1', value: 'ISO-8859-1' },
-        { label: 'UTF-8', value: 'UTF-8' },
-        { label: 'UTF-16BE', value: 'UTF-16BE' },
-        { label: 'UTF-16LE', value: 'UTF-16LE' },
-        { label: 'UTF-16', value: 'UTF-16' },
-      ],
-    },
-    ifShow: ({ values }) => {
-      return !!values.addMetadataKeyValuesAsKafkaHeaders;
-    },
-  },
-  {
-    field: 'description',
-    label: '说明',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-      rows: 4,
-      placeholder: '请输入说明',
-    },
-  },
-];
-
-export const modeMqttForm: FormSchema[] = [
-  {
-    field: 'name',
-    label: '名称',
-    colProps: { span: 12 },
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入名称',
-    },
-  },
-  {
-    field: 'topicPattern',
-    label: '主题模式',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    defaultValue: 'my-topic',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Topic pattern',
-    },
-  },
-  {
-    field: 'host',
-    label: '主机',
-    colProps: { span: 12 },
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Host',
-    },
-  },
-  {
-    field: 'port',
-    label: '端口',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 1883,
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Port',
-    },
-  },
-  {
-    field: 'connectTimeoutSec',
-    label: '连接超时（秒）',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 10,
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Connection timeout (sec)',
-    },
-  },
-  {
-    field: 'clientId',
-    label: '客户端ID',
-    colProps: { span: 12 },
-    component: 'Input',
-    componentProps: ({ formActionType }) => {
-      const { updateSchema } = formActionType;
-      return {
-        onChange(e) {
-          if (!e.data) {
-            updateSchema({
-              field: 'appendClientIdSuffix',
-              show: false,
-            });
-          } else {
-            updateSchema({
-              field: 'appendClientIdSuffix',
-              show: true,
-            });
-          }
-        },
-        maxLength: 255,
-        placeholder: '请输入Client ID',
-      };
-    },
-  },
-  {
-    field: 'appendClientIdSuffix',
-    label: '',
-    colProps: { span: 12 },
-    defaultValue: false,
-    component: 'Checkbox',
-    renderComponentContent: '将服务ID作为后缀添加到客户端ID',
-    show: false,
-  },
-  {
-    field: 'cleanSession',
-    label: '是否启用',
-    colProps: { span: 12 },
-    defaultValue: true,
-    component: 'Checkbox',
-    renderComponentContent: '清除会话',
-  },
-  {
-    field: 'ssl',
-    label: '是否启用',
-    colProps: { span: 12 },
-    defaultValue: false,
-    component: 'Checkbox',
-    renderComponentContent: '启用SSL',
-  },
-  {
-    field: 'type',
-    component: 'Select',
-    label: '凭据类型',
-    colProps: { span: 12 },
-    defaultValue: 'anonymous',
-    componentProps: {
-      placeholder: '请选择Credentials',
-      options: [
-        { label: 'Anonymous', value: 'anonymous' },
-        { label: 'Basic', value: 'basic' },
-        { label: 'PEM', value: 'pem' },
-      ],
-    },
-  },
-  {
-    field: 'username',
-    label: '用户名',
-    colProps: { span: 12 },
-    component: 'Input',
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入用户名',
-    },
-    ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'password',
-    label: '密码',
-    colProps: { span: 12 },
-    component: 'InputPassword',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入密码',
-    },
-    ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
-  },
-  {
-    field: '4',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd1',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '11',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg1',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '5',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd2',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '1111',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg2',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '6',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd3',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '111111',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg3',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'password',
-    label: '密码',
-    colProps: { span: 12 },
-    component: 'InputPassword',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入密码',
-    },
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'description',
-    label: '说明',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-      rows: 4,
-      placeholder: '请输入说明',
-    },
-  },
-];
-
-export const modeRabbitMqForm: FormSchema[] = [
-  {
-    field: 'name',
-    label: '名称',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入名称',
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: true,
-          validator(_, value) {
-            return new Promise((resolve, reject) => {
-              if (value == '') {
-                reject('请输入名称');
-              } else {
-                resolve();
-              }
-            });
-          },
-        },
-      ];
-    },
-  },
-  {
-    field: 'exchangeNamePattern',
-    label: '交换名称模式',
-    colProps: { span: 12 },
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入模式',
-    },
-  },
-  {
-    field: 'routingKeyPattern',
-    label: '路由密钥模式',
-    colProps: { span: 12 },
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入模式',
-    },
-  },
-  {
-    field: 'messageProperties',
-    component: 'Select',
-    label: '消息属性',
-    colProps: { span: 12 },
-    componentProps: {
-      placeholder: '请选择消息属性',
-      options: [
-        { label: 'BASIC', value: 'BASIC' },
-        { label: 'TEXT_PLAIN', value: 'TEXT_PLAIN' },
-        { label: 'MINIMAL_BASIC', value: 'MINIMAL_BASIC' },
-        { label: 'MINIMAL_PERSISTENT_BASIC', value: 'MINIMAL_PERSISTENT_BASIC' },
-        { label: 'PERSISTENT_BASIC', value: 'PERSISTENT_BASIC' },
-        { label: 'PERSISTENT_TEXT_PLAIN', value: 'PERSISTENT_TEXT_PLAIN' },
-      ],
-    },
-  },
-  {
-    field: 'host',
-    label: '主机',
-    colProps: { span: 12 },
-    component: 'Input',
-    required: true,
-    defaultValue: 'localhost',
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'localhost',
-    },
-  },
-  {
-    field: 'port',
-    label: '端口',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 5672,
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Port',
-    },
-  },
-  {
-    field: 'virtualHost',
-    label: '虚拟端口（以/开头）',
-    colProps: { span: 12 },
-    component: 'Input',
-    defaultValue: '/',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '/',
-    },
-  },
-  {
-    field: 'username',
-    label: '用户名',
-    colProps: { span: 12 },
-    component: 'Input',
-    defaultValue: 'guest',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入用户名',
-    },
-  },
-  {
-    field: 'password',
-    label: '密码',
-    colProps: { span: 12 },
-    component: 'InputPassword',
-    defaultValue: 'guest',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入密码',
-    },
-  },
-  {
-    field: 'automaticRecoveryEnabled',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '自动恢复',
-  },
-  {
-    field: 'connectionTimeout',
-    label: '连接超时（毫秒）',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 60000,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Connection timeout (ms)',
-    },
-  },
-  {
-    field: 'handshakeTimeout',
-    label: '握手超时（毫秒）',
-    colProps: { span: 12 },
-    component: 'InputNumber',
-    defaultValue: 10000,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Handshake timeout (ms)',
-    },
-  },
-  {
-    field: 'clientProperties',
-    label: '客户端属性',
-    colProps: { span: 24 },
-    component: 'JAddInput',
-    subLabel: '不可重复',
-  },
-  {
-    field: 'description',
-    label: '说明',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-      rows: 4,
-      placeholder: '请输入说明',
-    },
-  },
-];
-
-export const modeApiForm: FormSchema[] = [
-  {
-    field: 'name',
-    label: '名称',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入名称',
-    },
-    dynamicRules: ({ values }) => {
-      return [
-        {
-          required: true,
-          validator(_, value) {
-            return new Promise((resolve, reject) => {
-              if (value == '') {
-                reject('请输入名称');
-              } else {
-                if (values.name) {
-                  isExistDataManagerNameApi({
-                    name: value,
-                    type:
-                      typeValue.value == ''
-                        ? 'org.thingsboard.rule.engine.rest.TbRestApiCallNode'
-                        : typeValue.value,
-                  }).then((data) => {
-                    if (data == true) {
-                      // createMessage.error('名称已存在');
-                      resolve();
-                    } else {
-                      resolve();
-                    }
-                  });
-                } else {
-                  resolve();
-                }
-              }
-            });
-          },
-        },
-      ];
-    },
-  },
-  {
-    field: 'restEndpointUrlPattern',
-    label: '端点URL模式',
-    colProps: { span: 12 },
-    required: true,
-    defaultValue: 'http://localhost/api',
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入Endpoint URL pattern',
-    },
-  },
-  {
-    field: 'requestMethod',
-    component: 'Select',
-    label: '请求方式',
-    colProps: { span: 12 },
-    defaultValue: 'POST',
-    componentProps: {
-      placeholder: '请选择Request method',
-      options: [
-        { label: 'GET', value: 'GET' },
-        { label: 'POST', value: 'POST' },
-        { label: 'PUT', value: 'PUT' },
-        { label: 'DELETE', value: 'DELETE' },
-      ],
-    },
-  },
-  {
-    field: 'enableProxy',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '启用代理',
-  },
-
-  {
-    field: 'proxyHost',
-    label: '代理主机',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'http或者https开头',
-    },
-    ifShow: ({ values }) => {
-      return !!values.enableProxy;
-    },
-  },
-  {
-    field: 'proxyPort',
-    label: '代理端口',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-      placeholder: 'http或者https开头',
-    },
-    ifShow: ({ values }) => {
-      return !!values.enableProxy;
-    },
-  },
-  {
-    field: 'proxyUser',
-    label: '代理用户',
-    colProps: { span: 12 },
-    required: true,
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入代理用户',
-    },
-    ifShow: ({ values }) => {
-      return !!values.enableProxy;
-    },
-  },
-  {
-    field: 'proxyPassword',
-    label: '代理密码',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputPassword',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入代理密码',
-    },
-    ifShow: ({ values }) => {
-      return !!values.enableProxy;
-    },
-  },
-
-  {
-    field: 'useSystemProxyProperties',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '使用系统代理属性',
-  },
-  {
-    field: 'maxParallelRequestsCount',
-    label: '最大并行请求数',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-    ifShow: ({ values }) => {
-      return !!values.useSystemProxyProperties;
-    },
-  },
-  {
-    field: 'ignoreRequestBody',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '无请求正文',
-  },
-  {
-    field: 'readTimeoutMs',
-    label: '读取超时（毫秒）',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-    ifShow: ({ values }) => {
-      return !values.useSystemProxyProperties;
-    },
-  },
-  {
-    field: 'maxParallelRequestsCount',
-    label: '最大并行请求数',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-    ifShow: ({ values }) => {
-      return !values.useSystemProxyProperties;
-    },
-  },
-  {
-    field: 'headers',
-    label: 'Headers',
-    colProps: { span: 24 },
-    defaultValue: { 'Content-Type': 'application/json' },
-    component: 'JAddInput',
-    subLabel: '不可重复',
-  },
-
-  {
-    field: 'useRedisQueueForMsgPersistence',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '使用redis队列进行消息持久性',
-  },
-  {
-    field: 'trimQueue',
-    label: '是否启用',
-    colProps: { span: 12 },
-    component: 'Checkbox',
-    renderComponentContent: '修剪redis队列',
-    ifShow: ({ values }) => {
-      return !!values.useRedisQueueForMsgPersistence;
-    },
-  },
-  {
-    field: 'maxQueueSize',
-    label: 'Redis队列最大数',
-    colProps: { span: 12 },
-    required: true,
-    component: 'InputNumber',
-    defaultValue: 0,
-    componentProps: {
-      maxLength: 255,
-    },
-    ifShow: ({ values }) => {
-      return !!values.useRedisQueueForMsgPersistence;
-    },
-  },
-
-  {
-    field: 'type',
-    component: 'Select',
-    label: '凭据类型',
-    colProps: { span: 12 },
-    defaultValue: 'anonymous',
-    componentProps: {
-      placeholder: '请选择凭据类型',
-      options: [
-        { label: 'Anonymous', value: 'anonymous' },
-        { label: 'Basic', value: 'basic' },
-        { label: 'PEM', value: 'pem' },
-      ],
-    },
-  },
-  {
-    field: 'username',
-    label: '用户名',
-    colProps: { span: 12 },
-    component: 'Input',
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入用户名',
-    },
-    ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'password',
-    label: '密码',
-    colProps: { span: 12 },
-    component: 'InputPassword',
-    required: true,
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入密码',
-    },
-    ifShow: ({ values }) => isBasic(Reflect.get(values, 'type')),
-  },
-  {
-    field: '1',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd1',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '11',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg1',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '1',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd2',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '1111',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg2',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '1',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'uploadAdd3',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: '111111',
-    label: '',
-    colProps: { span: 24 },
-    component: 'Input',
-    slot: 'showImg3',
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'password',
-    label: '密码',
-    colProps: { span: 12 },
-    component: 'InputPassword',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入密码',
-    },
-    ifShow: ({ values }) => isPem(Reflect.get(values, 'type')),
-  },
-
-  {
-    field: 'description',
-    label: '说明',
-    colProps: { span: 24 },
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-      rows: 4,
-      placeholder: '请输入说明',
-    },
-  },
-];

-<template>
-  <div class="transfer-config-mode">
-    <BasicForm :showSubmitButton="false" @register="register">
-      <template #uploadAdd1="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <a-upload-dragger
-          v-model:fileList="fileList1"
-          name="file"
-          :key="1"
-          :multiple="false"
-          @change="handleChange('T', $event)"
-          :before-upload="() => false"
-        >
-          <p class="ant-upload-drag-icon">
-            <InboxOutlined />
-          </p>
-          <p class="ant-upload-text">点击或将文件拖拽到这里上传</p>
-          <p class="ant-upload-hint">
-            支持扩展名：.jpeg .png .jpg ...
-            <br />
-            文件大小：最大支持5M
-          </p>
-        </a-upload-dragger>
-      </template>
-      <template #showImg1="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <img
-          v-if="showImg1"
-          :src="showImg1Pic"
-          alt="avatar"
-          style="width: 6.25rem; height: 6.25rem"
-        />
-      </template>
-      <div style="margin-top: 50px"></div>
-      <template #uploadAdd2="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <a-upload-dragger
-          v-model:fileList="fileList2"
-          name="file"
-          :key="2"
-          :multiple="false"
-          @change="handleChange('F', $event)"
-          :before-upload="() => false"
-        >
-          <p class="ant-upload-drag-icon">
-            <InboxOutlined />
-          </p>
-          <p class="ant-upload-text">点击或将文件拖拽到这里上传</p>
-          <p class="ant-upload-hint">
-            支持扩展名：.jpeg .png .jpg ...
-            <br />
-            文件大小：最大支持5M
-          </p>
-        </a-upload-dragger>
-      </template>
-      <template #showImg2="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <img
-          v-if="showImg2"
-          :src="showImg2Pic"
-          alt="avatar"
-          style="width: 6.25rem; height: 6.25rem"
-        />
-      </template>
-      <div style="margin-top: 50px"></div>
-      <template #uploadAdd3="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <a-upload-dragger
-          v-model:fileList="fileList3"
-          name="file"
-          :key="3"
-          :multiple="false"
-          @change="handleChange('C', $event)"
-          :before-upload="() => false"
-        >
-          <p class="ant-upload-drag-icon">
-            <InboxOutlined />
-          </p>
-          <p class="ant-upload-text">点击或将文件拖拽到这里上传</p>
-          <p class="ant-upload-hint">
-            支持扩展名：.jpeg .png .jpg ...
-            <br />
-            文件大小：最大支持5M
-          </p>
-        </a-upload-dragger>
-      </template>
-      <template #showImg3="{ field }">
-        <span style="display: none">{{ field }}</span>
-        <img
-          v-if="showImg3"
-          :src="showImg3Pic"
-          alt="avatar"
-          style="width: 6.25rem; height: 6.25rem"
-        />
-      </template>
-    </BasicForm>
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent, ref, reactive, nextTick } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { CredentialsEnum, modeMqttForm } from '../config';
-  import { InboxOutlined } from '@ant-design/icons-vue';
-  import { Alert, Divider, Descriptions, Upload } from 'ant-design-vue';
-  import { uploadApi } from '/@/api/personal/index';
-  import { useMessage } from '/@/hooks/web/useMessage';
-
-  export default defineComponent({
-    components: {
-      BasicForm,
-      [Alert.name]: Alert,
-      [Divider.name]: Divider,
-      [Descriptions.name]: Descriptions,
-      [Descriptions.Item.name]: Descriptions.Item,
-      InboxOutlined,
-      [Upload.Dragger.name]: Upload.Dragger,
-    },
-    emits: ['next', 'prev', 'register'],
-    setup(_, { emit }) {
-      const showImg1 = ref(false);
-      const showImg1Pic = ref('');
-      const showImg2 = ref(false);
-      const showImg2Pic = ref('');
-      const showImg3 = ref(false);
-      const showImg3Pic = ref('');
-      const { createMessage } = useMessage();
-      let caCertFileName = ref('');
-      let privateKeyFileName = ref('');
-      let certFileName = ref('');
-      let fileList1: any = ref<[]>([]);
-      let fileList2: any = ref<[]>([]);
-      let fileList3: any = ref<[]>([]);
-      const credentialsV: any = reactive({
-        credentials: {
-          type: '',
-        },
-      });
-      const sonValues: any = reactive({
-        configuration: {},
-      });
-      const [register, { validate, setFieldsValue, resetFields: defineClearFunc }] = useForm({
-        labelWidth: 120,
-        schemas: modeMqttForm,
-        actionColOptions: {
-          span: 14,
-        },
-        resetButtonOptions: {
-          text: '上一步',
-        },
-        resetFunc: customResetFunc,
-        submitFunc: customSubmitFunc,
-      });
-
-      /**
-       * 上传图片
-       */
-      const handleChange = async (e, { file }) => {
-        if (file.status === 'removed') {
-          if (e == 'T') {
-            fileList1.value = [];
-            showImg1.value = false;
-            showImg1Pic.value = '';
-            caCertFileName.value = '';
-          } else if (e == 'F') {
-            fileList2.value = [];
-            showImg2.value = false;
-            showImg2Pic.value = '';
-            certFileName.value = '';
-          } else {
-            fileList3.value = [];
-            showImg3.value = false;
-            showImg3Pic.value = '';
-            privateKeyFileName.value = '';
-          }
-        } else {
-          const isLt5M = file.size / 1024 / 1024 < 5;
-          if (!isLt5M) {
-            createMessage.error('图片大小不能超过5MB!');
-          } else {
-            e == 'T'
-              ? (fileList1.value = [file])
-              : e == 'F'
-              ? (fileList2.value = [file])
-              : (fileList3.value = [file]);
-            const formData = new FormData();
-            formData.append('file', file);
-            const response = await uploadApi(formData);
-            if (response.fileStaticUri) {
-              if (e == 'T') {
-                caCertFileName.value = response.fileStaticUri;
-                const iscaCertFileNamePic = caCertFileName.value.split('.').pop();
-                if (
-                  iscaCertFileNamePic == 'jpg' ||
-                  iscaCertFileNamePic == 'png' ||
-                  iscaCertFileNamePic == 'jpeg' ||
-                  iscaCertFileNamePic == 'gif'
-                ) {
-                  showImg1.value = true;
-                  showImg1Pic.value = response.fileStaticUri;
-                } else {
-                  showImg1.value = false;
-                }
-              } else if (e == 'F') {
-                certFileName.value = response.fileStaticUri;
-                const iscertFileNamePic = certFileName.value.split('.').pop();
-                if (
-                  iscertFileNamePic == 'jpg' ||
-                  iscertFileNamePic == 'png' ||
-                  iscertFileNamePic == 'jpeg' ||
-                  iscertFileNamePic == 'gif'
-                ) {
-                  showImg2.value = true;
-                  showImg2Pic.value = response.fileStaticUri;
-                } else {
-                  showImg2.value = false;
-                }
-              } else {
-                privateKeyFileName.value = response.fileStaticUri;
-                const isprivateKeyFileNamePic = privateKeyFileName.value.split('.').pop();
-                if (
-                  isprivateKeyFileNamePic == 'jpg' ||
-                  isprivateKeyFileNamePic == 'png' ||
-                  isprivateKeyFileNamePic == 'jpeg' ||
-                  isprivateKeyFileNamePic == 'gif'
-                ) {
-                  showImg3.value = true;
-                  showImg3Pic.value = response.fileStaticUri;
-                } else {
-                  showImg3.value = false;
-                }
-              }
-            }
-          }
-        }
-      };
-      const setStepTwoFieldsValueFunc = (v, v1, v2) => {
-        setFieldsValue(v);
-        setFieldsValue({
-          name: v1,
-          description: v2,
-        });
-        setFieldsValue({
-          password: v.credentials?.password,
-          username: v.credentials?.username,
-          type: v.credentials?.type,
-        });
-        fileList1.value = [
-          {
-            name: v.credentials?.caCertFileName.slice(39),
-            uid: '1',
-          },
-        ];
-        fileList2.value = [
-          {
-            name: v.credentials?.certFileName.slice(39),
-            uid: '2',
-          },
-        ];
-        fileList3.value = [
-          {
-            name: v.credentials?.privateKeyFileName.slice(39),
-            uid: '3',
-          },
-        ];
-        caCertFileName.value = v.credentials?.caCertFileName;
-        certFileName.value = v.credentials?.certFileName;
-        privateKeyFileName.value = v.credentials?.privateKeyFileName;
-        const iscaCertFileNamePic = v.credentials?.caCertFileName.split('.').pop();
-        const iscertFileNamePic = v.credentials?.certFileName.split('.').pop();
-        const isprivateKeyFileNamePic = v.credentials?.privateKeyFileName.split('.').pop();
-        if (
-          iscaCertFileNamePic == 'jpg' ||
-          iscaCertFileNamePic == 'png' ||
-          iscaCertFileNamePic == 'jpeg' ||
-          iscaCertFileNamePic == 'gif'
-        ) {
-          showImg1.value = true;
-          showImg1Pic.value = v.credentials?.caCertFileName;
-        } else {
-          showImg1.value = false;
-        }
-        if (
-          iscertFileNamePic == 'jpg' ||
-          iscertFileNamePic == 'png' ||
-          iscertFileNamePic == 'jpeg' ||
-          iscertFileNamePic == 'gif'
-        ) {
-          showImg2.value = true;
-          showImg2Pic.value = v.credentials?.certFileName;
-        } else {
-          showImg2.value = false;
-        }
-        if (
-          isprivateKeyFileNamePic == 'jpg' ||
-          isprivateKeyFileNamePic == 'png' ||
-          isprivateKeyFileNamePic == 'jpeg' ||
-          isprivateKeyFileNamePic == 'gif'
-        ) {
-          showImg3.value = true;
-          showImg3Pic.value = v.credentials?.privateKeyFileName;
-        } else {
-          showImg3.value = false;
-        }
-      };
-      const customClearStepTwoValueFunc = async () => {
-        nextTick(() => {
-          defineClearFunc();
-          fileList1.value = [];
-          fileList2.value = [];
-          fileList3.value = [];
-          caCertFileName.value = '';
-          privateKeyFileName.value = '';
-          certFileName.value = '';
-          showImg1.value = false;
-          showImg1Pic.value = '';
-          showImg2.value = false;
-          showImg2Pic.value = '';
-          showImg3.value = false;
-          showImg3Pic.value = '';
-        });
-      };
-      async function customResetFunc() {
-        emit('prev');
-      }
-      async function customSubmitFunc() {
-        try {
-          const values = await validate();
-          emit('next', values);
-        } catch (error) {
-        } finally {
-        }
-      }
-      const getSonValueFunc = async () => {
-        sonValues.configuration = await validate();
-        credentialsV.credentials.type = sonValues.configuration.type;
-        if (credentialsV.credentials.type == CredentialsEnum.IS_BASIC) {
-          credentialsV.credentials.username = sonValues.configuration.username;
-          credentialsV.credentials.password = sonValues.configuration.password;
-          sonValues.configuration.username = undefined;
-          sonValues.configuration.password = undefined;
-        } else if (credentialsV.credentials.type == CredentialsEnum.IS_PEM) {
-          credentialsV.credentials.caCertFileName = caCertFileName.value;
-          credentialsV.credentials.certFileName = certFileName.value;
-          credentialsV.credentials.privateKeyFileName = privateKeyFileName.value;
-        }
-        if (!sonValues.configuration.clientId) {
-          sonValues.configuration.clientId = null;
-        }
-        Object.assign(sonValues.configuration, credentialsV);
-        return sonValues;
-      };
-      return {
-        getSonValueFunc,
-        register,
-        setStepTwoFieldsValueFunc,
-        customClearStepTwoValueFunc,
-        fileList1,
-        fileList2,
-        fileList3,
-        handleChange,
-        caCertFileName,
-        privateKeyFileName,
-        certFileName,
-        showImg1,
-        showImg1Pic,
-        showImg2,
-        showImg2Pic,
-        showImg3,
-        showImg3Pic,
-      };
-    },
-  });
-</script>
-
-<style lang="less" scoped>
-  :deep(.ant-col-24) {
-    margin-bottom: 20px !important;
-  }
-
-  :deep(.ant-btn-default) {
-    color: white;
-    background: #377dff;
-  }
-</style>

@@ -201,14 +201,18 @@
     ];
   });
 
-  const changeOutTarget = () => {
+  const changeOutTarget = (e) => {
+    if (!e) validateFields(['outTarget']);
+    else clearValidate('outTarget');
     emit('getActionFormArr');
   };
-  const [registerAction, { getFieldsValue, resetFields, setFieldsValue, validate, setProps }] =
-    useForm({
-      schemas: actionSchema,
-      showActionButtonGroup: false,
-    });
+  const [
+    registerAction,
+    { getFieldsValue, resetFields, setFieldsValue, validate, clearValidate, validateFields },
+  ] = useForm({
+    schemas: actionSchema,
+    showActionButtonGroup: false,
+  });
 
   // 获取整个执行动作表单值
   const getFieldsValueFunc = () => {

@@ -114,7 +114,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, unref, reactive, onMounted, toRefs, computed } from 'vue';
+  import { ref, unref, reactive, onMounted, toRefs, computed, nextTick } from 'vue';
   import ace from 'ace-builds';
   import { Card, Button, Tooltip } from 'ant-design-vue';
   import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
@@ -323,7 +323,19 @@
   };
 
   const setDisableRadio = (value) => {
-    reportTypeOptions.scriptTypeOptions.forEach((item: any) => {
+    //查看和表格里面的测试点击禁用脚本类型
+    unref(reportTypeOptions.scriptTypeOptions).forEach((item: any) => {
+      if (item.value === value) item.disabled = false;
+      else item.disabled = true;
+    });
+  };
+
+  const setDisableTestRadio = async (value) => {
+    //内部弹窗，使用上面的setDisableRadio无效
+    //新增里面的测试点击禁用脚本类型
+    await getScriptType();
+    await nextTick();
+    unref(reportTypeOptions.scriptTypeOptions).forEach((item: any) => {
       if (item.value === value) item.disabled = false;
       else item.disabled = true;
     });
@@ -336,6 +348,7 @@
     setScriptOutputData,
     setDefaultRadio,
     setDisableRadio,
+    setDisableTestRadio,
   });
 </script>
 <style lang="less" scoped>

@@ -56,7 +56,15 @@
       if (!data.innerTest) {
         const rest = await getScriptManageDetail(data.record?.id);
         converScriptFormRef.value?.setFormData(rest);
-      } else converScriptFormRef.value?.setFormData(data.record);
+        if (data.text !== BusinessConvertScriptTextEnum.BUSINESS_EDIT_TEXT) {
+          //编辑是不能禁用脚本类型的
+          converScriptFormRef.value?.setDisableRadio(data.record.scriptType);
+        }
+      } else {
+        //从新增页面里点击的测试,禁用脚本类型
+        converScriptFormRef.value?.setFormData(data.record);
+        converScriptFormRef.value?.setDisableTestRadio(data.record.scriptType);
+      }
       if (data.scriptType) {
         converScriptFormRef.value?.setDisableRadio(data.scriptType);
       }

@@ -18,6 +18,7 @@
             ref="basicTreeRef"
             checkable
             toolbar
+            @change="handleTreeSelect"
           />
         </template>
         <template #roleSlot="{ model, field }">
@@ -26,6 +27,7 @@
             allowClear
             placeholder="请选择角色"
             v-model:value="model[field]"
+            @change="handleRoleSelect"
             :options="roleOptions.map((item) => ({ value: item.value, label: item.label }))"
           >
             <template #dropdownRender="{ menuNode: menu }">
@@ -108,12 +110,30 @@
           isUpdate: false,
         });
       };
+      const clearValidateByField = (field: string) => {
+        clearValidate(field);
+      };
+      const handleRoleSelect = (e) => {
+        if (e?.length > 0) clearValidateByField('roleIds');
+        else validateFields(['roleIds']);
+      };
+      const handleTreeSelect = (e) => {
+        if (e) clearValidateByField('organizationIds');
+      };
       const handleSuccess = async () => {
         await getRoleList();
       };
       const [
         registerForm,
-        { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue },
+        {
+          setFieldsValue,
+          updateSchema,
+          resetFields,
+          validate,
+          getFieldsValue,
+          clearValidate,
+          validateFields,
+        },
       ] = useForm({
         labelWidth: 100,
         schemas: accountFormSchema,
@@ -225,6 +245,8 @@
         registerRoleDrawer,
         handleOpenRole,
         handleSuccess,
+        handleRoleSelect,
+        handleTreeSelect,
       };
     },
   });

@@ -43,11 +43,11 @@
         },
         {
           field: 'username',
-          label: '账号',
+          label: '用户名',
           component: 'Input',
           componentProps: {
             maxLength: 64,
-            placeholder: '请输入账号',
+            placeholder: '请输入用户名',
           },
           dynamicRules: ({ values }) => {
             try {
@@ -62,14 +62,13 @@
                   validator(_, value) {
                     return new Promise((resolve, reject) => {
                       if (value == '' || value === undefined) {
-                        reject('请输入账号');
+                        reject('请输入用户名');
                       } else if (ChineseRegexp.test(value)) {
-                        reject('账号不能含有中文');
+                        reject('用户名不能含有中文');
                       } else if (EmailRegexp.test(value)) {
-                        reject('账号不能为电子邮箱格式');
+                        reject('用户名不能为电子邮箱格式');
                       } else if (findUserName && value == findUserName?.username) {
-                        console.log(1111111111);
-                        reject('账号已存在');
+                        reject('用户名已存在');
                         return;
                       } else {
                         resolve();

@@ -7,50 +7,25 @@
     width="500px"
     @ok="handleSubmit"
   >
-    <BasicForm @register="tenantForm">
-      <template #iconSelect>
-        <Upload
-          name="avatar"
-          accept=".png,.jpg,.jpeg,.gif"
-          list-type="picture-card"
-          class="avatar-uploader"
-          :show-upload-list="false"
-          :customRequest="customUpload"
-          :before-upload="beforeUpload"
-        >
-          <img v-if="tenantLogo" :src="tenantLogo" alt="avatar" />
-          <div v-else>
-            <LoadingOutlined v-if="loading" />
-            <plus-outlined v-else />
-            <div class="ant-upload-text">上传</div>
-          </div>
-        </Upload>
-      </template>
-    </BasicForm>
+    <BasicForm @register="tenantForm" />
   </BasicDrawer>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
-  import { message, Upload } from 'ant-design-vue';
-
   import { useI18n } from '/@/hooks/web/useI18n';
   import { tenantFormSchema } from '/@/views/tenant/list/tenantBaseColumns';
-  import { FileItem } from '/@/components/Upload/src/typing';
-  import { upload } from '/@/api/oss/ossFileUploader';
   import { getTenantRoles, updateOrCreateTenant } from '/@/api/tenant/tenantApi';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
+  import { buildUUID } from '/@/utils/uuid';
 
   export default defineComponent({
     name: 'TenantDrawer',
     components: {
       BasicDrawer,
       BasicForm,
-      Upload,
-      PlusOutlined,
-      LoadingOutlined,
     },
     emits: ['success', 'register'],
     setup(_, { emit }) {
@@ -58,33 +33,7 @@
       const { createMessage } = useMessage();
 
       const isUpdate = ref(true);
-      const tenantLogo = ref('');
-
-      async function customUpload({ file }) {
-        if (beforeUpload(file)) {
-          tenantLogo.value = '';
-          loading.value = true;
-          const formData = new FormData();
-          formData.append('file', file);
-          const response = await upload(formData);
-          if (response.fileStaticUri) {
-            tenantLogo.value = response.fileStaticUri;
-            loading.value = false;
-          }
-        }
-      }
 
-      const beforeUpload = (file: FileItem) => {
-        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
-        if (!isJpgOrPng) {
-          message.error('只能上传图片文件!');
-        }
-        const isLt2M = (file.size as number) / 1024 / 1024 < 5;
-        if (!isLt2M) {
-          message.error('图片大小不能超过5MB!');
-        }
-        return isJpgOrPng && isLt2M;
-      };
       const [tenantForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
         labelWidth: 100,
         schemas: tenantFormSchema,
@@ -96,7 +45,6 @@
       //默认传递页面数据
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
-        tenantLogo.value = '';
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
 
@@ -104,11 +52,19 @@
         await updateSchema({ field: 'title', componentProps: { disabled: false } });
         //如果是编辑操作，设置页面数据
         if (unref(isUpdate)) {
+          if (data.record.icon) {
+            setFieldsValue({
+              icon: [{ uid: buildUUID(), name: 'name', url: data.record.icon } as FileItem],
+            });
+          }
           getTenantRoles(data.record.tenantId).then((result) => {
-            Reflect.set(data.record, 'roleIds', result);
+            const { icon, ...params } = data.record;
+            console.log(icon);
             //为表单赋值
-            setFieldsValue(data.record);
-            tenantLogo.value = data.record.icon;
+            setFieldsValue({
+              ...params,
+              roleIds: result,
+            });
             //编辑模式，菜单名称为不可用
             updateSchema({ field: 'title', componentProps: { disabled: true } });
           });
@@ -126,9 +82,13 @@
         setDrawerProps({ confirmLoading: true });
         try {
           const values = await validate();
+          if (Reflect.has(values, 'icon')) {
+            const file = (values.icon || []).at(0) || {};
+            values.icon = file.url || null;
+          }
           const req = {
             id: values.id,
-            icon: tenantLogo.value,
+            icon: values.icon,
             name: values.name,
             enabled: values.enabled,
             description: values.description,
@@ -161,9 +121,6 @@
         tenantForm,
         getTitle,
         handleSubmit,
-        tenantLogo,
-        beforeUpload,
-        customUpload,
         loading,
       };
     },

@@ -3,6 +3,9 @@ import { FormSchema } from '/@/components/Form';
 import { getAllRoleList } from '/@/api/system/system';
 import { getTableTenantProfileApi, QueryTenantProfilesParam } from '/@/api/tenant/tenantApi';
 import { RoleEnum } from '/@/enums/roleEnum';
+import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
+import { createImgPreview } from '/@/components/Preview';
+import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 
 export function getBasicColumns(): BasicColumn[] {
   return [
@@ -77,23 +80,32 @@ export const tenantFormSchema: FormSchema[] = [
   {
     field: 'icon',
     label: '租户图标',
-    slot: 'iconSelect',
-    component: 'Input',
-    componentProps: {
-      maxLength: 255,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: () => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
         },
-      ];
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+      };
     },
   },
   {