Skip to content

Commit

Permalink
Merge pull request #3563 from easyops-cn/steve/v2-fix-menu
Browse files Browse the repository at this point in the history
fix(): mount menu after pre-fetch
  • Loading branch information
SailorF authored Oct 20, 2023
2 parents 85bf0e9 + 3d933d3 commit dec421f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/brick-kit/src/core/LocationContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -342,17 +342,17 @@ export class LocationContext {
}
}

await this.mountMenu(route.menu, matched.match, mountRoutesResult);

if (route.documentId) {
mountRoutesResult.appBar.documentId = route.documentId;
}

if (isRouteConfOfRoutes(route) && Array.isArray(route.routes)) {
await this.preFetchMenu(route.context);
await this.mountMenu(route.menu, matched.match, mountRoutesResult);
await this.mountRoutes(route.routes, slotId, mountRoutesResult);
} else if (isRouteConfOfBricks(route) && Array.isArray(route.bricks)) {
await this.preFetchMenu(route);
await this.mountMenu(route.menu, matched.match, mountRoutesResult);
await this.mountBricks(
route.bricks,
matched.match,
Expand Down

0 comments on commit dec421f

Please sign in to comment.