Merge branch 'refs/heads/dev_huangjin' into dev

spring

6 天以前 ba01c8bd58bea9acbb98c2097765b939a81b21cd

 src/permission.js

@@ -1,63 +1,76 @@
import router from './router'

import { ElMessage } from 'element-plus'

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 useSettingsStore from '@/store/modules/settings'

import usePermissionStore from '@/store/modules/permission'

import router from "./router";

import { ElMessage } from "element-plus";

import NProgress from "nprogress";

import "nprogress/nprogress.css";

import { getToken } from "@/utils/auth";

import { isHttp, isPathMatch } from "@/utils/validate";

import { isRelogin } from "@/utils/request";

import useUserStore from "@/store/modules/user";

import useSettingsStore from "@/store/modules/settings";

import usePermissionStore from "@/store/modules/permission";



NProgress.configure({ showSpinner: false });



const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];

const whiteList = ["/login", "/register", "/device-info"];



const isWhiteList = (path) => {

  return whiteList.some((pattern) => isPathMatch(pattern, path));

};



router.beforeEach((to, from, next) => {

  NProgress.start()

  NProgress.start();

  if (getToken()) {

    to.meta.title && useSettingsStore().setTitle(to.meta.title)

    to.meta.title && useSettingsStore().setTitle(to.meta.title);

    /* has token*/

    if (to.path === '/login') {

      next({ path: '/' })

      NProgress.done()

    if (to.path === "/login") {

      next({ path: "/" });

      NProgress.done();

    } else if (isWhiteList(to.path)) {

      next();

    } else {

      if (useUserStore().roles.length === 0) {

        isRelogin.show = true

        isRelogin.show = true;

        // 判断当前用户是否已拉取完user_info信息

        useUserStore().getInfo().then(() => {

          isRelogin.show = false

          usePermissionStore().generateRoutes().then(accessRoutes => {

            // 根据roles权限生成可访问的路由表

            accessRoutes.forEach(route => {

              if (!isHttp(route.path)) {

                router.addRoute(route) // 动态添加可访问路由表

              }

            })

            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

        useUserStore()

          .getInfo()

          .then(() => {

            isRelogin.show = false;

            usePermissionStore()

              .generateRoutes()

              .then((accessRoutes) => {

                // 根据roles权限生成可访问的路由表

                accessRoutes.forEach((route) => {

                  if (!isHttp(route.path)) {

                    router.addRoute(route); // 动态添加可访问路由表

                  }

                });

                next({ ...to, replace: true }); // hack方法 确保addRoutes已完成

              });

          })

        }).catch(err => {

          useUserStore().logOut().then(() => {

            ElMessage.error(err)

            next({ path: '/' })

          })

        })

          .catch((err) => {

            useUserStore()

              .logOut()

              .then(() => {

                ElMessage.error(err);

                next({ path: "/" });

              });

          });

      } else {

        next()

        next();

      }

    }

  } else {

    // 没有token

    if (whiteList.indexOf(to.path) !== -1) {

    if (isWhiteList(to.path)) {

      // 在免登录白名单，直接进入

      next()

      next();

    } else {

      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页

      NProgress.done()

      next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页

      NProgress.done();

    }

  }

})

});



router.afterEach(() => {

  NProgress.done()

})

  NProgress.done();

});