Merge branch 'dev-fix-ww' into 'main_dev'

perf: 优化角色管理可分配菜单

See merge request yunteng/thingskit-front!552

@@ -42,7 +42,7 @@ export interface MenuRecord {
   component: string;
   meta: Meta;
   disabled?: boolean;
-  isDictCompareDisabled?: boolean;
+  show?: boolean;
   icon?: string;
   title?: string;
   key?: string;

@@ -7,4 +7,12 @@ export enum DictEnum {
   DATA_VALIDATE = 'data_validate',
   // 设备类型
   DEVICE_TYPE = 'device_type',
+  // 平台管理员启用的权限
+  ENABLED_PLATFORM_ADMIN_AUTH = 'enabled_platform_admin_auth',
+  // 系统管理员启用的权限
+  ENABLED_SYSADMIN_AUTH = 'enabled_sysadmin_auth',
+  // 租户禁用的权限
+  DISABLED_TENANT_AUTH = 'disabled_tenant_auth',
+  // 客户禁用的权限
+  DISABLE_CUSTOMER_AUTH = 'disabled_customer_auth',
 }

@@ -17,7 +17,7 @@ function joinParentPath(menus: Menu[], parentPath = '') {
     // https://next.router.vuejs.org/guide/essentials/nested-routes.html
     // Note that nested paths that start with / will be treated as a root path.
     // This allows you to leverage the component nesting without having to use a nested URL.
-    if (!(menu.path.startsWith('/') || isUrl(menu.path))) {
+    if (!(menu?.path?.startsWith('/') || isUrl(menu.path))) {
       // path doesn't start with /, nor is it a url, join parent path
       menu.path = `${parentPath}/${menu.path}`;
     }

@@ -204,7 +204,7 @@ export const useUserStore = defineStore({
       const roleList = roles.map((item) => item) as RoleEnum[];
       this.setRoleList(roleList);
       try {
-        if (roleList[0] !== 'SYS_ADMIN') {
+        if (roleList[0] !== RoleEnum.SYS_ADMIN && roleList[0] !== RoleEnum.PLATFORM_ADMIN) {
           const res = await getEntitiesId();
           const entityId = res.data[0]?.entityId;
           window.localStorage.setItem('entityId', JSON.stringify(entityId));

@@ -91,7 +91,6 @@
       });
       const getRoleList = async () => {
         const res = await filterRoleList();
-        console.log(res);
         roleOptions.value = res.map((m) => {
           return {
             label: m.name,

@@ -84,8 +84,11 @@
         // 在打开弹窗时清除所有选择的菜单
         treeRef.value && treeRef.value?.setCheckedKeys([]);
         isUpdate.value = data.isUpdate;
-        const roleType = data?.record?.roleType || userStore.getRoleList.at(0);
-
+        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警告
@@ -98,7 +101,7 @@
 
           const keys = await getPermissionByRole(roleType);
           const { keyType } = RoleMenuDictEnum[roleType];
-          treeData.value = getPermissionTreeData(
+          treeData.value = filterPermissionTreeData(
             unref(treeData) as unknown as TreeData[],
             keys,
             keyType
@@ -164,61 +167,46 @@
         return [];
       };
 
-      const getPermissionTreeData = (
+      const filterPermissionTreeData = (
         data: MenuRecord[],
         permissionKeys: string[],
         keysType: KeysTypeEnum
-      ) => {
-        const setDisabled = (data: MenuRecord[], flag: boolean) => {
-          return data.map((item) => {
-            item.name = t(item.name);
-            if (item.children && item.children.length) {
-              item.children = setDisabled(item.children, flag);
-            }
-            return {
-              ...item,
-              disabled: flag,
-              icon: item.meta.icon,
-            } as TreeData;
-          });
-        };
-
+      ): TreeData[] => {
         const permissionCompare = (
           data: MenuRecord[],
           permissionKeys: string[],
           keysType: KeysTypeEnum
-        ) => {
-          return data.map((item) => {
+        ): TreeData[] => {
+          return data.filter((item) => {
             item.name = t(item.name);
             const findFlag = permissionKeys.includes(item.permission);
-            if (findFlag) item.isDictCompareDisabled = true;
-            const disabledFlag = keysType === KeysTypeEnum.DISABLED ? findFlag : !findFlag;
-            item.disabled = disabledFlag;
 
-            if (item.isDictCompareDisabled && item.children && item.children.length) {
-              setDisabled(item.children, disabledFlag);
-            } else {
-              if (item.children && item.children.length) {
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
                 item.children = permissionCompare(item.children, permissionKeys, keysType);
-                item.disabled = item.children.every((temp) => temp.disabled);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
               }
             }
-            return {
-              ...item,
-              icon: item.meta.icon,
-            } as TreeData;
-          });
-        };
 
-        const result = permissionCompare(data, permissionKeys, keysType).map((item) => {
-          if (item.children && item.children.length) {
-            const rootDisabledFlag = item.children.every((temp) => temp.disabled);
-            item.disabled = rootDisabledFlag;
-          }
-          return item;
-        });
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
 
-        return result;
+        return permissionCompare(data, permissionKeys, keysType);
       };
 
       const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import { DictEnum } from '/@/enums/dictEnum';
 import { RoleEnum } from '/@/enums/roleEnum';
 
 export enum KeysTypeEnum {
@@ -8,10 +9,13 @@ export enum KeysTypeEnum {
 }
 
 export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
-  [RoleEnum.PLATFORM_ADMIN]: { key: 'enabled_platform_admin_auth', keyType: KeysTypeEnum.ENABLED },
-  [RoleEnum.SYS_ADMIN]: { key: 'enabled_sysadmin_auth', keyType: KeysTypeEnum.ENABLED },
-  [RoleEnum.TENANT_ADMIN]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED },
-  [RoleEnum.CUSTOMER_USER]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.PLATFORM_ADMIN]: {
+    key: DictEnum.ENABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.ENABLED,
+  },
+  [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
 };
 
 export const columns: BasicColumn[] = [

@@ -43,6 +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';
 
   type TreeData = MenuRecord & TreeItem;
 
@@ -76,6 +77,7 @@
         });
       };
 
+      const userStore = useUserStore();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         allCheckedKeys.value = [];
         resetFields();
@@ -83,7 +85,11 @@
         // 在打开弹窗时清除所有选择的菜单
         treeRef.value && treeRef.value?.setCheckedKeys([]);
         isUpdate.value = data.isUpdate;
-        const roleType = data?.record?.roleType || RoleEnum.TENANT_ADMIN;
+        let roleType = (userStore.getUserInfo.roles![0] as RoleEnum) || RoleEnum.SYS_ADMIN;
+        // 平台管理员创建角色时 菜单分配为租户管理员可分配的菜单
+        if (roleType === RoleEnum.PLATFORM_ADMIN) {
+          roleType = RoleEnum.TENANT_ADMIN;
+        }
         try {
           spinning.value = true;
           // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
@@ -93,10 +99,9 @@
             const menuListModel = await getMenuList();
             treeData.value = transformName(menuListModel as unknown as TreeData[]);
           }
-
           const keys = await getPermissionByRole(roleType);
           const { keyType } = RoleMenuDictEnum[roleType];
-          treeData.value = getPermissionTreeData(
+          treeData.value = filterPermissionTreeData(
             unref(treeData) as unknown as TreeData[],
             keys,
             keyType
@@ -168,61 +173,46 @@
         return [];
       };
 
-      const getPermissionTreeData = (
+      const filterPermissionTreeData = (
         data: MenuRecord[],
         permissionKeys: string[],
         keysType: KeysTypeEnum
-      ) => {
-        const setDisabled = (data: MenuRecord[], flag: boolean) => {
-          return data.map((item) => {
-            item.name = t(item.name);
-            if (item.children && item.children.length) {
-              item.children = setDisabled(item.children, flag);
-            }
-            return {
-              ...item,
-              disabled: flag,
-              icon: item.meta.icon,
-            } as TreeData;
-          });
-        };
-
+      ): TreeData[] => {
         const permissionCompare = (
           data: MenuRecord[],
           permissionKeys: string[],
           keysType: KeysTypeEnum
-        ) => {
-          return data.map((item) => {
+        ): TreeData[] => {
+          return data.filter((item) => {
             item.name = t(item.name);
             const findFlag = permissionKeys.includes(item.permission);
-            if (findFlag) item.isDictCompareDisabled = true;
-            const disabledFlag = keysType === KeysTypeEnum.DISABLED ? findFlag : !findFlag;
-            item.disabled = disabledFlag;
 
-            if (item.isDictCompareDisabled && item.children && item.children.length) {
-              setDisabled(item.children, disabledFlag);
-            } else {
-              if (item.children && item.children.length) {
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
                 item.children = permissionCompare(item.children, permissionKeys, keysType);
-                item.disabled = item.children.every((temp) => temp.disabled);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
               }
             }
-            return {
-              ...item,
-              icon: item.meta.icon,
-            } as TreeData;
-          });
-        };
 
-        const result = permissionCompare(data, permissionKeys, keysType).map((item) => {
-          if (item.children && item.children.length) {
-            const rootDisabledFlag = item.children.every((temp) => temp.disabled);
-            item.disabled = rootDisabledFlag;
-          }
-          return item;
-        });
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
 
-        return result;
+        return permissionCompare(data, permissionKeys, keysType);
       };
 
       const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {