From 9927e6f217eb8468d1efd4a2e7c19f131c5613b2 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sun, 27 Feb 2022 11:17:45 +0800 Subject: [PATCH] fix: router --- src/router/utils.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/router/utils.ts b/src/router/utils.ts index fcd6ba854..6aadf85b4 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -11,6 +11,7 @@ import { loadEnv } from "../../build"; import Layout from "/@/layout/index.vue"; import { useTimeoutFn } from "@vueuse/core"; import { RouteConfigs } from "/@/layout/types"; +import { buildHierarchyTree } from "/@/utils/tree"; import { usePermissionStoreHook } from "/@/store/modules/permission"; // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}"); @@ -146,14 +147,15 @@ function initRouter(name: string) { */ function formatFlatteningRoutes(routesList: RouteRecordRaw[]) { if (routesList.length === 0) return routesList; - for (let i = 0; i < routesList.length; i++) { - if (routesList[i].children) { - routesList = routesList + let hierarchyList = buildHierarchyTree(routesList); + for (let i = 0; i < hierarchyList.length; i++) { + if (hierarchyList[i].children) { + hierarchyList = hierarchyList .slice(0, i + 1) - .concat(routesList[i].children, routesList.slice(i + 1)); + .concat(hierarchyList[i].children, hierarchyList.slice(i + 1)); } } - return routesList; + return hierarchyList; } /**