Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/partner' of https://gitlab.eascs.com/tms-ui/tms-obc-web into feature/partner

Browse Source
This commit is contained in:
潘晓云
2022-03-10 11:20:31 +08:00
parent 31cb7bd194 152c139041
commit 451d142d0f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/guards/auth.guard.ts
View File

@ -30,7 +30,7 @@ export class AuthGuard extends ACLGuard {
} }
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> { canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
if (childRoute.routeConfig?.loadChildren) { if (childRoute.routeConfig?.loadChildren || childRoute.routeConfig?.children) {
return super.canActivateChild(childRoute, state); return super.canActivateChild(childRoute, state);
} else { } else {
return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url));
@ -38,6 +38,8 @@ export class AuthGuard extends ACLGuard {
} }
private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> { private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> {
console.log(route, state);
if (!router) { if (!router) {
return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state); return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state);
} }