修复权限以及供应商入库

src/permission.ts

@@ -10,6 +10,8 @@ import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 
+let isFirst = false;
+
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*', '/materials/purchaseDoc/uploadCode'];
 
@@ -17,57 +19,64 @@ const isWhiteList = (path: string) => {
   return whiteList.some((pattern) => isPathMatch(pattern, path));
 };
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from) => {
   NProgress.start();
-  if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode' || to.path == '/codeDetail') {
-    next();
-  } else if (getToken()) {
-    to.meta.title && useSettingsStore().setTitle(to.meta.title);
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' });
-      NProgress.done();
-    } else if (isWhiteList(to.path)) {
-      next();
-    } else {
-      if (useUserStore().roles.length === 0 || $cache.local.getJSON('isCheckRole')) {
-        isRelogin.show = true;
-        // 判断当前用户是否已拉取完user_info信息
-        const [err] = await tos(useUserStore().getInfo());
-        if (err) {
-          await useUserStore().logout();
-          ElMessage.error(err);
-          next({ path: '/' });
-        } else {
-          isRelogin.show = false;
-          const accessRoutes = await usePermissionStore().generateRoutes();
-          // 根据roles权限生成可访问的路由表
-          accessRoutes.forEach((route) => {
-            if (!isHttp(route.path)) {
-              router.addRoute(route); // 动态添加可访问路由表
-              console.log('🚀 ~ route:', route);
-            }
-          });
-          $cache.local.remove('isCheckRole');
 
-          // @ts-expect-error hack方法 确保addRoutes已完成
-          next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
-        }
-      } else {
-        next();
-      }
-    }
-  } else {
-    // 没有token
-    if (isWhiteList(to.path)) {
-      // 在免登录白名单，直接进入
-      next();
-    } else {
-      const redirect = encodeURIComponent(to.fullPath || '/');
-      next(`/login?redirect=${redirect}`); // 否则全部重定向到登录页
-      NProgress.done();
-    }
+  // 特殊页面放行
+  if (['/indexEquipment', '/materials/purchaseDoc/uploadCode', '/codeDetail'].includes(to.path)) {
+    return true;
   }
+
+  // 已登录
+  if (getToken()) {
+    if (to.meta.title) useSettingsStore().setTitle(to.meta.title);
+
+    if (to.path === '/login') {
+      NProgress.done();
+      return { path: '/' };
+    }
+
+    if (isWhiteList(to.path)) {
+      return true;
+    }
+    if ((!isFirst && useUserStore().roles.length === 0) || $cache.local.getJSON('isCheckRole') === 'true') {
+      isFirst = true;
+      isRelogin.show = true;
+
+      const [err] = await tos(useUserStore().getInfo());
+
+      if (err) {
+        await useUserStore().logout();
+        ElMessage.error(err);
+        NProgress.done();
+        return { path: '/' };
+      }
+
+      isRelogin.show = false;
+      const accessRoutes = await usePermissionStore().generateRoutes();
+      accessRoutes.forEach((route) => {
+        if (!isHttp(route.path)) router.addRoute(route);
+      });
+
+      $cache.local.remove('isCheckRole');
+
+      // 确保路由已添加后再跳转
+      return { ...to, replace: true };
+    }
+
+    return true;
+  } else {
+    isFirst = false;
+  }
+
+  // 未登录
+  if (isWhiteList(to.path)) {
+    return true;
+  }
+
+  const redirect = encodeURIComponent(to.fullPath || '/');
+  NProgress.done();
+  return { path: `/login?redirect=${redirect}` };
 });
 
 router.afterEach(() => {