Merge branch 'ft' into 'main'

fix:[DEFECT-314] 修复告警联系人删除提示问题

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

@@ -127,18 +127,14 @@
             await deleteAlarmContact([record.id]);
             await deleteAlarmContact([record.id]);
             createMessage.success('删除联系人成功');
             createMessage.success('删除联系人成功');
             handleSuccess();
             handleSuccess();
-          } catch (e) {
-            createMessage.error('删除失败');
-          }
+          } catch (e) {}
         } else {
         } else {
           try {
           try {
             await deleteAlarmContact(selectedRowIds.value);
             await deleteAlarmContact(selectedRowIds.value);
             createMessage.success('批量删除联系人成功');
             createMessage.success('批量删除联系人成功');
             selectedRowIds.value = [];
             selectedRowIds.value = [];
             handleSuccess();
             handleSuccess();
-          } catch (e) {
-            createMessage.info('删除失败');
-          }
+          } catch (e) {}
         }
         }
       };
       };
 
 

@@ -74,7 +74,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, nextTick, onUnmounted } from 'vue';
+  import { defineComponent, ref, nextTick, onUnmounted, reactive } from 'vue';
   import { BasicTable, TableImg, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { BasicTable, TableImg, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { columns, searchFormSchema } from './device.profile.data';
   import { columns, searchFormSchema } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -93,7 +93,7 @@
     components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, TableImg },
     components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, TableImg },
     setup() {
     setup() {
       const deviceDetailRef = ref(null);
       const deviceDetailRef = ref(null);
-      let selectedRowKeys: any = [];
+      let selectedRowKeys: any = reactive([]);
       const getPathUrl = ref('');
       const getPathUrl = ref('');
       const getPathUrlName = ref('');
       const getPathUrlName = ref('');
       const disabled = ref(true);
       const disabled = ref(true);
@@ -227,22 +227,30 @@
         }, 10);
         }, 10);
       }
       }
       const useSelectionChange = () => {
       const useSelectionChange = () => {
-        selectedRowKeys = getSelectRows();
-        if (selectedRowKeys.length > 0) {
-          disabled.value = false;
+        let getRows = getSelectRows();
+        const isJudge = getRows.map((m) => m.default);
+        if (isJudge.includes(true)) {
+          disabled.value = true;
         } else {
         } else {
+          disabled.value = false;
+        }
+        if (isJudge.length === 0) {
           disabled.value = true;
           disabled.value = true;
         }
         }
-      };
-      async function handleTableDel() {
-        selectedRowKeys = selectedRowKeys
-          .filter((f: any) => f.default !== true)
-          .map((m: any) => m.id);
-        await deviceConfigDelete(selectedRowKeys);
-        createMessage.success('删除成功');
-        handleSuccess();
         selectedRowKeys.length = 0;
         selectedRowKeys.length = 0;
-      }
+        selectedRowKeys = getRows.filter((f) => f.default !== true).map((m) => m.id);
+      };
+      const handleTableDel = () => {
+        deviceConfigDelete(selectedRowKeys)
+          .then((res) => {
+            createMessage.success('删除成功');
+            selectedRowKeys.length = 0;
+            handleSuccess();
+          })
+          .catch((e) => {
+            selectedRowKeys.length = 0;
+          });
+      };
 
 
       function handleDelete(record: Recordable) {
       function handleDelete(record: Recordable) {
         let ids = [record.id];
         let ids = [record.id];

 <template>
 <template>
   <div>
   <div>
-    <BasicTable @register="registerTable">
+    <BasicTable
+      :rowSelection="{ type: 'checkbox' }"
+      @selection-change="useSelectionChange"
+      @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="isStatus">
           批量删除
           批量删除
         </a-button>
         </a-button>
       </template>
       </template>
@@ -33,24 +37,25 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { delRole, getRoleListByPage } from '/@/api/system/system';
   import { delRole, getRoleListByPage } from '/@/api/system/system';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from './RoleDrawer.vue';
   import RoleDrawer from './RoleDrawer.vue';
   import { columns, searchFormSchema } from './role.data';
   import { columns, searchFormSchema } from './role.data';
   import { RoleEnum } from '/@/enums/roleEnum';
   import { RoleEnum } from '/@/enums/roleEnum';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
   export default defineComponent({
   export default defineComponent({
     name: 'RoleManagement',
     name: 'RoleManagement',
     components: { BasicTable, RoleDrawer, TableAction },
     components: { BasicTable, RoleDrawer, TableAction },
     setup() {
     setup() {
+      const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-        delRole,
-        handleSuccess
-      );
-      const [registerTable, { reload }] = useTable({
+      const isStatus = ref(true);
+      let selectArray: any = [];
+
+      const [registerTable, { reload, getSelectRows }] = useTable({
         title: '角色列表',
         title: '角色列表',
         api: getRoleListByPage,
         api: getRoleListByPage,
         columns,
         columns,
@@ -69,7 +74,6 @@
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
           fixed: 'right',
           fixed: 'right',
         },
         },
-        ...selectionOptions,
       });
       });
 
 
       function handleCreate() {
       function handleCreate() {
@@ -88,6 +92,41 @@
         reload();
         reload();
       }
       }
 
 
+      const useSelectionChange = () => {
+        let getRows = getSelectRows();
+        const isJudge = getRows.map((m) => m.roleType);
+        if (isJudge.includes('SYS_ADMIN')) {
+          isStatus.value = true;
+        } else {
+          isStatus.value = false;
+        }
+        if (isJudge.length === 0) {
+          isStatus.value = true;
+        }
+        selectArray = getRows.filter((f) => f.status !== 'SYS_ADMIN').map((m) => m.id);
+      };
+
+      const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+        if (record) {
+          try {
+            await delRole([record.id]);
+            createMessage.success('删除成功');
+            handleSuccess();
+          } catch (e: any) {}
+        } else {
+          try {
+            await delRole(selectArray);
+            createMessage.success('批量删除成功');
+            handleSuccess();
+            selectArray.length = 0;
+          } catch (e: any) {
+            selectArray.length = 0;
+          } finally {
+            selectArray.length = 0;
+          }
+        }
+      };
+
       return {
       return {
         registerTable,
         registerTable,
         registerDrawer,
         registerDrawer,
@@ -95,8 +134,9 @@
         handleEdit,
         handleEdit,
         handleSuccess,
         handleSuccess,
         RoleEnum,
         RoleEnum,
-        hasBatchDelete,
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
+        isStatus,
+        useSelectionChange,
       };
       };
     },
     },
   });
   });

@@ -111,9 +111,13 @@
       }
       }
       const useSelectionChange = () => {
       const useSelectionChange = () => {
         selectedRowKeys = getSelectRows();
         selectedRowKeys = getSelectRows();
-        if (selectedRowKeys.length !== 0) {
-          disabled.value = false;
+        let isJudge = selectedRowKeys.map((m: any) => m.default);
+        if (isJudge.includes(true)) {
+          disabled.value = true;
         } else {
         } else {
+          disabled.value = false;
+        }
+        if (isJudge.length === 0) {
           disabled.value = true;
           disabled.value = true;
         }
         }
       };
       };