diff --git a/orion-ops-ui/src/components/system/menu/grant-table/index.vue b/orion-ops-ui/src/components/system/menu/grant-table/index.vue
index c03dd5c7..a22eb78a 100644
--- a/orion-ops-ui/src/components/system/menu/grant-table/index.vue
+++ b/orion-ops-ui/src/components/system/menu/grant-table/index.vue
@@ -10,8 +10,10 @@
-
-
+
+
+
|
@@ -38,6 +40,23 @@
|
+
+
+
+
+ |
+
+ {{ parentMenu.name }}
+
+ |
+
+
+ |
+
+
+ |
+
+
diff --git a/orion-ops-ui/src/hooks/permission.ts b/orion-ops-ui/src/hooks/permission.ts
index df5b1996..5308808d 100644
--- a/orion-ops-ui/src/hooks/permission.ts
+++ b/orion-ops-ui/src/hooks/permission.ts
@@ -1,6 +1,6 @@
import type { RouteLocationNormalized, RouteRecordNormalized, RouteRecordRaw } from 'vue-router';
import { useMenuStore, useUserStore } from '@/store';
-import { STATUS_ROUTER_LIST, WHITE_ROUTER_LIST } from '@/router/constants';
+import { DEFAULT_ROUTER, STATUS_ROUTER_LIST, WHITE_ROUTER_LIST } from '@/router/constants';
import { AdminRoleCode } from '@/types/const';
export default function usePermission() {
@@ -16,7 +16,7 @@ export default function usePermission() {
return false;
}
// 检查路由是否存在于授权路由中
- const menuConfig = [...menuStore.appMenus, ...WHITE_ROUTER_LIST, ...STATUS_ROUTER_LIST];
+ const menuConfig = [...menuStore.appMenus, ...WHITE_ROUTER_LIST, ...STATUS_ROUTER_LIST, DEFAULT_ROUTER];
let exist = false;
while (menuConfig.length && !exist) {
const element = menuConfig.shift();
@@ -44,7 +44,7 @@ export default function usePermission() {
hasAnyPermission(permission: string[]) {
return userStore.permission?.includes('*') ||
permission.map(s => userStore.permission?.includes(s))
- .filter(Boolean).length > 0;
+ .filter(Boolean).length > 0;
},
/**
@@ -61,7 +61,7 @@ export default function usePermission() {
hasAnyRole(role: string[]) {
return userStore.roles?.includes(AdminRoleCode) ||
role.map(s => userStore.roles?.includes(s))
- .filter(Boolean).length > 0;
+ .filter(Boolean).length > 0;
}
};
}
diff --git a/orion-ops-ui/src/router/constants.ts b/orion-ops-ui/src/router/constants.ts
index 4009ab45..0a471c7f 100644
--- a/orion-ops-ui/src/router/constants.ts
+++ b/orion-ops-ui/src/router/constants.ts
@@ -13,6 +13,11 @@ export const DEFAULT_ROUTE_NAME = 'workplace';
export const DEFAULT_ROUTE_FULL_PATH = '/workplace';
+/**
+ * 默认路由
+ */
+export const DEFAULT_ROUTER = { name: DEFAULT_ROUTE_NAME, children: [] };
+
/**
* 路由白名单
*/