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:24:09 +08:00
parent b27cb58959
commit 306952a850
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,11 +41,12 @@ 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 super.canActivate(route, _state); // return super.canActivate(route, _state);
} else { // } else {
return super.canActivate(route, _state); // return super.canActivate(route, _state);
} // }
return super.canActivate(route, _state);
} }
canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> { canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
@ -69,11 +70,6 @@ export class AuthGuard extends ACLGuard {
return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe( return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe(
switchMap(res => { switchMap(res => {
if (res) { if (res) {
// if (router === '/ticket/invoice-requested') {
// this.srv1.setAbility(['TICKET-INVOICE-REQUESTED-list']);
// } else {
// this.srv1.setAbility(res.abilities || []);
// }
this.srv1.setAbility(res.abilities || []); this.srv1.setAbility(res.abilities || []);
// this.menuService.resume(); // this.menuService.resume();
} }
@ -86,6 +82,12 @@ export class AuthGuard extends ACLGuard {
); );
} }
/**
* 根据参数拼接原始路由
* @param params 参数
* @param route 实际路由
* @returns
*/
private settingRoute(params: any, route: string) { private settingRoute(params: any, route: string) {
let _route = route; let _route = route;
if (_route.indexOf('?') > -1) { if (_route.indexOf('?') > -1) {