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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-05-12 14:58:16 +08:00
parent 11d39744cd 646081ecdd
commit d3da53145d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.module.ts
View File

@ -13,7 +13,7 @@ const GLOBAL_THIRD_MODULES: Array<Type<any>> = [];
// #endregion // #endregion
// #region Http Interceptors // #region Http Interceptors
import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { BusinessInterceptor, DefaultInterceptor } from '@core'; import { BusinessInterceptor, DefaultInterceptor } from '@core';
@ -38,7 +38,7 @@ const APPINIT_PROVIDES = [
multi: true multi: true
}, },
{ provide: DEFAULT_CURRENCY_CODE, useValue: '￥' }, { provide: DEFAULT_CURRENCY_CODE, useValue: '￥' },
{ provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] }, { provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] }
]; ];
// #endregion // #endregion
@ -51,7 +51,7 @@ import { ReuseTabService, ReuseTabStrategy } from '@delon/abc/reuse-tab';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent],
imports: [BrowserModule, BrowserAnimationsModule, CoreModule, RoutesModule, RouterModule, ...GLOBAL_THIRD_MODULES], imports: [BrowserModule, BrowserAnimationsModule, HttpClientModule, CoreModule, RoutesModule, RouterModule, ...GLOBAL_THIRD_MODULES],
providers: [...INTERCEPTOR_PROVIDES, ...APPINIT_PROVIDES], providers: [...INTERCEPTOR_PROVIDES, ...APPINIT_PROVIDES],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })

4
src/app/shared/basic-module.module.ts
View File

@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router';
@NgModule({ @NgModule({
declarations: [], declarations: [],
imports: [CommonModule, FormsModule, RouterModule, HttpClientModule, ReactiveFormsModule], imports: [CommonModule, FormsModule, RouterModule, ReactiveFormsModule],
exports: [CommonModule, FormsModule, HttpClientModule, ReactiveFormsModule, RouterModule] exports: [CommonModule, FormsModule, ReactiveFormsModule, RouterModule]
}) })
export class BasicModuleModule {} export class BasicModuleModule {}