Merge branch 'ft' into 'main'

fix:[DEFECT-319] 修复消息模板启用批量删除问题

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

@@ -58,7 +58,7 @@
       });
       });
 
 
       const [register, { validate, resetFields, setFieldsValue }] = useForm({
       const [register, { validate, resetFields, setFieldsValue }] = useForm({
-        labelWidth: 80,
+        labelWidth: 100,
         schemas: CoapSchemas,
         schemas: CoapSchemas,
         actionColOptions: {
         actionColOptions: {
           span: 14,
           span: 14,

 <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="handleCreate"> 新增消息模板 </a-button>
         <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button>
-        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="disabled">
           批量删除
           批量删除
         </a-button>
         </a-button>
       </template>
       </template>
@@ -44,8 +48,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent } from 'vue';
-
+  import { defineComponent, ref } from 'vue';
   import { BasicTable, TableAction, useTable } from '/@/components/Table';
   import { BasicTable, TableAction, useTable } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import TemplateDrawer from './TemplateDrawer.vue';
   import TemplateDrawer from './TemplateDrawer.vue';
@@ -57,21 +60,21 @@
   import SendSms from '/@/views/message/template/SendSms.vue';
   import SendSms from '/@/views/message/template/SendSms.vue';
   import { MessageEnum } from '/@/enums/messageEnum';
   import { MessageEnum } from '/@/enums/messageEnum';
   import SendEmail from '/@/views/message/template/SendEmail.vue';
   import SendEmail from '/@/views/message/template/SendEmail.vue';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'MessageTemplateManagement',
     name: 'MessageTemplateManagement',
     components: { SendSms, SendEmail, BasicTable, TemplateDrawer, TableAction },
     components: { SendSms, SendEmail, BasicTable, TemplateDrawer, TableAction },
     setup() {
     setup() {
+      let selectedRowKeys: any = [];
+      const disabled = ref(true);
+      const { createMessage } = useMessage();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const go = useGo();
       const go = useGo();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-        deleteMessageTemplate,
-        handleSuccess
-      );
-      const [registerTable, { reload }] = useTable({
+
+      const [registerTable, { reload, getSelectRows, getSelectRowKeys }] = useTable({
         title: '消息模板列表',
         title: '消息模板列表',
         api: messageTemplatePage,
         api: messageTemplatePage,
         columns,
         columns,
@@ -79,6 +82,7 @@
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
         },
         },
+        rowKey: 'id',
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
@@ -90,7 +94,6 @@
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
           fixed: 'right',
           fixed: 'right',
         },
         },
-        ...selectionOptions,
       });
       });
 
 
       function handleCreate() {
       function handleCreate() {
@@ -132,6 +135,42 @@
       function goConfig() {
       function goConfig() {
         go(PageEnum.MESSAGE_CONFIG);
         go(PageEnum.MESSAGE_CONFIG);
       }
       }
+      const useSelectionChange = () => {
+        selectedRowKeys = getSelectRowKeys();
+        if (selectedRowKeys.length > 0) {
+          disabled.value = false;
+        }
+        const isJudge = getSelectRows().map((m) => m.status);
+        if (isJudge.includes(1)) {
+          disabled.value = true;
+        } else {
+          disabled.value = false;
+        }
+        if (isJudge.length === 0) {
+          disabled.value = true;
+        }
+      };
+      // 删除或批量删除
+      const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+        if (record) {
+          try {
+            await deleteMessageTemplate([record.id]);
+            createMessage.success('删除成功');
+            handleSuccess();
+          } catch (e: any) {}
+        } else {
+          try {
+            await deleteMessageTemplate(selectedRowKeys);
+            createMessage.success('批量删除成功');
+            handleSuccess();
+            selectedRowKeys.length = 0;
+          } catch (e: any) {
+            selectedRowKeys.length = 0;
+          } finally {
+            selectedRowKeys.length = 0;
+          }
+        }
+      };
       return {
       return {
         registerTable,
         registerTable,
         registerDrawer,
         registerDrawer,
@@ -142,7 +181,8 @@
         handleSuccess,
         handleSuccess,
         handleModal,
         handleModal,
         goConfig,
         goConfig,
-        hasBatchDelete,
+        useSelectionChange,
+        disabled,
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
       };
       };
     },
     },

@@ -5,6 +5,7 @@
       :rowSelection="{ type: 'checkbox' }"
       :rowSelection="{ type: 'checkbox' }"
       @register="registerTable"
       @register="registerTable"
       v-show="isStatus === 0"
       v-show="isStatus === 0"
+      :clickToRowSelect="false"
     >
     >
       <template #toolbar>
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增转换脚本 </a-button>
         <a-button type="primary" @click="handleCreate"> 新增转换脚本 </a-button>