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

This commit is contained in:
wangshiming
2022-05-12 14:58:16 +08:00
2 changed files with 5 additions and 5 deletions

View File

@ -13,7 +13,7 @@ const GLOBAL_THIRD_MODULES: Array<Type<any>> = [];
// #endregion
// #region Http Interceptors
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { BusinessInterceptor, DefaultInterceptor } from '@core';
@ -38,7 +38,7 @@ const APPINIT_PROVIDES = [
multi: true
},
{ provide: DEFAULT_CURRENCY_CODE, useValue: '¥' },
{ provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] },
{ provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] }
];
// #endregion
@ -51,7 +51,7 @@ import { ReuseTabService, ReuseTabStrategy } from '@delon/abc/reuse-tab';
@NgModule({
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],
bootstrap: [AppComponent]
})

View File

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