fix(plugin-layout): copy routes to children #9567
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
commented
Oct 20, 2022
packages/plugins/src/access.ts
Outdated
| @@ -129,7 +129,7 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => { | |||
| } | |||
|
|
|||
| return routes.map(route => process(route)); | |||
| }, [routes.length, access]); | |||
There was a problem hiding this comment.
这里地方去掉保证route修改了一定重新计算一份layout
chenshuai2144
commented
Oct 20, 2022
packages/plugins/src/layout.ts
Outdated
| @@ -197,7 +199,7 @@ const { formatMessage } = useIntl(); | |||
| }, | |||
| }); | |||
|
|
|||
| const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname).pop()?.route, [location.pathname]); | |||
| const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname)?.pop?.()?.route, [location.pathname]); | |||
There was a problem hiding this comment.
防止没match的时候项目死掉
chenshuai2144
commented
Oct 20, 2022
packages/plugins/src/layout.ts
Outdated
| @@ -165,6 +166,7 @@ const mapRoutes = (routes: IRoute[]) => { | |||
|
|
|||
| if (Array.isArray(route.routes)) { | |||
| newRoute.routes = mapRoutes(route.routes); | |||
| newRoute.children = newRoute.routes; | |||
There was a problem hiding this comment.
copy了一份一样的给 children
There was a problem hiding this comment.
这里copy 会印象对引用的修改，导致权限不生效，有时间了好好改改。应该使用不可变数据
chenshuai2144
commented
Oct 20, 2022
| @@ -144,6 +144,7 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) => | |||
| newRoutes.push(route); | |||
| if (Array.isArray(route.routes)) { | |||
| route.routes = filterRoutes(route.routes, filterFn); | |||
| route.children = route.routes; | |||
There was a problem hiding this comment.
copy了一份一样的给children
|
Size Change: +10 B (0%) Total Size: 9.95 MB
ℹ️ View Unchanged
|
Codecov ReportBase: 29.28% // Head: 29.28% // No change to project coverage 👍
Additional details and impacted files@@ Coverage Diff @@
## master #9567 +/- ##
=======================================
Coverage 29.28% 29.28%
=======================================
Files 419 419
Lines 11609 11609
Branches 2775 2775
=======================================
Hits 3400 3400
Misses 7690 7690
Partials 519 519
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. |
sorrycc
approved these changes
Oct 20, 2022
chenshuai2144
force-pushed
the
fix-layout
branch
from
ff9b7f7 to
53766d5
Compare
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.