Merge branch 'ft-dev' into 'main'

fix：打包问题

See merge request huang/yun-teng-iot-front!115

@@ -31,14 +31,16 @@ enum Api {
   getTenantRoles = '/admin/tenant/roles/',
   getTenantRoles = '/admin/tenant/roles/',
   postAddTenantProfile = '/tenantProfile',
   postAddTenantProfile = '/tenantProfile',
   getTenantProfile = '/tenantProfiles',
   getTenantProfile = '/tenantProfiles',
-  deleteTenantProfile = '/tenantProfile/',
+  deleteTenantProfile = '/tenantProfile',
 }
 }
 
 
-export async function deleteTenantProfileApi(params?: DeleteTenantProfilesParam) {
+export async function deleteTenantProfileApi(ids: string[]) {
   await defHttp.delete(
   await defHttp.delete(
     {
     {
-      params: params,
       url: Api.deleteTenantProfile,
       url: Api.deleteTenantProfile,
+      data: {
+        ids: ids,
+      },
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,

@@ -53,7 +53,7 @@
       TransferConfigMode,
       TransferConfigMode,
       TransferConfigParams,
       TransferConfigParams,
     },
     },
-    emits: ['success'],
+    emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const { proxy } = getCurrentInstance();
       const { proxy } = getCurrentInstance();

@@ -123,7 +123,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeApiForm, modeKafkaInseretKeyAndValueForm } from '../config';
   import { modeApiForm, modeKafkaInseretKeyAndValueForm } from '../config';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
-  import { Alert, Divider, Descriptions, UploadDragger } from 'ant-design-vue';
+  import { Alert, Divider, Descriptions, Upload } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -133,7 +133,7 @@
       [Descriptions.name]: Descriptions,
       [Descriptions.name]: Descriptions,
       [Descriptions.Item.name]: Descriptions.Item,
       [Descriptions.Item.name]: Descriptions.Item,
       InboxOutlined,
       InboxOutlined,
-      UploadDragger,
+      [Upload.UploadDragger]: Upload.UploadDragger,
     },
     },
     emits: ['next', 'prev', 'register'],
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {

@@ -82,6 +82,11 @@
   import { modeKafkaForm, modeKafkaInseretKeyAndValueForm } from '../config';
   import { modeKafkaForm, modeKafkaInseretKeyAndValueForm } from '../config';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
 
 
+  interface IKeyAndValue {
+    key: string;
+    value: string;
+  }
+
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       BasicForm,
       BasicForm,
@@ -92,11 +97,21 @@
     },
     },
     emits: ['next', 'prev', 'register'],
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
+      const temp = ref({});
+      let tempObj = ref({});
       const keyAndValueArr = ref<[]>([]);
       const keyAndValueArr = ref<[]>([]);
+      const keyAndValueArrTemp = ref<[]>([]);
+      const keyAndValueObj = reactive<IKeyAndValue>({
+        key: '',
+        value: '',
+      });
       const sonValues = reactive({
       const sonValues = reactive({
         configuration: {},
         configuration: {},
       });
       });
-      const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
+      const otherPropertiesValues = reactive({
+        otherProperties: {},
+      });
+      const [register, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 80,
         labelWidth: 80,
         schemas: modeKafkaForm,
         schemas: modeKafkaForm,
         actionColOptions: {
         actionColOptions: {
@@ -105,12 +120,10 @@
         resetButtonOptions: {
         resetButtonOptions: {
           text: '上一步',
           text: '上一步',
         },
         },
-
         resetFunc: customResetFunc,
         resetFunc: customResetFunc,
-        submitFunc: customSubmitFunc,
       });
       });
 
 
-      const [registerKeyAndValue] = useForm({
+      const [registerKeyAndValue, { validate: validateKeyAndValue }] = useForm({
         labelWidth: 80,
         labelWidth: 80,
         schemas: modeKafkaInseretKeyAndValueForm,
         schemas: modeKafkaInseretKeyAndValueForm,
         actionColOptions: {
         actionColOptions: {
@@ -131,36 +144,38 @@
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');
       }
       }
-      async function customSubmitFunc() {
-        try {
-          const values = await validateFields();
-          emit('next', values);
-        } catch (error) {
-        } finally {
-        }
-      }
+
+      const tempGetKeyAndVal = async () => {
+        temp.value = await validateKeyAndValue();
+      };
       const defaultAddKeyAndValueFunc = () => {
       const defaultAddKeyAndValueFunc = () => {
         if (keyAndValueArr.value.length == 0) {
         if (keyAndValueArr.value.length == 0) {
-          keyAndValueArr.value.push({
-            key: 1,
-            value: 1,
-          });
+          keyAndValueArr.value.push(keyAndValueObj as never);
         }
         }
       };
       };
       defaultAddKeyAndValueFunc();
       defaultAddKeyAndValueFunc();
 
 
+      const getDefaultValue = () => {
+        tempGetKeyAndVal();
+        keyAndValueArrTemp.value.push(temp.value as never);
+      };
+
       const addKeyAndValueFunc = () => {
       const addKeyAndValueFunc = () => {
-        keyAndValueArr.value.push({
-          key: 1,
-          value: 1,
-        });
+        keyAndValueArr.value.push(keyAndValueObj as never);
+        tempGetKeyAndVal();
+        tempObj.value = temp.value;
+        keyAndValueArrTemp.value.push(tempObj.value as never);
+        console.log(keyAndValueArrTemp.value);
       };
       };
       const removeKeyAndValueFunc = () => {
       const removeKeyAndValueFunc = () => {
         keyAndValueArr.value.splice(0, 1);
         keyAndValueArr.value.splice(0, 1);
       };
       };
 
 
       const getSonValueFunc = async () => {
       const getSonValueFunc = async () => {
-        sonValues.configuration = await validateFields();
+        sonValues.configuration = await validate();
+        getDefaultValue();
+        console.log(sonValues.configuration);
+        console.log(otherPropertiesValues.otherProperties);
         return sonValues;
         return sonValues;
       };
       };
       return {
       return {

@@ -68,7 +68,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeMqttForm } from '../config';
   import { modeMqttForm } from '../config';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
-  import { Alert, Divider, Descriptions, UploadDragger } from 'ant-design-vue';
+  import { Alert, Divider, Descriptions, Upload } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -78,7 +78,7 @@
       [Descriptions.name]: Descriptions,
       [Descriptions.name]: Descriptions,
       [Descriptions.Item.name]: Descriptions.Item,
       [Descriptions.Item.name]: Descriptions.Item,
       InboxOutlined,
       InboxOutlined,
-      UploadDragger,
+      [Upload.UploadDragger]: Upload.UploadDragger,
     },
     },
     emits: ['next', 'prev', 'register'],
     emits: ['next', 'prev', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {

 <template>
 <template>
   <div>
   <div>
-    <BasicTable @register="registerTable">
+    <BasicTable
+      @selection-change="useSelectionChange"
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+    >
       <template #toolbar>
       <template #toolbar>
         <a-button type="primary" @click="handleAdd"> 新增租户配置 </a-button>
         <a-button type="primary" @click="handleAdd"> 新增租户配置 </a-button>
+        <a-button color="error" @click="handleMutilteDelete"> 批量删除 </a-button>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -46,9 +51,10 @@
     components: { BasicTable, TenantSettingDrawer, TableAction },
     components: { BasicTable, TenantSettingDrawer, TableAction },
     setup() {
     setup() {
       let echoEditData = reactive({});
       let echoEditData = reactive({});
+      let selectedRowKeys: Array<string> = [];
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, getSelectRowKeys }] = useTable({
         title: '',
         title: '',
         clickToRowSelect: false,
         clickToRowSelect: false,
         api: getTableTenantProfileApi,
         api: getTableTenantProfileApi,
@@ -84,11 +90,19 @@
         echoEditData = record;
         echoEditData = record;
       }
       }
       async function handleDelete(record: Recordable) {
       async function handleDelete(record: Recordable) {
-        let ids = record.id.id;
+        let ids = [record.id];
         await deleteTenantProfileApi(ids);
         await deleteTenantProfileApi(ids);
         createMessage.success('删除成功');
         createMessage.success('删除成功');
         reload();
         reload();
       }
       }
+      const useSelectionChange = () => {
+        selectedRowKeys = getSelectRowKeys();
+      };
+      const handleMutilteDelete = async () => {
+        await deleteTenantProfileApi(selectedRowKeys);
+        createMessage.success('删除成功');
+        reload();
+      };
       function handleSuccess() {
       function handleSuccess() {
         reload();
         reload();
       }
       }
@@ -99,7 +113,9 @@
         handleAdd,
         handleAdd,
         handleEdit,
         handleEdit,
         handleDelete,
         handleDelete,
+        handleMutilteDelete,
         handleSuccess,
         handleSuccess,
+        useSelectionChange,
       };
       };
     },
     },
   });
   });