mirror of
				https://github.com/pure-admin/vue-pure-admin.git
				synced 2025-11-03 13:44:47 +08:00 
			
		
		
		
	fix: use addRoute refresh page 404
This commit is contained in:
		
							parent
							
								
									3a69af233f
								
							
						
					
					
						commit
						6b36c93779
					
				@ -59,7 +59,9 @@ export interface ContextProps {
 | 
			
		||||
  dynamicText?: string;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
import { useRouter, useRoute } from "vue-router";
 | 
			
		||||
import { useRouter, useRoute, Router } from "vue-router";
 | 
			
		||||
 | 
			
		||||
import { initRouter } from "/@/router/index";
 | 
			
		||||
 | 
			
		||||
export default defineComponent({
 | 
			
		||||
  name: "Info",
 | 
			
		||||
@ -133,7 +135,9 @@ export default defineComponent({
 | 
			
		||||
        username: "admin",
 | 
			
		||||
        accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
 | 
			
		||||
      });
 | 
			
		||||
      initRouter("admin").then((router: Router) => {
 | 
			
		||||
        router.push("/");
 | 
			
		||||
      });
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    onBeforeMount(() => {
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,9 @@
 | 
			
		||||
import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
 | 
			
		||||
import {
 | 
			
		||||
  createRouter,
 | 
			
		||||
  createWebHashHistory,
 | 
			
		||||
  RouteRecordRaw,
 | 
			
		||||
  Router,
 | 
			
		||||
} from "vue-router";
 | 
			
		||||
 | 
			
		||||
import homeRouter from "./modules/home";
 | 
			
		||||
import flowChartRouter from "./modules/flowchart";
 | 
			
		||||
@ -13,6 +18,8 @@ import { storageSession } from "../utils/storage";
 | 
			
		||||
import { i18n } from "/@/plugins/i18n/index";
 | 
			
		||||
import { usePermissionStoreHook } from "/@/store/modules/permission";
 | 
			
		||||
 | 
			
		||||
import { getAsyncRoutes } from "/@/api/routes";
 | 
			
		||||
 | 
			
		||||
const constantRoutes: Array<RouteRecordRaw> = [
 | 
			
		||||
  homeRouter,
 | 
			
		||||
  flowChartRouter,
 | 
			
		||||
@ -34,6 +41,25 @@ export const ascending = (arr) => {
 | 
			
		||||
export const constantRoutesArr = ascending(constantRoutes).concat(
 | 
			
		||||
  ...remainingRouter
 | 
			
		||||
);
 | 
			
		||||
import Layout from "/@/layout/index.vue";
 | 
			
		||||
// https://cn.vitejs.dev/guide/features.html#glob-import
 | 
			
		||||
const modulesRoutes = import.meta.glob("/src/views/*/*/*.vue");
 | 
			
		||||
 | 
			
		||||
// 过滤后端传来的动态路由重新生成规范路由
 | 
			
		||||
export const addAsyncRoutes = (arrRoutes: Array<string>) => {
 | 
			
		||||
  if (!arrRoutes || !arrRoutes.length) return;
 | 
			
		||||
  arrRoutes.forEach((v: any) => {
 | 
			
		||||
    if (v.redirect) {
 | 
			
		||||
      v.component = Layout;
 | 
			
		||||
    } else {
 | 
			
		||||
      v.component = modulesRoutes[`/src/views${v.path}/index.vue`];
 | 
			
		||||
    }
 | 
			
		||||
    if (v.children) {
 | 
			
		||||
      addAsyncRoutes(v.children);
 | 
			
		||||
    }
 | 
			
		||||
  });
 | 
			
		||||
  return arrRoutes;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const router = createRouter({
 | 
			
		||||
  history: createWebHashHistory(),
 | 
			
		||||
@ -53,15 +79,50 @@ const router = createRouter({
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
export const initRouter = (name) => {
 | 
			
		||||
  return new Promise((resolve, reject) => {
 | 
			
		||||
    getAsyncRoutes({ name }).then(({ info }) => {
 | 
			
		||||
      if (info.length === 0) {
 | 
			
		||||
        usePermissionStoreHook().changeSetting(info);
 | 
			
		||||
      } else {
 | 
			
		||||
        addAsyncRoutes([info]).map((v: any) => {
 | 
			
		||||
          // 防止重复添加路由
 | 
			
		||||
          if (
 | 
			
		||||
            router.options.routes.findIndex(
 | 
			
		||||
              (value) => value.path === v.path
 | 
			
		||||
            ) !== -1
 | 
			
		||||
          ) {
 | 
			
		||||
            return;
 | 
			
		||||
          } else {
 | 
			
		||||
            // 切记将路由push到routes后还需要使用addRoute,这样路由才能正常跳转
 | 
			
		||||
            router.options.routes.push(v);
 | 
			
		||||
            // 最终路由进行升序
 | 
			
		||||
            ascending(router.options.routes);
 | 
			
		||||
            router.addRoute(v.name, v);
 | 
			
		||||
            usePermissionStoreHook().changeSetting(info);
 | 
			
		||||
            resolve(router);
 | 
			
		||||
          }
 | 
			
		||||
        });
 | 
			
		||||
      }
 | 
			
		||||
      router.addRoute({
 | 
			
		||||
        path: "/:pathMatch(.*)",
 | 
			
		||||
        redirect: "/error/404",
 | 
			
		||||
      });
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
import NProgress from "../utils/progress";
 | 
			
		||||
 | 
			
		||||
const whiteList = ["/login", "/register"];
 | 
			
		||||
 | 
			
		||||
router.beforeEach((to, _from, next) => {
 | 
			
		||||
  // _from?.name;
 | 
			
		||||
  let name = storageSession.getItem("info");
 | 
			
		||||
  if (name) {
 | 
			
		||||
    usePermissionStoreHook().changeSetting();
 | 
			
		||||
  // 刷新
 | 
			
		||||
  if (name && !_from?.name) {
 | 
			
		||||
    initRouter(name.username).then((router: Router) => {
 | 
			
		||||
      router.push(to.path);
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
  NProgress.start();
 | 
			
		||||
  const { t } = i18n.global;
 | 
			
		||||
 | 
			
		||||
@ -3,35 +3,10 @@ import { store } from "/@/store";
 | 
			
		||||
 | 
			
		||||
import { constantRoutesArr, ascending } from "/@/router/index";
 | 
			
		||||
 | 
			
		||||
import { getAsyncRoutes } from "/@/api/routes";
 | 
			
		||||
import Layout from "/@/layout/index.vue";
 | 
			
		||||
import router from "/@/router/index";
 | 
			
		||||
import { storageSession } from "/@/utils/storage";
 | 
			
		||||
 | 
			
		||||
// https://cn.vitejs.dev/guide/features.html#glob-import
 | 
			
		||||
const modulesRoutes = import.meta.glob("/src/views/*/*/*.vue");
 | 
			
		||||
 | 
			
		||||
// 过滤后端传来的动态路由重新生成规范路由
 | 
			
		||||
const addAsyncRoutes = (arrRoutes: Array<string>) => {
 | 
			
		||||
  if (!arrRoutes || !arrRoutes.length) return;
 | 
			
		||||
  arrRoutes.forEach((v: any) => {
 | 
			
		||||
    if (v.redirect) {
 | 
			
		||||
      v.component = Layout;
 | 
			
		||||
    } else {
 | 
			
		||||
      v.component = modulesRoutes[`/src/views${v.path}/index.vue`];
 | 
			
		||||
    }
 | 
			
		||||
    if (v.children) {
 | 
			
		||||
      addAsyncRoutes(v.children);
 | 
			
		||||
    }
 | 
			
		||||
  });
 | 
			
		||||
  return arrRoutes;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const usePermissionStore = defineStore({
 | 
			
		||||
  id: "pure-permission",
 | 
			
		||||
  state: () => ({
 | 
			
		||||
    constantRoutes: constantRoutesArr, //静态路由
 | 
			
		||||
    asyncRoutes: [], //动态路由
 | 
			
		||||
    wholeRoutes: [],
 | 
			
		||||
  }),
 | 
			
		||||
  actions: {
 | 
			
		||||
@ -39,35 +14,9 @@ export const usePermissionStore = defineStore({
 | 
			
		||||
      this.wholeRoutes = ascending(this.constantRoutes.concat(routes)).filter(
 | 
			
		||||
        (v) => v.meta.showLink
 | 
			
		||||
      );
 | 
			
		||||
      this.asyncRoutes.push(routes);
 | 
			
		||||
    },
 | 
			
		||||
    async changeSetting() {
 | 
			
		||||
      let name = storageSession.getItem("info")?.username;
 | 
			
		||||
      await getAsyncRoutes({ name }).then(({ info }) => {
 | 
			
		||||
        if (info.length === 0) {
 | 
			
		||||
          this.wholeRoutes = router.options.routes.filter(
 | 
			
		||||
            (v) => v.meta.showLink
 | 
			
		||||
          );
 | 
			
		||||
          return;
 | 
			
		||||
        }
 | 
			
		||||
        addAsyncRoutes([info]).forEach((v: any) => {
 | 
			
		||||
          // 防止重复添加路由
 | 
			
		||||
          if (
 | 
			
		||||
            router.options.routes.findIndex(
 | 
			
		||||
              (value) => value.path === v.path
 | 
			
		||||
            ) !== -1
 | 
			
		||||
          ) {
 | 
			
		||||
            return;
 | 
			
		||||
          } else {
 | 
			
		||||
            // 切记将路由push到routes后还需要使用addRoute,这样路由才能正常跳转
 | 
			
		||||
            router.options.routes.push(v);
 | 
			
		||||
            // 最终路由进行升序
 | 
			
		||||
            ascending(router.options.routes);
 | 
			
		||||
            router.addRoute(v.name, v);
 | 
			
		||||
            this.asyncActionRoutes(v);
 | 
			
		||||
          }
 | 
			
		||||
        });
 | 
			
		||||
      });
 | 
			
		||||
    async changeSetting(routes) {
 | 
			
		||||
      await this.asyncActionRoutes(routes);
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user