fix：修复角色权限分配菜单回显一级菜单问题，修改批量删除为封装统一格式

@@ -93,9 +93,13 @@
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
           originMenus.value = [...roleMenus.value];
           for (let item of treeData.value) {
           for (let item of treeData.value) {
-            pidArr.value.push(item.key);
+            if (item?.children != 0) {
+              pidArr.value.push(item.key);
+            }
             for (let item1 of item?.children) {
             for (let item1 of item?.children) {
-              pidArr.value.push(item1.key);
+              if (item1?.children != 0) {
+                pidArr.value.push(item1.key);
+              }
             }
             }
           }
           }
           for (let item of roleMenus.value) {
           for (let item of roleMenus.value) {

@@ -2,7 +2,6 @@
   <div>
   <div>
     <BasicTable
     <BasicTable
       @register="registerTable"
       @register="registerTable"
-      @selection-change="useSelectionChange"
       :rowSelection="{ type: 'checkbox' }"
       :rowSelection="{ type: 'checkbox' }"
       :clickToRowSelect="false"
       :clickToRowSelect="false"
     >
     >
@@ -11,11 +10,25 @@
           <a-button type="primary" @click="handleCreate"> 新增角色 </a-button>
           <a-button type="primary" @click="handleCreate"> 新增角色 </a-button>
         </Authority>
         </Authority>
         <Authority value="api:yt:admin:deleteTenantRole">
         <Authority value="api:yt:admin:deleteTenantRole">
-          <a-button type="default" :disabled="disabled" @click="handleBatchDelete">
+          <a-button
+            type="primary"
+            color="error"
+            @click="handleDeleteOrBatchDelete(null)"
+            :disabled="hasBatchDelete"
+          >
             批量删除
             批量删除
           </a-button>
           </a-button>
         </Authority>
         </Authority>
       </template>
       </template>
+      <template #status="{ record }">
+        <Switch
+          :checked="record.status === 1"
+          :loading="record.pendingStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          @change="(checked:boolean)=>statusChange(checked,record)"
+        />
+      </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
           :actions="[
           :actions="[
@@ -32,7 +45,7 @@
               color: 'error',
               color: 'error',
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
               },
             },
             },
           ]"
           ]"
@@ -43,29 +56,30 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, nextTick } 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, setRoleStatus } from '/@/api/system/system';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   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 { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { Switch } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'TenantRoleManagement',
     name: 'TenantRoleManagement',
-    components: { BasicTable, RoleDrawer, TableAction, Authority },
+    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch },
     setup() {
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
-      let selectedRowKeys: Array<string> = [];
-      const disabled = ref(true);
-      const { createMessage } = useMessage();
-      const [registerTable, { reload, getSelectRows }] = useTable({
+      function handleSuccess() {
+        reload();
+      }
+      const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
         title: '租户角色列表',
         title: '租户角色列表',
         api: getRoleListByPage,
         api: getRoleListByPage,
         columns,
         columns,
-
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
@@ -82,6 +96,19 @@
           fixed: 'right',
           fixed: 'right',
         },
         },
       });
       });
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+        useBatchDelete(delRole, handleSuccess, setProps);
+      selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
+        // Demo:status为1的选择框禁用
+        if (record.status === 1) {
+          return { disabled: true };
+        } else {
+          return { disabled: false };
+        }
+      };
+      nextTick(() => {
+        setProps(selectionOptions);
+      });
 
 
       function handleCreate() {
       function handleCreate() {
         openDrawer(true, {
         openDrawer(true, {
@@ -95,50 +122,39 @@
           isUpdate: true,
           isUpdate: true,
         });
         });
       }
       }
-
-      async function handleDelete(record: Recordable) {
-        const roleIds = [record.id];
-        delRole(roleIds).then(() => {
-          createMessage.success('删除成功');
-          reload();
+      const statusChange = async (checked, record) => {
+        setProps({
+          loading: true,
         });
         });
-      }
-
-      const useSelectionChange = () => {
-        selectedRowKeys = getSelectRows();
-        if (selectedRowKeys.length !== 0) {
-          disabled.value = false;
-        } else {
-          disabled.value = true;
+        setSelectedRowKeys([]);
+        resetSelectedRowKeys();
+        const newStatus = checked ? 1 : 0;
+        const { createMessage } = useMessage();
+        try {
+          await setRoleStatus(record.id, newStatus);
+          if (newStatus) {
+            createMessage.success(`启用成功`);
+          } else {
+            createMessage.success('禁用成功');
+          }
+        } finally {
+          setProps({
+            loading: false,
+          });
+          reload();
         }
         }
       };
       };
-      const handleBatchDelete = async () => {
-        disabled.value = true;
-        let roleIds = selectedRowKeys.map((m: any) => {
-          return m.id;
-        });
-        await delRole(roleIds);
-        createMessage.success('批量删除成功');
-        reload();
-        setTimeout(() => {
-          disabled.value = false;
-        }, 3000);
-      };
-      function handleSuccess() {
-        reload();
-      }
 
 
       return {
       return {
-        disabled,
-        useSelectionChange,
-        handleBatchDelete,
+        statusChange,
         registerTable,
         registerTable,
         registerDrawer,
         registerDrawer,
         handleCreate,
         handleCreate,
         handleEdit,
         handleEdit,
-        handleDelete,
         handleSuccess,
         handleSuccess,
         RoleEnum,
         RoleEnum,
+        hasBatchDelete,
+        handleDeleteOrBatchDelete,
       };
       };
     },
     },
   });
   });

 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { h } from 'vue';
-import { Switch } from 'ant-design-vue';
-import { setRoleStatus } from '/@/api/system/system';
-import { useMessage } from '/@/hooks/web/useMessage';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { RoleEnum } from '/@/enums/roleEnum';
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -20,35 +16,8 @@ export const columns: BasicColumn[] = [
     title: '状态',
     title: '状态',
     dataIndex: 'status',
     dataIndex: 'status',
     width: 120,
     width: 120,
-    customRender: ({ record }) => {
-      if (!Reflect.has(record, 'pendingStatus')) {
-        record.pendingStatus = false;
-      }
-      return h(Switch, {
-        checked: record.status === 1,
-        checkedChildren: '已启用',
-        unCheckedChildren: '已禁用',
-        loading: record.pendingStatus,
-        onChange(checked: boolean) {
-          record.pendingStatus = true;
-          const newStatus = checked ? 1 : 0;
-          const { createMessage } = useMessage();
-          setRoleStatus(record.id, newStatus)
-            .then(() => {
-              record.status = newStatus;
-              createMessage.success(`已成功修改角色状态`);
-            })
-            .catch(() => {
-              createMessage.error('修改角色状态失败');
-            })
-            .finally(() => {
-              record.pendingStatus = false;
-            });
-        },
-      });
-    },
+    slots: { customRender: 'status' },
   },
   },
-
   {
   {
     title: '备注',
     title: '备注',
     dataIndex: 'remark',
     dataIndex: 'remark',