提交 72ac240f 作者: 无木

feat: routers support `ignoreRoute` option

为路由配置添加`meta`.`ignoreRoute`配置,允许在`ROUTE_MAPPING`及`BACK`模式下配置纯菜单数据

fixed:
上级 b5046f07
...@@ -9,6 +9,10 @@ export function getAllParentPath<T = Recordable>(treeData: T[], path: string) { ...@@ -9,6 +9,10 @@ export function getAllParentPath<T = Recordable>(treeData: T[], path: string) {
return (menuList || []).map((item) => item.path); return (menuList || []).map((item) => item.path);
} }
function isPlainPath(path: string) {
return path.indexOf(':') === -1;
}
function joinParentPath(menus: Menu[], parentPath = '') { function joinParentPath(menus: Menu[], parentPath = '') {
for (let index = 0; index < menus.length; index++) { for (let index = 0; index < menus.length; index++) {
const menu = menus[index]; const menu = menus[index];
...@@ -20,7 +24,7 @@ function joinParentPath(menus: Menu[], parentPath = '') { ...@@ -20,7 +24,7 @@ function joinParentPath(menus: Menu[], parentPath = '') {
menu.path = `${parentPath}/${menu.path}`; menu.path = `${parentPath}/${menu.path}`;
} }
if (menu?.children?.length) { if (menu?.children?.length) {
joinParentPath(menu.children, menu.path); joinParentPath(menu.children, isPlainPath(menu.path) ? menu.path : parentPath);
} }
} }
} }
......
...@@ -241,6 +241,28 @@ const feat: AppRouteModule = { ...@@ -241,6 +241,28 @@ const feat: AppRouteModule = {
title: t('routes.demo.feat.tab'), title: t('routes.demo.feat.tab'),
carryParam: true, carryParam: true,
}, },
children: [
{
path: 'testTab/id1',
name: 'TestTab1',
component: () => import('/@/views/demo/feat/tab-params/index.vue'),
meta: {
title: t('routes.demo.feat.tab1'),
carryParam: true,
ignoreRoute: true,
},
},
{
path: 'testTab/id2',
name: 'TestTab2',
component: () => import('/@/views/demo/feat/tab-params/index.vue'),
meta: {
title: t('routes.demo.feat.tab2'),
carryParam: true,
ignoreRoute: true,
},
},
],
}, },
], ],
}; };
......
...@@ -111,6 +111,12 @@ export const usePermissionStore = defineStore({ ...@@ -111,6 +111,12 @@ export const usePermissionStore = defineStore({
return roleList.some((role) => roles.includes(role)); return roleList.some((role) => roles.includes(role));
}; };
const routeRmoveIgnoreFilter = (route: AppRouteRecordRaw) => {
const { meta } = route;
const { ignoreRoute } = meta || {};
return !ignoreRoute;
};
switch (permissionMode) { switch (permissionMode) {
case PermissionModeEnum.ROLE: case PermissionModeEnum.ROLE:
routes = filter(asyncRoutes, routeFilter); routes = filter(asyncRoutes, routeFilter);
...@@ -123,6 +129,8 @@ export const usePermissionStore = defineStore({ ...@@ -123,6 +129,8 @@ export const usePermissionStore = defineStore({
routes = filter(asyncRoutes, routeFilter); routes = filter(asyncRoutes, routeFilter);
routes = routes.filter(routeFilter); routes = routes.filter(routeFilter);
const menuList = transformRouteToMenu(routes, true); const menuList = transformRouteToMenu(routes, true);
routes = filter(routes, routeRmoveIgnoreFilter);
routes = routes.filter(routeRmoveIgnoreFilter);
menuList.sort((a, b) => { menuList.sort((a, b) => {
return (a.meta?.orderNo || 0) - (b.meta?.orderNo || 0); return (a.meta?.orderNo || 0) - (b.meta?.orderNo || 0);
}); });
...@@ -158,6 +166,10 @@ export const usePermissionStore = defineStore({ ...@@ -158,6 +166,10 @@ export const usePermissionStore = defineStore({
const backMenuList = transformRouteToMenu(routeList); const backMenuList = transformRouteToMenu(routeList);
this.setBackMenuList(backMenuList); this.setBackMenuList(backMenuList);
// remove meta.ignoreRoute item
routeList = filter(routeList, routeRmoveIgnoreFilter);
routeList = routeList.filter(routeRmoveIgnoreFilter);
routeList = flatMultiLevelRoutes(routeList); routeList = flatMultiLevelRoutes(routeList);
routes = [PAGE_NOT_FOUND_ROUTE, ...routeList]; routes = [PAGE_NOT_FOUND_ROUTE, ...routeList];
break; break;
......
...@@ -33,5 +33,6 @@ declare module 'vue-router' { ...@@ -33,5 +33,6 @@ declare module 'vue-router' {
// Never show in menu // Never show in menu
hideMenu?: boolean; hideMenu?: boolean;
isLink?: boolean; isLink?: boolean;
ignoreRoute?: boolean;
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论