fix: 修复不同角色下过滤创建角色的菜单树逻辑

ww
1 parent 09796c32
Showing 6 changed files with 133 additions and 55 deletions
src/api/sys/menu.ts
src/enums/dictEnum.ts
src/hooks/business/useRole.ts
src/views/system/role/RoleDrawer.vue
src/views/system/role/role.data.ts
src/views/tenant/role/RoleDrawer.vue
--- a/src/api/sys/menu.ts
View file @9848a31
+++ b/src/api/sys/menu.ts
View file @9848a31
@@ -30,6 +30,38 @@ export const getMenuList = (args?: number) => {
   } catch (e) {}
 };
+/**
+ * @description 获取自身的权限
+ * @param args
+ * @returns
+ */
+export const getMeMenuList = (args?: number) => {
+  try {
+    return defHttp.get<getMenuListResultModel>({
+      url: Api.GetMenuList,
+      params: {
+        needButton: args == 1 ? false : null,
+      },
+    });
+  } catch (e) {}
+};
+
+/**
+ * @description 获取超级管理员菜单
+ * @param args
+ * @returns
+ */
+export const getAdminMenuList = (args?: number) => {
+  try {
+    return defHttp.get<getMenuListResultModel>({
+      url: Api.SysAdminMenuList,
+      params: {
+        needButton: args == 1 ? false : null,
+      },
+    });
+  } catch (e) {}
+};
+
 export const delMenu = (menuIds: string[]) => {
   const url = Api.BaseMenuUrl;
   return defHttp.delete({ url: url, data: menuIds });
--- a/src/enums/dictEnum.ts
View file @9848a31
+++ b/src/enums/dictEnum.ts
View file @9848a31
@@ -9,6 +9,8 @@ export enum DictEnum {
   DEVICE_TYPE = 'device_type',
   // 平台管理员启用的权限
   ENABLED_PLATFORM_ADMIN_AUTH = 'enabled_platform_admin_auth',
+  // 平台管理员禁用的权限
+  DISABLED_PLATFORM_ADMIN_AUTH = 'disabled_platform_admin_auth',
   // 系统管理员启用的权限
   ENABLED_SYSADMIN_AUTH = 'enabled_sysadmin_auth',
   // 租户禁用的权限
--- a/src/hooks/business/useRole.ts 0 → 100644
View file @9848a31
+++ b/src/hooks/business/useRole.ts 0 → 100644
View file @9848a31
+import { computed, unref } from 'vue';
+import { useUserStore } from '/@/store/modules/user';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+export const useRole = () => {
+  const userStore = useUserStore();
+
+  const getRole = computed(() => {
+    return userStore.userInfo?.roles![0] as RoleEnum;
+  });
+
+  const isPlatformAdmin = computed(() => {
+    return unref(getRole) === RoleEnum.PLATFORM_ADMIN;
+  });
+
+  const isCustomerUser = computed(() => {
+    return unref(getRole) === RoleEnum.CUSTOMER_USER;
+  });
+
+  const isTenantAdmin = computed(() => {
+    return unref(getRole) === RoleEnum.TENANT_ADMIN;
+  });
+
+  const isSysadmin = computed(() => {
+    return unref(getRole) === RoleEnum.SYS_ADMIN;
+  });
+
+  return { getRole, isPlatformAdmin, isCustomerUser, isTenantAdmin, isSysadmin };
+};
--- a/src/views/system/role/RoleDrawer.vue
View file @9848a31
+++ b/src/views/system/role/RoleDrawer.vue
View file @9848a31
@@ -35,14 +35,15 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
-  import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { MenuRecord } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { RoleEnum } from '/@/enums/roleEnum';
   import { Spin } from 'ant-design-vue';
-  import { useUserStore } from '/@/store/modules/user';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
   type TreeData = MenuRecord & TreeItem;
@@ -76,56 +77,72 @@
         });
       };
-      const userStore = useUserStore();
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        allCheckedKeys.value = [];
-        resetFields();
-        roleId.value = '';
-        // 在打开弹窗时清除所有选择的菜单
-        treeRef.value && treeRef.value?.setCheckedKeys([]);
-        isUpdate.value = data.isUpdate;
-        let roleType = (userStore.getUserInfo.roles![0] as RoleEnum) || RoleEnum.SYS_ADMIN;
-        // 租户管理员创建角色时 菜单分配为客户菜单
-        if (roleType === RoleEnum.TENANT_ADMIN) {
-          roleType = RoleEnum.CUSTOMER_USER;
-        }
-        try {
-          spinning.value = true;
-          // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          allCheckedKeys.value = [];
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.CUSTOMER_USER;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
-          if (!unref(treeData).length) {
+            // if (!unref(treeData).length) {
             // 获取全部的菜单
-            const menuListModel = await getMenuList();
+            const menuListModel = await getMeMenuList();
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
-          }
+            // }
-          const keys = await getPermissionByRole(roleType);
-          const { keyType } = RoleMenuDictEnum[roleType];
-          treeData.value = filterPermissionTreeData(
-            unref(treeData) as unknown as TreeData[],
-            keys,
-            keyType
-          );
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
-          // 更新
-          if (unref(isUpdate)) {
-            checked.value = [];
-            roleId.value = data.record.id;
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
-            //通过角色id去获取角色对应的菜单的ids
-            allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
-            excludeHalfCheckedKeys(unref(treeData));
-            await nextTick();
-            treeRef.value.setCheckedKeys(roleMenus.value);
-            setFieldsValue(data.record);
-          } else {
+              //通过角色id去获取角色对应的菜单的ids
+              allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              treeRef.value.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
           }
-        } catch (error) {
-          throw error;
-        } finally {
-          spinning.value = false;
         }
-      });
+      );
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
--- a/src/views/system/role/role.data.ts
View file @9848a31
+++ b/src/views/system/role/role.data.ts
View file @9848a31
@@ -10,8 +10,8 @@ export enum KeysTypeEnum {
 export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
   [RoleEnum.PLATFORM_ADMIN]: {
-    key: DictEnum.ENABLED_PLATFORM_ADMIN_AUTH,
-    keyType: KeysTypeEnum.ENABLED,
+    key: DictEnum.DISABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
   },
   [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
   [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
--- a/src/views/tenant/role/RoleDrawer.vue
View file @9848a31
+++ b/src/views/tenant/role/RoleDrawer.vue
View file @9848a31
@@ -34,7 +34,7 @@
   import { BasicTree, TreeItem } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
-  import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { MenuRecord } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
@@ -43,7 +43,7 @@
   import { KeysTypeEnum, RoleMenuDictEnum } from '../../system/role/role.data';
   import { findDictItemByCode } from '/@/api/system/dict';
   import { Spin } from 'ant-design-vue';
-  import { useUserStore } from '/@/store/modules/user';
+  import { useRole } from '/@/hooks/business/useRole';
   type TreeData = MenuRecord & TreeItem;
@@ -77,7 +77,7 @@
         });
       };
-      const userStore = useUserStore();
+      const { isPlatformAdmin } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         allCheckedKeys.value = [];
         resetFields();
@@ -85,18 +85,16 @@
         // 在打开弹窗时清除所有选择的菜单
         treeRef.value && treeRef.value?.setCheckedKeys([]);
         isUpdate.value = data.isUpdate;
-        let roleType = (userStore.getUserInfo.roles![0] as RoleEnum) || RoleEnum.SYS_ADMIN;
-        // 平台管理员创建角色时 菜单分配为租户管理员可分配的菜单
-        if (roleType === RoleEnum.PLATFORM_ADMIN) {
-          roleType = RoleEnum.TENANT_ADMIN;
-        }
+        const roleType = RoleEnum.TENANT_ADMIN;
         try {
           spinning.value = true;
           // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
           if (!unref(treeData).length) {
             // 获取全部的菜单
-            const menuListModel = await getMenuList();
+            const menuListModel = unref(isPlatformAdmin)
+              ? await getAdminMenuList()
+              : await getMenuList();
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
           }
           const keys = await getPermissionByRole(roleType);