Browse Source

Merge pull request #4859 from abpframework/fix/4858

Fixed the NgxValidateCoreModule configuration overriding problem
pull/4889/head
Erol Arkat 6 years ago
committed by GitHub
parent
commit
8c338d2e52
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts

24
npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts

@ -42,6 +42,20 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
NgbCollapseModule,
NgbDropdownModule,
NgxValidateCoreModule,
],
entryComponents: [...LAYOUTS, ValidationErrorComponent, CurrentUserComponent, LanguagesComponent],
})
export class ThemeBasicModule {
static forRoot(): ModuleWithProviders<ThemeBasicModule> {
return {
ngModule: RootThemeBasicModule,
providers: [BASIC_THEME_NAV_ITEM_PROVIDERS, BASIC_THEME_STYLES_PROVIDERS],
};
}
}
@NgModule({
imports: [
NgxValidateCoreModule.forRoot({
targetSelector: '.form-group',
blueprints: {
@ -63,13 +77,5 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
errorTemplate: ValidationErrorComponent,
}),
],
entryComponents: [...LAYOUTS, ValidationErrorComponent, CurrentUserComponent, LanguagesComponent],
})
export class ThemeBasicModule {
static forRoot(): ModuleWithProviders<ThemeBasicModule> {
return {
ngModule: ThemeBasicModule,
providers: [BASIC_THEME_NAV_ITEM_PROVIDERS, BASIC_THEME_STYLES_PROVIDERS],
};
}
}
export class RootThemeBasicModule {}

Loading…
Cancel
Save