Merge branch 'dev-v5' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev-v5【788061ad】

This commit is contained in:
YunaiV
2025-03-25 22:51:51 +08:00
parent 4556a3e03b
commit 1d1e70ee66
3 changed files with 64 additions and 50 deletions

View File

@@ -6,7 +6,7 @@ import { useAccessStore, useUserStore } from '@vben/stores';
import { startProgress, stopProgress } from '@vben/utils';
import { accessRoutes, coreRouteNames } from '#/router/routes';
import { useAuthStore } from '#/store';
import { useAuthStore, useDictStore } from '#/store';
import { generateAccess } from './access';
import { message } from 'ant-design-vue';
@@ -51,6 +51,7 @@ function setupAccessGuard(router: Router) {
const accessStore = useAccessStore();
const userStore = useUserStore();
const authStore = useAuthStore();
const dictStore = useDictStore();
// 基本路由,这些路由不需要进入权限拦截
if (coreRouteNames.includes(to.name as string)) {
@@ -92,6 +93,9 @@ function setupAccessGuard(router: Router) {
return true;
}
// 加载字典数据(不阻塞加载)
dictStore.setDictMap();
// 生成路由表
// 当前登录用户拥有的角色标识列表
let userInfo = userStore.userInfo;