From e72b3727af08822318eecea75494464ecf34b35a Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 17 Jan 2022 13:27:36 +0800
Subject: [PATCH] edit

---
 src/app/app.module.ts                         |  4 +-
 src/app/core/guards/auth.guard.ts             | 46 +++++++++----------
 src/app/core/startup/startup.service.ts       |  2 +-
 src/app/global-config.module.ts               |  3 +-
 .../components/list/list.component.html       | 45 +++++++-----------
 .../routes/vehicle/vehicle-routing.module.ts  | 33 +++++++++----
 src/assets/mocks/menu-data.json               |  6 ++-
 7 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2c30b188..726c4ce3 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -41,7 +41,8 @@ const APPINIT_PROVIDES = [
     deps: [StartupService],
     multi: true
   },
-  { provide: DEFAULT_CURRENCY_CODE, useValue: '￥' }
+  { provide: DEFAULT_CURRENCY_CODE, useValue: '￥' },
+  AuthGuard
 ];
 // #endregion
 
@@ -54,6 +55,7 @@ import { SharedModule } from './shared/shared.module';
 import { STWidgetModule } from './shared/widget/st-widget.module';
 import { Observable } from 'rxjs';
 import { registerLocaleData } from '@angular/common';
+import { AuthGuard } from './core/guards/auth.guard';
 
 @NgModule({
   declarations: [AppComponent],
diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts
index 23ae320d..36560587 100644
--- a/src/app/core/guards/auth.guard.ts
+++ b/src/app/core/guards/auth.guard.ts
@@ -13,41 +13,39 @@ import {
 import { sysConf } from '@conf/sys.conf';
 import { CoreService } from '@core';
 import { ACLGuard, ACLService } from '@delon/acl';
-import { EAUserService } from '@shared';
+import { MenuService } from '@delon/theme';
+import { BaseService, EAUserService } from '@shared';
 import { Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOCHU', 'YUNLI-CART-DETAIL'];
+const auths = ['YUNLI-CART-SEARCH', 'YUNLI-CART-DAOC1HU', 'YUNLI-CART-DETAIL','YUNLI-CART-AUDIT-SEARCH'];
 
 @Injectable()
 export class AuthGuard implements CanActivate, CanActivateChild, CanLoad {
-  constructor(srv: ACLService, router: Router, private eaUserSrv: CoreService, private router2: Router, private inject: Injector) {}
+  constructor(private srv: ACLService, router: Router, private baseService: BaseService, private menuService: MenuService) {}
   canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
-    throw true;
+    return true;
   }
 
   canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot | null): Observable<boolean> {
-    const canOpen = this.eaUserSrv.loginStatus;
-    if (!canOpen) {
-      this.router2.navigate([sysConf.login_url], {
-        queryParams: {
-          returnUrl: _state?.url
-        }
-      });
-      return of(!canOpen);
-    }
-    return of(true);
+    return this.handle();
   }
 
   canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    const canOpen = this.eaUserSrv.loginStatus;
-    if (!canOpen) {
-      this.router2.navigate([sysConf.login_url], {
-        queryParams: {
-          returnUrl: state?.url
-        }
-      });
-      return of(!canOpen);
-    }
-    return of(true);
+    return this.handle();
+  }
+
+  private handle(): Observable<boolean> {
+    // 1
+    return this.baseService.request('/api/mdc/cuc/user/getUserDetail').pipe(
+      map(_ => {
+        console.log(this.srv.data);
+        this.srv.setAbility(auths);
+        this.menuService.resume();
+        console.log(this.srv.data);
+
+        return true;
+      })
+    );
   }
 }
diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts
index 95350c7b..4e68b7e9 100644
--- a/src/app/core/startup/startup.service.ts
+++ b/src/app/core/startup/startup.service.ts
@@ -92,7 +92,7 @@ export class StartupService {
       enterpriseId: userData?.enterpriseId || sysConf.enterpriseId
     });
     // ACL：设置权限为全量
-    this.aclService.setFull(true);
+    this.aclService.setFull(false);
     // 初始化菜单
     this.menuService.add(menuData);
     // 设置页面标题的后缀
diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts
index 1e998b36..dabcdbb4 100644
--- a/src/app/global-config.module.ts
+++ b/src/app/global-config.module.ts
@@ -13,7 +13,8 @@ import { environment } from '@env/environment';
 const alainConfig: AlainConfig = {
   st: { modal: { size: 'lg' } },
   pageHeader: { homeI18n: 'home', recursiveBreadcrumb: true },
-  auth: { login_url: '/dashboard' }
+  auth: { login_url: '/passport/login' },
+  acl: { guard_url: '/' }
 };
 
 const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()];
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index eec3ddbb..4f7d82ea 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -7,23 +7,16 @@
  * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
 -->
 <!-- 页头 -->
-<page-header-wrapper ></page-header-wrapper>
+<page-header-wrapper></page-header-wrapper>
 <nz-card>
   <!-- 搜索区 -->
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf
-        #sf
-        [schema]="schema"
-        [ui]="ui"
-        [mode]="'search'"
-        [disabled]="!sf?.valid"
-        (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"
-      ></sf>
-    
+      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"></sf>
+
     </div>
     <!-- [loading]="service.http.loading" -->
 
@@ -33,9 +26,10 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()">导出</button>
-        <button nz-button  [disabled]="service.http.loading"(click)="resetSF()">重置</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl
+          [acl-ability]="'YUNLI-CART-DAOCHU'">导出</button>
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -48,28 +42,23 @@
   <!-- 数据列表 -->
   <!-- [data]="service.$api_get_supplier_page" -->
 
-  <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '1200px' }"
-    [columns]="columns"
-    [data]='service.$api_get_operate_list'
+  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]='service.$api_get_operate_list'
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading"
-  >
+    [loading]="service.http.loading">
     <ng-template st-row="carLength" let-item let-index="index">
-    <div>{{item?.carModelLabel }}-{{item?.carLengthLabel?  item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
+      <div>{{item?.carModelLabel }}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
+        item?.carLoad + '吨' : ''}}</div>
     </ng-template>
     <ng-template st-row="isSelf" let-item let-index="index">
-        <div>
-          {{ item?.isSelf ? '是' : '否' }}
+      <div>
+        {{ item?.isSelf ? '是' : '否' }}
       </div>
     </ng-template>
     <ng-template st-row="putOnRecord" let-item let-index="index">
-        <div>
-          {{ item?.putOnRecord ? '是' : '否' }}
+      <div>
+        {{ item?.putOnRecord ? '是' : '否' }}
       </div>
     </ng-template>
     <ng-template st-row="approvalAuditStatus" let-item let-index="index">
@@ -89,4 +78,4 @@
       <nz-tag *elseBlock nzColor="success">正常</nz-tag>
     </ng-template>
   </st>
-</nz-card>
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/vehicle/vehicle-routing.module.ts b/src/app/routes/vehicle/vehicle-routing.module.ts
index fa066cf2..69e6ab7f 100644
--- a/src/app/routes/vehicle/vehicle-routing.module.ts
+++ b/src/app/routes/vehicle/vehicle-routing.module.ts
@@ -8,23 +8,40 @@
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { ACLGuard, ACLGuardType } from '@delon/acl';
+import { AuthGuard } from 'src/app/core/guards/auth.guard';
 import { VehicleComponentsAuditComponent } from './components/audit/audit.component';
 import { VehicleComponentsAuditDetailComponent } from './components/audit/detail/detail.component';
 import { VehicleComponentsListDetailComponent } from './components/list/detail/detail.component';
 import { VehicleComponentsListComponent } from './components/list/list.component';
 
-
-
 const routes: Routes = [
-
-  { path: 'list', component: VehicleComponentsListComponent },
-  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent },
-  { path: 'audit', component: VehicleComponentsAuditComponent },
-  { path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent },
+  {
+    path: '',
+    canActivate: [AuthGuard],
+    children: [
+      {
+        path: 'list',
+        component: VehicleComponentsListComponent,
+        data: { guard: { ability: ['YUNLI-CART-SEARCH'] } as ACLGuardType }
+      },
+      {
+        path: 'list/detail/:id',
+        component: VehicleComponentsListDetailComponent,
+        data: { guard: { ability: ['YUNLI-CART-DETAIL'] } as ACLGuardType }
+      },
+      {
+        path: 'audit',
+        component: VehicleComponentsAuditComponent,
+        data: { guard: { ability: ['YUNLI-CART--AUDIT-SEARCH1'] } as ACLGuardType }
+      },
+      { path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent }
+    ]
+  }
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
+  exports: [RouterModule]
 })
 export class VehicleRoutingModule {}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 0b732eaa..921111b9 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -98,7 +98,10 @@
               },
               {
                 "text": "车辆审核列表",
-                "link": "/vehicle/audit"
+                "link": "/vehicle/audit",
+                "acl": {
+                  "ability": ["YUNLI-CART-AUDIT-SEARCH"]
+                }
               },
               {
                 "hide": true,
@@ -484,7 +487,6 @@
                 "text": "基础配置",
                 "link": "/system/basic-config"
               },
-            
               {
                 "text": "版本发布记录",
                 "link": "/system/version-logs"