refactor: Separate store

apps/web-antd/src/router/guard.ts

@@ -2,13 +2,14 @@ import type { Router } from 'vue-router';
 
 import { LOGIN_PATH } from '@vben/constants';
 import { preferences } from '@vben/preferences';
+import { useAccessStore, useUserStore } from '@vben/stores';
 import { startProgress, stopProgress } from '@vben/utils';
 
 import { useTitle } from '@vueuse/core';
 
 import { $t } from '#/locales';
 import { coreRouteNames, dynamicRoutes } from '#/router/routes';
-import { useAccessStore } from '#/store';
+import { useAuthStore } from '#/store';
 
 import { generateAccess } from './access';
 
@@ -58,10 +59,11 @@ function setupCommonGuard(router: Router) {
 function setupAccessGuard(router: Router) {
   router.beforeEach(async (to, from) => {
     const accessStore = useAccessStore();
-    const accessToken = accessStore.accessToken;
+    const userStore = useUserStore();
+    const authStore = useAuthStore();
 
     // accessToken 检查
-    if (!accessToken) {
+    if (!accessStore.accessToken) {
       if (
         // 基本路由，这些路由不需要进入权限拦截
         coreRouteNames.includes(to.name as string) ||
@@ -93,8 +95,7 @@ function setupAccessGuard(router: Router) {
 
     // 生成路由表
     // 当前登录用户拥有的角色标识列表
-    const userInfo =
-      accessStore.userInfo || (await accessStore.fetchUserInfo());
+    const userInfo = userStore.userInfo || (await authStore.fetchUserInfo());
     const userRoles = userInfo.roles ?? [];
 
     // 生成菜单和路由

apps/web-antd/src/router/index.ts

@@ -1,12 +1,10 @@
-import type { RouteRecordName, RouteRecordRaw } from 'vue-router';
-
 import {
   createRouter,
   createWebHashHistory,
   createWebHistory,
 } from 'vue-router';
 
-import { traverseTreeValues } from '@vben/utils';
+import { resetStaticRoutes } from '@vben/utils';
 
 import { createRouterGuard } from './guard';
 import { routes } from './routes';
@@ -26,33 +24,8 @@ const router = createRouter({
   // strict: true,
 });
 
-/**
- * @zh_CN 重置所有路由，如有指定白名单除外
- */
-function resetRoutes() {
-  // 获取静态路由所有节点包含子节点的 name，并排除不存在 name 字段的路由
-  const staticRouteNames = traverseTreeValues<
-    RouteRecordRaw,
-    RouteRecordName | undefined
-  >(routes, (route) => {
-    // 这些路由需要指定 name，防止在路由重置时，不能删除没有指定 name 的路由
-    if (import.meta.env.DEV && !route.name) {
-      console.warn(
-        `The route with the path ${route.path} needs to have the field name specified.`,
-      );
-    }
-    return route.name;
-  });
+const resetRoutes = () => resetStaticRoutes(router, routes);
 
-  const { getRoutes, hasRoute, removeRoute } = router;
-  const allRoutes = getRoutes();
-  allRoutes.forEach(({ name }) => {
-    // 存在于路由表且非白名单才需要删除
-    if (name && !staticRouteNames.includes(name) && hasRoute(name)) {
-      removeRoute(name);
-    }
-  });
-}
 // 创建路由守卫
 createRouterGuard(router);