diff --git a/docs/en/Modules/Setting-Management.md b/docs/en/Modules/Setting-Management.md index 4eedcc969d..68b06372eb 100644 --- a/docs/en/Modules/Setting-Management.md +++ b/docs/en/Modules/Setting-Management.md @@ -278,7 +278,7 @@ Open the `app.component.ts` and modify the file as shown below: ```js import { Component } from '@angular/core'; -import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService +import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent @Component(/* component metadata */) diff --git a/docs/zh-Hans/Modules/Setting-Management.md b/docs/zh-Hans/Modules/Setting-Management.md index acb4469fea..c99397e4b4 100644 --- a/docs/zh-Hans/Modules/Setting-Management.md +++ b/docs/zh-Hans/Modules/Setting-Management.md @@ -249,7 +249,7 @@ yarn ng generate component my-settings ```js import { Component } from '@angular/core'; -import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService +import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent @Component(/* component metadata */) @@ -273,4 +273,4 @@ export class AppComponent { 导航到 `/setting-management` 路由你会看到以下变化: -![Custom Settings Tab](../images/custom-settings.png) \ No newline at end of file +![Custom Settings Tab](../images/custom-settings.png) diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts index 13461491e3..d2aba62c09 100644 --- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts @@ -181,6 +181,3 @@ export abstract class AbstractNavTreeService @Injectable({ providedIn: 'root' }) export class RoutesService extends AbstractNavTreeService {} - -@Injectable({ providedIn: 'root' }) -export class SettingTabsService extends AbstractNavTreeService {} diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts index 6bed72f2fc..52369a9fc9 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts @@ -3,8 +3,19 @@ import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; import { APP_INITIALIZER, inject, InjectionToken } from '@angular/core'; import { debounceTime, map } from 'rxjs/operators'; import { eSettingManagementRouteNames } from '../enums/route-names'; +import { SettingTabsService } from '../services/settings-tabs.service'; import { Observable } from 'rxjs'; +export const SETTING_MANAGEMENT_ROUTE_PROVIDERS = [ + { provide: APP_INITIALIZER, useFactory: configureRoutes, deps: [RoutesService], multi: true }, + { + provide: APP_INITIALIZER, + useFactory: hideRoutes, + deps: [RoutesService, SettingTabsService], + multi: true, + }, +]; + export function configureRoutes(routesService: RoutesService) { return () => { routesService.add([ @@ -19,6 +30,7 @@ export function configureRoutes(routesService: RoutesService) { ]); }; } + export const SETTING_MANAGEMENT_HAS_SETTING = new InjectionToken>( 'SETTING_MANAGEMENT_HAS_SETTING', { diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts index f88e3c3020..f05104c177 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts @@ -1,7 +1,7 @@ -import { SettingTabsService } from '@abp/ng.core'; import { APP_INITIALIZER } from '@angular/core'; import { EmailSettingGroupComponent } from '../components/email-setting-group/email-setting-group.component'; import { eSettingManamagementSettingTabNames } from '../enums/setting-tab-names'; +import { SettingTabsService } from '../services/settings-tabs.service'; export const SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS = [ { diff --git a/npm/ng-packs/packages/setting-management/config/src/public-api.ts b/npm/ng-packs/packages/setting-management/config/src/public-api.ts index c33f10d4d2..83eb57e505 100644 --- a/npm/ng-packs/packages/setting-management/config/src/public-api.ts +++ b/npm/ng-packs/packages/setting-management/config/src/public-api.ts @@ -1,5 +1,6 @@ +export * from './components/email-setting-group/email-setting-group.component'; export * from './enums'; export * from './providers'; -export * from './setting-management-config.module'; export * from './proxy'; -export * from './components/email-setting-group/email-setting-group.component'; +export * from './services'; +export * from './setting-management-config.module'; diff --git a/npm/ng-packs/packages/setting-management/config/src/services/index.ts b/npm/ng-packs/packages/setting-management/config/src/services/index.ts new file mode 100644 index 0000000000..a130d0a4a9 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/services/index.ts @@ -0,0 +1 @@ +export * from './settings-tabs.service'; diff --git a/npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts b/npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts new file mode 100644 index 0000000000..7e35070016 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts @@ -0,0 +1,5 @@ +import { Injectable } from '@angular/core'; +import { ABP, AbstractNavTreeService } from '@abp/ng.core'; + +@Injectable({ providedIn: 'root' }) +export class SettingTabsService extends AbstractNavTreeService {} diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts index f72a222cdd..4404939c36 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts @@ -1,5 +1,6 @@ -import { ABP, SettingTabsService } from '@abp/ng.core'; +import { ABP } from '@abp/ng.core'; import { Component, OnDestroy, OnInit, TrackByFunction } from '@angular/core'; +import { SettingTabsService } from '@abp/ng.setting-management/config'; import { Subscription } from 'rxjs'; @Component({