fix(plugin-layout): 修复 children 和 layout 混用导致的权限失效问题 #9587
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 1 Ignored Deployment
|
chenshuai2144
changed the title
chenshuai2144
commented
Oct 20, 2022
| @@ -125,6 +125,20 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => { | |||
| } | |||
| } | |||
|
|
|||
| // check children access code | |||
| if (route.routes?.length) { | |||
| const isNoAccessibleChild = !route.routes.reduce((hasAccessibleChild, child) => { | |||
There was a problem hiding this comment.
只设置了 children 的权限，导致 children=routes 权限就会失效
There was a problem hiding this comment.
这几个地方处理的都是 routes ，pro-layout 又不取 routes 了，这好绕
There was a problem hiding this comment.
是为了兼容性，保证有一份一样的children 和 routes
chenshuai2144
commented
Oct 20, 2022
| // 现在的 layout 及 wrapper 实现是通过父路由的形式实现的, 会导致路由数据多了冗余层级, proLayout 消费时, 无法正确展示菜单, 这里对冗余数据进行过滤操作 | ||
| const newRoutes = filterRoutes(clientRoutes.filter(route => route.id === 'ant-design-pro-layout'), (route) => { | ||
| return (!!route.isLayout && route.id !== 'ant-design-pro-layout') || !!route.isWrapper; | ||
| }) | ||
| const [route] = useAccessMarkedRoutes(mapRoutes(newRoutes)); | ||
|
|
||
| const matchedRoute = useMemo(() => matchRoutes(route.children, location.pathname)?.pop?.()?.route, [location.pathname]); |
There was a problem hiding this comment.
国际化应该处理处理过的 route，不然会需要修改引用才能让 matchedRoute 的值被 useAccessMarkedRoutes 修改
|
Size Change: +1.96 kB (0%) Total Size: 9.95 MB
ℹ️ View Unchanged
|
Codecov ReportBase: 29.19% // Head: 29.05% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #9587 +/- ##
==========================================
- Coverage 29.19% 29.05% -0.14%
==========================================
Files 419 420 +1
Lines 11649 11704 +55
Branches 2790 2804 +14
==========================================
Hits 3401 3401
- Misses 7723 7773 +50
- Partials 525 530 +5
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
chenshuai2144
commented
Oct 26, 2022
| @@ -136,16 +136,17 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) => | |||
|
|
|||
| let newRoutes = [] | |||
| for (const route of routes) { | |||
| const newRoute = {...route }; | |||
There was a problem hiding this comment.
不要修改原来的路由数据了，不然会导致 react routers 的路由生成出问题，丢失层级
sorrycc
approved these changes
Oct 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.