Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
		| @ -52,7 +52,6 @@ import { LayoutModule } from './layout/layout.module'; | |||||||
| import { RoutesModule } from './routes/routes.module'; | import { RoutesModule } from './routes/routes.module'; | ||||||
| import { SharedModule } from './shared/shared.module'; | import { SharedModule } from './shared/shared.module'; | ||||||
| import { STWidgetModule } from './shared/widget/st-widget.module'; | import { STWidgetModule } from './shared/widget/st-widget.module'; | ||||||
| import { Observable } from 'rxjs'; |  | ||||||
| import { registerLocaleData } from '@angular/common'; | import { registerLocaleData } from '@angular/common'; | ||||||
|  |  | ||||||
| @NgModule({ | @NgModule({ | ||||||
|  | |||||||
| @ -21,12 +21,12 @@ const alainProvides = [{ provide: ALAIN_CONFIG, useValue: alainConfig }]; | |||||||
|  |  | ||||||
| // #region reuse-tab | // #region reuse-tab | ||||||
|  |  | ||||||
| import { RouteReuseStrategy } from '@angular/router'; | // import { RouteReuseStrategy } from '@angular/router'; | ||||||
| alainProvides.push({ | // alainProvides.push({ | ||||||
|   provide: RouteReuseStrategy, | //   provide: RouteReuseStrategy, | ||||||
|   useClass: ReuseTabStrategy, | //   useClass: ReuseTabStrategy, | ||||||
|   deps: [ReuseTabService] | //   deps: [ReuseTabService] | ||||||
| } as any); | // } as any); | ||||||
|  |  | ||||||
| // #endregion | // #endregion | ||||||
|  |  | ||||||
| @ -51,9 +51,9 @@ export class GlobalConfigModule { | |||||||
|     throwIfAlreadyLoaded(parentModule, 'GlobalConfigModule'); |     throwIfAlreadyLoaded(parentModule, 'GlobalConfigModule'); | ||||||
|     // NOTICE: Only valid for menus with reuse property |     // NOTICE: Only valid for menus with reuse property | ||||||
|     // Pls refer to the E-Mail demo effect |     // Pls refer to the E-Mail demo effect | ||||||
|     reuseTabService.mode = ReuseTabMatchMode.MenuForce; |     // reuseTabService.mode = ReuseTabMatchMode.MenuForce; | ||||||
|     // Shouled be trigger init, you can ingore when used `reuse-tab` component in layout component |     // Shouled be trigger init, you can ingore when used `reuse-tab` component in layout component | ||||||
|     reuseTabService.init(); |     // reuseTabService.init(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   static forRoot(): ModuleWithProviders<GlobalConfigModule> { |   static forRoot(): ModuleWithProviders<GlobalConfigModule> { | ||||||
|  | |||||||
| @ -23,7 +23,7 @@ export class BrandService { | |||||||
|    * @alain-pro-sider-menu-width: 256px; |    * @alain-pro-sider-menu-width: 256px; | ||||||
|    * ``` |    * ``` | ||||||
|    */ |    */ | ||||||
|   readonly width = 256; |   readonly width = 205; | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|    * Specify width of the sidebar after collapsed, If you change it, muse be synchronize change less parameter: |    * Specify width of the sidebar after collapsed, If you change it, muse be synchronize change less parameter: | ||||||
|  | |||||||
| @ -76,12 +76,13 @@ export class SystemLogsComponent implements OnInit { | |||||||
|  |  | ||||||
|   _$expand = false; |   _$expand = false; | ||||||
|  |  | ||||||
|   constructor(public service: LogsService, private nzModalService: NzModalService) {} |   constructor(public service: LogsService) {} | ||||||
|  |  | ||||||
|   ngOnInit(): void {} |   ngOnInit(): void { | ||||||
|  |   } | ||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     requestOptions.body.operateType = '1' |     requestOptions.body.operateType = '1'; | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf.value, | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user