From 6b92227e4af5139bc153bc8ef7dcb58037a60674 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 24 Jan 2022 14:33:53 +0800 Subject: [PATCH] eduit --- src/app/core/guards/auth.guard.ts | 5 ++- .../list/img-view/img-view.component.spec.ts | 31 ---------------- .../components/list/list.component.html | 35 +++++++------------ .../components/list/list.component.spec.ts | 31 ---------------- .../vehicle/components/list/list.component.ts | 14 -------- .../routes/vehicle/vehicle-routing.module.ts | 2 ++ 6 files changed, 18 insertions(+), 100 deletions(-) delete mode 100644 src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts delete mode 100644 src/app/routes/vehicle/components/list/list.component.spec.ts diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 36560587..e99ece54 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -18,20 +18,23 @@ import { BaseService, EAUserService } from '@shared'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOC1HU', 'YUNLI-CART-DETAIL','YUNLI-CART-AUDIT-SEARCH']; +const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOC1HU', 'YUNLI-CART-DETAIL', 'YUNLI-CART-AUDIT-SEARCH']; @Injectable() export class AuthGuard implements CanActivate, CanActivateChild, CanLoad { constructor(private srv: ACLService, router: Router, private baseService: BaseService, private menuService: MenuService) {} canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable | Promise { + console.log(route); return true; } canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable { + console.log(route); return this.handle(); } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + console.log(childRoute); return this.handle(); } diff --git a/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts b/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts deleted file mode 100644 index 014df68a..00000000 --- a/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-07 17:30:18 - * @LastEditTime: 2021-12-09 17:47:33 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.spec.ts - */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { VehicleImgViewComponent } from './img-view.component'; - -describe('VehicleImgViewComponent', () => { - let component: VehicleImgViewComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [VehicleImgViewComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(VehicleImgViewComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index 4f7d82ea..9e3cdc17 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -12,30 +12,19 @@
- -
- - +
+ +
+
+ + + +
- - - - -
- -
-
- - - - -
-
diff --git a/src/app/routes/vehicle/components/list/list.component.spec.ts b/src/app/routes/vehicle/components/list/list.component.spec.ts deleted file mode 100644 index e815b19d..00000000 --- a/src/app/routes/vehicle/components/list/list.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-01 20:05:59 - * @LastEditTime: 2021-12-01 20:35:33 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\list.component.spec.ts - */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { VehicleComponentsListComponent } from './list.component'; - -describe('VehicleComponentsListComponent', () => { - let component: VehicleComponentsListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [VehicleComponentsListComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(VehicleComponentsListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index e83259e5..aa913cbb 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -13,7 +13,6 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service'; }) export class VehicleComponentsListComponent implements OnInit { _$expand = false; - url = `/rule?_allow_anonymous=true`; ui!: SFUISchema; schema!: SFSchema; @@ -22,12 +21,6 @@ export class VehicleComponentsListComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} - /** - * 查询字段个数navigate - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } /** * 查询参数 @@ -45,10 +38,6 @@ export class VehicleComponentsListComponent implements OnInit { return params; } - get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; - } - ngOnInit() { this.initSF(); this.initST(); @@ -91,9 +80,6 @@ export class VehicleComponentsListComponent implements OnInit { return of([]); } }, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, carNoColor: { diff --git a/src/app/routes/vehicle/vehicle-routing.module.ts b/src/app/routes/vehicle/vehicle-routing.module.ts index 69e6ab7f..7dc78201 100644 --- a/src/app/routes/vehicle/vehicle-routing.module.ts +++ b/src/app/routes/vehicle/vehicle-routing.module.ts @@ -18,7 +18,9 @@ import { VehicleComponentsListComponent } from './components/list/list.component const routes: Routes = [ { path: '', + canLoad: [AuthGuard], canActivate: [AuthGuard], + canActivateChild: [AuthGuard], children: [ { path: 'list',