Merge remote-tracking branch 'origin/master'

src/main.ts

@@ -10,6 +10,8 @@ import "./styles/tailwind.css";
 // svg icon
 import "virtual:svg-icons-register";
 import 'vant/lib/index.css';
+// permission control
+import './permission';
 // 注册插件
 import plugins from './plugins/index'; // plugins
 

src/permission.ts

@@ -0,0 +1,74 @@
+import { to as tos } from 'await-to-js';
+import router from './router';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import { getToken } from '@/utils/auth';
+import { isHttp } from '@/utils/validate';
+import { isRelogin } from '@/utils/request';
+import useUserStore from '@/store/modules/user';
+import setPageTitle from "@/utils/set-page-title";
+import usePermissionStore from '@/store/modules/permission';
+
+NProgress.configure({ showSpinner: false });
+const whiteList = ['/login'];
+
+router.beforeEach(async (to, from, next) => {
+  NProgress.start();
+  if (getToken()) {
+    to.meta.title && setPageTitle(to.meta.title);
+    /* has token*/
+    if (to.path === '/login') {
+      next({ path: '/' });
+      NProgress.done();
+    } else if (whiteList.indexOf(to.path as string) !== -1) {
+      next();
+    } else {
+      if (useUserStore().roles.length === 0) {
+        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 role = localStorage.getItem('role');
+          const roles = useUserStore().roles;
+          if(to.path === '/' || (!!role && roles.includes(role))) {
+            next();
+          } else if (!!role) {
+            useUserStore().setRoles(role);
+            next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
+          } else {
+            next({ path: '/' });
+          }
+          // const accessRoutes = await usePermissionStore().generateRoutes();
+          // // 根据roles权限生成可访问的路由表
+          // accessRoutes.forEach((route) => {
+          //   if (!isHttp(route.path)) {
+          //     router.addRoute(route); // 动态添加可访问路由表
+          //   }
+          // });
+          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 (whiteList.indexOf(to.path as string) !== -1) {
+      // 在免登录白名单，直接进入
+      next();
+    } else {
+      const redirect = encodeURIComponent(to.fullPath || '/');
+      next(`/login?redirect=${redirect}`); // 否则全部重定向到登录页
+      NProgress.done();
+    }
+  }
+});
+
+router.afterEach(() => {
+  NProgress.done();
+});

src/router/index.ts

@@ -22,27 +22,27 @@ export interface toRouteType extends RouteLocationNormalized {
 }
 // const whiteList = ['/roleSelect'];
 
-router.beforeEach((to: toRouteType, from, next) => {
-  NProgress.start();
-  // 路由缓存
-  useCachedViewStoreHook().addCachedView(to);
-  // 页面 title
-  setPageTitle(to.meta.title);
-  const role = localStorage.getItem('role');
-  const roles = useUserStore().roles;
-  if(to.path === '/' || (!!role && roles.includes(role))) {
-    next();
-  } else if (!!role) {
-    useUserStore().setRoles(role);
-    next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
-  } else {
-    next({ path: '/' });
-  }
-});
-
-router.afterEach(() => {
-  NProgress.done();
-});
+// router.beforeEach((to: toRouteType, from, next) => {
+//   NProgress.start();
+//   // 路由缓存
+//   useCachedViewStoreHook().addCachedView(to);
+//   // 页面 title
+//   setPageTitle(to.meta.title);
+//   const role = localStorage.getItem('role');
+//   const roles = useUserStore().roles;
+//   if(to.path === '/' || (!!role && roles.includes(role))) {
+//     next();
+//   } else if (!!role) {
+//     useUserStore().setRoles(role);
+//     next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
+//   } else {
+//     next({ path: '/' });
+//   }
+// });
+//
+// router.afterEach(() => {
+//   NProgress.done();
+// });
 
 
 export default router;