perf: the routeModule can ignore the layou configuration without writing

This commit is contained in:
vben
2020-11-01 11:55:18 +08:00
parent b36d9486a5
commit 4c658f4868
5 changed files with 26 additions and 10 deletions

View File

@@ -87,8 +87,13 @@ export async function getFlatChildrenMenus(children: Menu[]) {
function basicFilter(routes: RouteRecordNormalized[]) {
return (menu: Menu) => {
const matchRoute = routes.find((route) => {
if (route.meta && route.meta.carryParam) {
return pathToRegexp(route.path).test(menu.path);
if (route.meta) {
if (route.meta.carryParam) {
return pathToRegexp(route.path).test(menu.path);
}
if (route.meta.ignoreAuth) {
return false;
}
}
return route.path === menu.path;
});

View File

@@ -67,6 +67,6 @@ export interface MenuModule {
}
export interface AppRouteModule {
layout: AppRouteRecordRaw;
layout?: AppRouteRecordRaw;
routes: AppRouteRecordRaw[];
}

View File

@@ -49,8 +49,12 @@ export function transformRouteToMenu(routeModList: AppRouteModule[]) {
const routeList: AppRouteRecordRaw[] = [];
cloneRouteModList.forEach((item) => {
const { layout, routes } = item;
layout.children = routes;
routeList.push(layout);
if (layout) {
layout.children = routes;
routeList.push(layout);
} else {
routeList.push(...routes);
}
});
return treeMap(routeList, {
conversion: (node: AppRouteRecordRaw) => {

View File

@@ -23,18 +23,24 @@ export function genRouteModule(moduleList: AppRouteModule[]) {
for (const routeMod of moduleList) {
const routes = routeMod.routes as any;
const layout = routeMod.layout;
let router = createRouter({ routes, history: createWebHashHistory() });
const router = createRouter({ routes, history: createWebHashHistory() });
const flatList = toRaw(router.getRoutes()).filter((item) => item.children.length === 0);
const flatList = (toRaw(router.getRoutes()).filter(
(item) => item.children.length === 0
) as unknown) as AppRouteRecordRaw[];
try {
(router as any) = null;
} catch (error) {}
flatList.forEach((item) => {
item.path = `${layout.path}${item.path}`;
item.path = `${layout ? layout.path : ''}${item.path}`;
});
layout.children = (flatList as unknown) as AppRouteRecordRaw[];
ret.push(layout);
if (layout) {
layout.children = flatList;
ret.push(layout);
} else {
ret.push(...flatList);
}
}
return ret as RouteRecordRaw[];
}