Merge branch 'ft' into 'main'

fix:[DEFECT-329] 修复设备配置批量删除不提示问题

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

@@ -250,8 +250,9 @@
             handleSuccess();
             handleSuccess();
             selectedRowKeys.length = 0;
             selectedRowKeys.length = 0;
           })
           })
-          .catch(() => {
+          .catch((e) => {
             selectedRowKeys.length = 0;
             selectedRowKeys.length = 0;
+            createMessage.error(e);
           });
           });
         selectedRowKeys.length = 0;
         selectedRowKeys.length = 0;
       };
       };

@@ -124,6 +124,7 @@
       });
       });
       const handleCancel = () => {
       const handleCancel = () => {
         defineClearFunc();
         defineClearFunc();
+        closeModal();
       };
       };
       const defineClearFunc = () => {
       const defineClearFunc = () => {
         nextTick(() => {
         nextTick(() => {

@@ -81,7 +81,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, reactive } from 'vue';
+  import { defineComponent, ref, reactive, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeApiForm, modeApiInseretKeyAndValueForm } from '../config';
   import { modeApiForm, modeApiInseretKeyAndValueForm } from '../config';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
@@ -150,8 +150,10 @@
         });
         });
       };
       };
       const customClearStepTwoValueFunc = async () => {
       const customClearStepTwoValueFunc = async () => {
-        defineClearFunc();
-        defineClearKeyAndValueFunc();
+        nextTick(() => {
+          defineClearFunc();
+          defineClearKeyAndValueFunc();
+        });
       };
       };
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');

@@ -26,7 +26,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, reactive } from 'vue';
+  import { defineComponent, ref, reactive, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   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';
@@ -102,8 +102,10 @@
       };
       };
 
 
       const customClearStepTwoValueFunc = async () => {
       const customClearStepTwoValueFunc = async () => {
-        defineClearFunc();
-        defineClearKeyAndValueFunc();
+        nextTick(() => {
+          defineClearFunc();
+          defineClearKeyAndValueFunc();
+        });
       };
       };
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');

@@ -62,7 +62,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, reactive } from 'vue';
+  import { defineComponent, ref, reactive, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { CredentialsEnum, modeMqttForm } from '../config';
   import { CredentialsEnum, modeMqttForm } from '../config';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
@@ -115,7 +115,9 @@
         });
         });
       };
       };
       const customClearStepTwoValueFunc = async () => {
       const customClearStepTwoValueFunc = async () => {
-        defineClearFunc();
+        nextTick(() => {
+          defineClearFunc();
+        });
       };
       };
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');

@@ -24,7 +24,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, reactive } from 'vue';
+  import { defineComponent, ref, reactive, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeRabbitMqForm, modeKafkaInseretKeyAndValueForm } from '../config';
   import { modeRabbitMqForm, modeKafkaInseretKeyAndValueForm } from '../config';
 
 
@@ -84,7 +84,9 @@
         });
         });
       };
       };
       const customClearStepTwoValueFunc = async () => {
       const customClearStepTwoValueFunc = async () => {
-        defineClearFunc();
+        nextTick(() => {
+          defineClearFunc();
+        });
       };
       };
       async function customResetFunc() {
       async function customResetFunc() {
         emit('prev');
         emit('prev');

@@ -4,7 +4,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, ref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { modeForm } from './config';
   import { modeForm } from './config';
   import { Select, Input, Divider } from 'ant-design-vue';
   import { Select, Input, Divider } from 'ant-design-vue';
@@ -46,7 +46,9 @@
 
 
       //清空数据
       //清空数据
       const customResetStepOneFunc = () => {
       const customResetStepOneFunc = () => {
-        resetFields();
+        nextTick(() => {
+          resetFields();
+        });
       };
       };
       const getSonValueFunc = async () => {
       const getSonValueFunc = async () => {
         sonValues.value = await validateFields();
         sonValues.value = await validateFields();

@@ -17,7 +17,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, watch, ref, getCurrentInstance } from 'vue';
+  import { defineComponent, watch, ref, getCurrentInstance, nextTick } from 'vue';
   import TransferConfigKafka from '../cpns/cpns/transferConfigKafka.vue';
   import TransferConfigKafka from '../cpns/cpns/transferConfigKafka.vue';
   import TransferConfigMqtt from '../cpns/cpns/transferConfigMqtt.vue';
   import TransferConfigMqtt from '../cpns/cpns/transferConfigMqtt.vue';
   import TransferConfigRabbitMq from '../cpns/cpns/transferConfigRabbitMq.vue';
   import TransferConfigRabbitMq from '../cpns/cpns/transferConfigRabbitMq.vue';
@@ -57,14 +57,16 @@
         }
         }
       );
       );
       const clearSonValueDataFunc = () => {
       const clearSonValueDataFunc = () => {
-        try {
-          proxy.$refs.refTransferConfigKafka?.customClearStepTwoValueFunc();
-          proxy.$refs.refTransferConfigMqtt?.customClearStepTwoValueFunc();
-          proxy.$refs.refTransferConfigRabbitMq?.customClearStepTwoValueFunc();
-          proxy.$refs.refTransferConfigApi?.customClearStepTwoValueFunc();
-        } catch (e) {
-          return e;
-        }
+        nextTick(() => {
+          try {
+            proxy.$refs.refTransferConfigKafka?.customClearStepTwoValueFunc();
+            proxy.$refs.refTransferConfigMqtt?.customClearStepTwoValueFunc();
+            proxy.$refs.refTransferConfigRabbitMq?.customClearStepTwoValueFunc();
+            proxy.$refs.refTransferConfigApi?.customClearStepTwoValueFunc();
+          } catch (e) {
+            return e;
+          }
+        });
       };
       };
       const clearSonValueValidateFunc = () => {
       const clearSonValueValidateFunc = () => {
         try {
         try {