Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/pro-layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epeejs/pro-layout",
"version": "1.0.0",
"version": "1.0.1",
"description": "用于快速搭建中后台页面结构",
"main": "es/index.js",
"module": "es/index.js",
Expand Down
17 changes: 11 additions & 6 deletions packages/pro-layout/src/layouts/BasicLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function BasicLayout<AuthorityType = any>({
},
{ siderRender: true, headerRender: true, footerRender: true },
);
const displayRoutes = useMemo(() => {
const menuRoutes = useMemo(() => {
const filterNode = (nodes: RouteConfig[]): RouteConfig[] => {
return nodes
.map((m) => ({ ...m }))
Expand Down Expand Up @@ -129,16 +129,21 @@ function BasicLayout<AuthorityType = any>({
});
};
const newRoutes = wrapNode(routes);
const firstLeafNode = getFirstLeafNode(displayRoutes);
const redirectNode = newRoutes.find((m) => m.path === '/' && m.redirect);

if (firstLeafNode && redirectNode && redirectNode.redirect !== firstLeafNode.path) {
redirectNode.redirect = firstLeafNode.path;
if (redirectNode) {
const targetRoute = getRouteConfigByPath(menuRoutes, redirectNode.redirect!);
const firstLeafNode = getFirstLeafNode(menuRoutes);

// 如果重定向页面无权限访问且第一个叶节点存在,则修改为跳转到第一个叶节点
if (!targetRoute && firstLeafNode) {
redirectNode.redirect = firstLeafNode.path;
}
}

return newRoutes;
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [authInfo, displayRoutes, routes]);
}, [authInfo, menuRoutes, routes]);
const getSider = () => {
const menu = pathname !== '/' && (
<Menu
Expand All @@ -156,7 +161,7 @@ function BasicLayout<AuthorityType = any>({
}
}}
>
{renderMenu(displayRoutes)}
{renderMenu(menuRoutes)}
</Menu>
);
return siderRender ? siderRender(menu) : <Sider>{menu}</Sider>;
Expand Down
1 change: 1 addition & 0 deletions packages/pro-layout/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export function getRouteConfigByPath(routes: RouteConfig[], path: string): Route
export function getFirstLeafNode(routes: RouteConfig[]): RouteConfig | undefined {
const firstNode = routes[0];

// 不存在节点时,则返回 undefined
if (!firstNode) {
return firstNode;
}
Expand Down