fix：修改数据流转 编辑点击确定按钮报错问题

@@ -3,14 +3,14 @@
     <a-input
       placeholder="请输入参数key"
       v-model:value="param.label"
-      style="width: 30%; margin-bottom: 5px"
-      @input="emitChange"
+      style="width: 38%; margin-bottom: 5px"
+      @change="emitChange"
     />
     <a-input
       placeholder="请输入参数value"
       v-model:value="param.value"
-      style="width: 30%; margin: 0 0 5px 5px"
-      @input="emitChange"
+      style="width: 38%; margin: 0 0 5px 60px"
+      @change="emitChange"
     />
     <MinusCircleOutlined
       v-if="dynamicInput.params.length > min"
@@ -20,7 +20,7 @@
     />
   </div>
   <div>
-    <a-button type="dashed" style="width: 60%" @click="add">
+    <a-button type="dashed" style="width: 38%" @click="add">
       <PlusOutlined />
       新增
     </a-button>
@@ -62,6 +62,7 @@
         }
         emitChange();
       };
+
       //新增Input
       const add = () => {
         dynamicInput.params.push({
@@ -87,12 +88,6 @@
             dynamicInput.params.push({ label: key, value: jsonObj[key] });
           });
         }
-        // if (props.value && props.value.indexOf('{') == 0) {
-        //   let jsonObj = JSON.parse(props.value);
-        //   Object.keys(jsonObj).forEach((key) => {
-        //     dynamicInput.params.push({ label: key, value: jsonObj[key] });
-        //   });
-        // }
       }
       /**
        * 数值改变
@@ -101,13 +96,11 @@
         let obj = {};
         if (dynamicInput.params.length > 0) {
           dynamicInput.params.forEach((item) => {
-            obj[item['label']] = item['value'];
+            obj[item.label] = item.value;
           });
         }
         emit('change', isEmpty(obj) ? '' : obj);
         emit('update:value', isEmpty(obj) ? '' : obj);
-        // emit('change', isEmpty(obj) ? '' : JSON.stringify(obj));
-        // emit('update:value', isEmpty(obj) ? '' : JSON.stringify(obj));
       }
 
       return {

@@ -80,6 +80,8 @@
       const getTitle = ref('');
       const current = ref(0);
       const editPostId = ref('');
+      let isEdit = ref(true);
+      let noEditObj: any = reactive({});
       const editType = reactive({
         type: '',
         configuration: {},
@@ -109,6 +111,20 @@
           editNextType.remark = data.record.remark;
           proxy.$refs.refTransferConfigMode.setStepOneFieldsValueFunc(editNextType);
         }
+        if (!unref(isUpdate)) {
+          isEdit.value = false;
+        } else {
+          isEdit.value = true;
+        }
+        if (isEdit.value) {
+          noEditObj = {
+            name: data.record?.name,
+            remark: data.record?.remark,
+            type: data.record?.type,
+            id: data.record.id,
+            configuration: data.record?.configuration,
+          };
+        }
         switch (unref(isUpdate)) {
           case 'view':
             commonViewOrEditFunc();
@@ -143,6 +159,7 @@
         current.value++;
         getModeSelectVal.value = args;
         if (unref(isUpdate)) {
+          isEdit.value = false;
           try {
             if (editNextType.type == 'org.thingsboard.rule.engine.kafka.TbKafkaNode') {
               editTypeFunc(editNextType.configuration);
@@ -163,6 +180,16 @@
       };
       const handlePrev = () => {
         current.value--;
+        if (unref(isUpdate)) {
+          isEdit.value = true;
+          noEditObj = {
+            name: editNextType?.name,
+            remark: editNextType?.remark,
+            type: editNextType?.type,
+            id: editPostId?.value,
+            configuration: editNextType?.configuration?.configuration,
+          };
+        }
       };
 
       const commonFunc = () => {
@@ -220,6 +247,7 @@
           id,
           additionalInfoV
         );
+
         if (!unref(isUpdate)) {
           delete allPostForm.id;
         }
@@ -229,6 +257,9 @@
           setModalProps({ confirmLoading: true });
           if (!unref(isUpdate)) {
             await addOrEditFunc();
+            if (allPostForm.name == undefined) {
+              return createMessage.error('请填写名称');
+            }
             await postAddConvertApi(allPostForm);
             createMessage.success('数据流转新增成功');
             emit('success');
@@ -236,10 +267,7 @@
             closeModal();
           } else {
             await addOrEditFunc();
-            if (allPostForm.configuration == undefined || allPostForm.configuration == null) {
-              return createMessage.error('数据流转下一步配置项必填');
-            }
-            await postAddConvertApi(allPostForm);
+            await postAddConvertApi(isEdit.value ? noEditObj : allPostForm);
             createMessage.success('数据流转编辑成功');
             emit('success');
             defineClearFunc();

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { ref } from 'vue';
-import { useMessage } from '/@/hooks/web/useMessage';
+// import { useMessage } from '/@/hooks/web/useMessage';
 import { isExistDataManagerNameApi } from '/@/api/datamanager/dataManagerApi';
-const { createMessage } = useMessage();
+// const { createMessage } = useMessage();
 
 const typeValue = ref('');
 
@@ -218,7 +218,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'otherProperties',
-    label: '其他属性',
+    label: '其他属性(不可重复)',
     colProps: { span: 24 },
     component: 'JAddInput',
   },
@@ -421,6 +421,14 @@ export const modeMqttForm: FormSchema[] = [
     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 },
@@ -429,6 +437,14 @@ export const modeMqttForm: FormSchema[] = [
     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 },
@@ -437,6 +453,14 @@ export const modeMqttForm: FormSchema[] = [
     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: 'Password',
     colProps: { span: 12 },
@@ -494,7 +518,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入Exchange name pattern',
+      placeholder: '请输入pattern',
     },
   },
   {
@@ -504,7 +528,7 @@ export const modeRabbitMqForm: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 255,
-      placeholder: '请输入Routing key pattern',
+      placeholder: '请输入pattern',
     },
   },
   {
@@ -612,7 +636,7 @@ export const modeRabbitMqForm: FormSchema[] = [
   },
   {
     field: 'clientProperties',
-    label: '客户端属性',
+    label: '客户端属性(不可重复)',
     colProps: { span: 24 },
     component: 'JAddInput',
   },
@@ -648,7 +672,7 @@ export const modeApiForm: FormSchema[] = [
               if (value == '') {
                 reject('请输入名称');
               } else {
-                if (values.name != undefined) {
+                if (values.name) {
                   isExistDataManagerNameApi({
                     name: value,
                     type:
@@ -657,7 +681,7 @@ export const modeApiForm: FormSchema[] = [
                         : typeValue.value,
                   }).then((data) => {
                     if (data == true) {
-                      createMessage.error('名称已存在');
+                      // createMessage.error('名称已存在');
                       resolve();
                     } else {
                       resolve();
@@ -828,7 +852,7 @@ export const modeApiForm: FormSchema[] = [
   },
   {
     field: 'headers',
-    label: 'Headers',
+    label: 'Headers(不可重复)',
     colProps: { span: 24 },
     defaultValue: { 'Content-Type': 'application/json' },
     component: 'JAddInput',
@@ -915,6 +939,14 @@ export const modeApiForm: FormSchema[] = [
     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 },
@@ -923,6 +955,14 @@ export const modeApiForm: FormSchema[] = [
     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 },
@@ -931,6 +971,14 @@ export const modeApiForm: FormSchema[] = [
     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: 'Password',
     colProps: { span: 12 },

@@ -21,6 +21,15 @@
           </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>
       <template #uploadAdd2="{ field }">
         <span style="display: none">{{ field }}</span>
         <a-upload-dragger
@@ -41,6 +50,15 @@
           </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>
       <template #uploadAdd3="{ field }">
         <span style="display: none">{{ field }}</span>
         <a-upload-dragger
@@ -61,6 +79,15 @@
           </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>
@@ -81,6 +108,12 @@
     },
     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('');
@@ -125,6 +158,42 @@
         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(() => {
@@ -135,6 +204,12 @@
           caCertFileName.value = '';
           privateKeyFileName.value = '';
           certFileName.value = '';
+          showImg1.value = false;
+          showImg1Pic.value = '';
+          showImg2.value = false;
+          showImg2Pic.value = '';
+          showImg3.value = false;
+          showImg3Pic.value = '';
         });
       };
       async function customResetFunc() {
@@ -153,11 +228,19 @@
        */
       const handleChange = async (e, { file }) => {
         if (file.status === 'removed') {
-          e == 'T'
-            ? (fileList1.value = [])
-            : e == 'F'
-            ? (fileList2.value = [])
-            : (fileList3.value = []);
+          if (e == 'T') {
+            fileList1.value = [];
+            showImg1.value = false;
+            showImg1Pic.value = '';
+          } else if (e == 'F') {
+            fileList2.value = [];
+            showImg2.value = false;
+            showImg2Pic.value = '';
+          } else {
+            fileList3.value = [];
+            showImg3.value = false;
+            showImg3Pic.value = '';
+          }
         } else {
           const isLt5M = file.size / 1024 / 1024 < 5;
           if (!isLt5M) {
@@ -172,11 +255,49 @@
             formData.append('file', file);
             const response = await uploadApi(formData);
             if (response.fileStaticUri) {
-              e == 'T'
-                ? (caCertFileName.value = response.fileStaticUri)
-                : e == 'F'
-                ? (certFileName.value = response.fileStaticUri)
-                : (privateKeyFileName.value = 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;
+                }
+              }
             }
           }
         }
@@ -211,6 +332,12 @@
         caCertFileName,
         privateKeyFileName,
         certFileName,
+        showImg1,
+        showImg1Pic,
+        showImg2,
+        showImg2Pic,
+        showImg3,
+        showImg3Pic,
       };
     },
   });

@@ -27,7 +27,7 @@
       const clearName = ref('');
       const [register, { validate, setFieldsValue, resetFields: defineClearFunc, clearValidate }] =
         useForm({
-          labelWidth: 120,
+          labelWidth: 130,
           schemas: modeKafkaForm,
           actionColOptions: {
             span: 14,

@@ -22,6 +22,15 @@
           </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>
@@ -44,6 +53,15 @@
           </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>
@@ -66,6 +84,15 @@
           </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>
@@ -90,6 +117,12 @@
     },
     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('');
@@ -123,11 +156,19 @@
        */
       const handleChange = async (e, { file }) => {
         if (file.status === 'removed') {
-          e == 'T'
-            ? (fileList1.value = [])
-            : e == 'F'
-            ? (fileList2.value = [])
-            : (fileList3.value = []);
+          if (e == 'T') {
+            fileList1.value = [];
+            showImg1.value = false;
+            showImg1Pic.value = '';
+          } else if (e == 'F') {
+            fileList2.value = [];
+            showImg2.value = false;
+            showImg2Pic.value = '';
+          } else {
+            fileList3.value = [];
+            showImg3.value = false;
+            showImg3Pic.value = '';
+          }
         } else {
           const isLt5M = file.size / 1024 / 1024 < 5;
           if (!isLt5M) {
@@ -142,11 +183,49 @@
             formData.append('file', file);
             const response = await uploadApi(formData);
             if (response.fileStaticUri) {
-              e == 'T'
-                ? (caCertFileName.value = response.fileStaticUri)
-                : e == 'F'
-                ? (certFileName.value = response.fileStaticUri)
-                : (privateKeyFileName.value = 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;
+                }
+              }
             }
           }
         }
@@ -182,6 +261,42 @@
         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(() => {
@@ -192,6 +307,12 @@
           caCertFileName.value = '';
           privateKeyFileName.value = '';
           certFileName.value = '';
+          showImg1.value = false;
+          showImg1Pic.value = '';
+          showImg2.value = false;
+          showImg2Pic.value = '';
+          showImg3.value = false;
+          showImg3Pic.value = '';
         });
       };
       async function customResetFunc() {
@@ -233,6 +354,12 @@
         caCertFileName,
         privateKeyFileName,
         certFileName,
+        showImg1,
+        showImg1Pic,
+        showImg2,
+        showImg2Pic,
+        showImg3,
+        showImg3Pic,
       };
     },
   });

@@ -19,7 +19,7 @@
       });
 
       const [register, { validate, setFieldsValue, resetFields: defineClearFunc }] = useForm({
-        labelWidth: 120,
+        labelWidth: 140,
         schemas: modeRabbitMqForm,
         actionColOptions: {
           span: 14,

@@ -16,7 +16,7 @@
             title="您确定要批量删除数据"
             ok-text="确定"
             cancel-text="取消"
-            @confirm="handleDeleteOrBatchDelete(null)"
+            @confirm="handleConfirm"
           >
             <a-button
               type="primary"
@@ -29,19 +29,21 @@
             </a-button>
           </Popconfirm>
         </Authority>
-        <a-button
+        <!-- <a-button
           :disabled="disabledStatus2"
           @click="handleMutiuteDisable"
           :type="disabledStatus2 ? 'default' : 'primary'"
         >
           <span :style="{ color: disabledStatus2 ? 'grey' : 'white' }">批量禁用</span>
-        </a-button>
+        </a-button> -->
         <a-button
-          :disabled="disabledStatus3"
+          :disabled="hasBatchDelete || disabledStatus3"
           @click="handleMutiuteEnable"
-          :type="disabledStatus3 ? 'default' : 'primary'"
+          :type="hasBatchDelete || disabledStatus3 ? 'default' : 'primary'"
         >
-          <span :style="{ color: disabledStatus3 ? 'grey' : 'white' }">批量启用</span>
+          <span :style="{ color: hasBatchDelete || disabledStatus3 ? 'grey' : 'white' }"
+            >批量启用</span
+          >
         </a-button>
       </template>
       <template #action="{ record }">
@@ -127,9 +129,10 @@
       const disabledStatus3 = ref(true);
       const loading = ref(true);
       const { createMessage } = useMessage();
-      let selectedRowKeys: any = ref([]);
       let getSelectRowsArr: any = ref([]);
       let isJudgeSelectRowsArr: any = ref([]);
+      let hasDisableStatus = [];
+
       const handleSuccess = () => {
         reload();
         resetSelectedRowKeys();
@@ -163,6 +166,11 @@
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
         useBatchDelete(deleteConvertApi, handleSuccess, setProps);
       selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+        if (record.length == 0) {
+          disabledStatus1.value = true;
+          disabledStatus2.value = true;
+          disabledStatus3.value = true;
+        }
         //status为1的选择框禁用
         if (record.status === 1) {
           return { disabled: true };
@@ -194,39 +202,40 @@
         }, 10);
       };
       const useSelectionChange = () => {
-        selectedRowKeys.value = getSelectRowKeys();
         isJudgeSelectRowsArr.value = getSelectRows();
-        const hasDisableStatus = isJudgeSelectRowsArr.value.map((m) => {
+        hasDisableStatus = isJudgeSelectRowsArr.value.map((m) => {
           return m.status;
         });
+        console.log(hasDisableStatus);
         if (hasDisableStatus.length == 0) {
           disabledStatus1.value = true;
           disabledStatus2.value = true;
           disabledStatus3.value = true;
-        }
-        hasDisableStatus.every((e) => {
-          if (e == 1) {
-            disabledStatus3.value = true;
-            disabledStatus2.value = false;
-          } else if (e == 0) {
-            disabledStatus2.value = true;
-            disabledStatus3.value = false;
-          }
-        });
-        let i1 = hasDisableStatus.indexOf(0);
-        let i2 = hasDisableStatus.indexOf(1);
-        if (i1 !== -1 && i2 !== -1) {
-          disabledStatus2.value = true;
-          disabledStatus3.value = true;
-        }
-        if (isJudgeSelectRowsArr.value.length == 0) {
-          disabledStatus1.value = true;
         } else {
-          disabledStatus1.value = false;
-        }
-        if (hasDisableStatus.includes(1)) {
-          disabledStatus1.value = true;
+          hasDisableStatus.every((e) => {
+            if (e == 1) {
+              disabledStatus3.value = true;
+              disabledStatus2.value = false;
+            } else if (e == 0) {
+              disabledStatus2.value = true;
+              disabledStatus3.value = false;
+            }
+          });
         }
+        // let i1 = hasDisableStatus.indexOf(0);
+        // let i2 = hasDisableStatus.indexOf(1);
+        // if (i1 !== -1 && i2 !== -1) {
+        //   disabledStatus2.value = true;
+        //   disabledStatus3.value = true;
+        // }
+        // if (isJudgeSelectRowsArr.value.length == 0) {
+        //   disabledStatus1.value = true;
+        // } else {
+        //   disabledStatus1.value = false;
+        // }
+        // if (hasDisableStatus.includes(1)) {
+        //   disabledStatus1.value = true;
+        // }
       };
       const handleMutiuteDisable = async () => {
         enableObj.convertIds.length = 0;
@@ -322,6 +331,10 @@
           });
         });
       }
+      const handleConfirm = () => {
+        handleDeleteOrBatchDelete(null);
+        disabledStatus3.value = true;
+      };
 
       return {
         disabledStatus1,
@@ -342,6 +355,7 @@
         statusChange,
         disabledSwitch,
         handleView,
+        handleConfirm,
       };
     },
   });