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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-10 09:21:23 +08:00
parent e5fd7489cf
commit b27cb58959
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,14 +42,18 @@ export class AuthGuard extends ACLGuard {
canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable<boolean> { canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable<boolean> {
if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) {
return this.handle(route, _state, 1); return super.canActivate(route, _state);
} else { } else {
return this.handle(route, _state, 1, _state?.url); return super.canActivate(route, _state);
} }
} }
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> { canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); if (childRoute.routeConfig?.loadChildren) {
return super.canActivateChild(childRoute, state);
} else {
return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url));
}
} }
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> {