Browse Source
Merge pull request #24629 from abpframework/auto-merge/rel-10-1/4274
Merge branch dev with rel-10.1
pull/24637/head
Ma Liming
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
2 deletions
-
npm/ng-packs/packages/account/src/lib/account.routes.ts
-
npm/ng-packs/packages/tenant-management/src/lib/tenant-management.routes.ts
|
|
@ -1,4 +1,5 @@ |
|
|
import { Routes } from '@angular/router'; |
|
|
import { Routes } from '@angular/router'; |
|
|
|
|
|
import { Provider } from '@angular/core'; |
|
|
import { |
|
|
import { |
|
|
ForgotPasswordComponent, |
|
|
ForgotPasswordComponent, |
|
|
LoginComponent, |
|
|
LoginComponent, |
|
|
@ -23,7 +24,7 @@ import { |
|
|
RouterOutletComponent, |
|
|
RouterOutletComponent, |
|
|
} from '@abp/ng.core'; |
|
|
} from '@abp/ng.core'; |
|
|
|
|
|
|
|
|
export function provideAccount(options: AccountConfigOptions = {}) { |
|
|
export function provideAccount(options: AccountConfigOptions = {}): Provider[] { |
|
|
return [ |
|
|
return [ |
|
|
{ provide: ACCOUNT_CONFIG_OPTIONS, useValue: options }, |
|
|
{ provide: ACCOUNT_CONFIG_OPTIONS, useValue: options }, |
|
|
{ |
|
|
{ |
|
|
|
|
|
@ -1,4 +1,5 @@ |
|
|
import { Routes } from '@angular/router'; |
|
|
import { Routes } from '@angular/router'; |
|
|
|
|
|
import { Provider } from '@angular/core'; |
|
|
import { TenantManagementConfigOptions } from './models/config-options'; |
|
|
import { TenantManagementConfigOptions } from './models/config-options'; |
|
|
import { |
|
|
import { |
|
|
TENANT_MANAGEMENT_CREATE_FORM_PROP_CONTRIBUTORS, |
|
|
TENANT_MANAGEMENT_CREATE_FORM_PROP_CONTRIBUTORS, |
|
|
@ -19,7 +20,7 @@ import { TenantsComponent } from './components'; |
|
|
import { eTenantManagementComponents } from './enums'; |
|
|
import { eTenantManagementComponents } from './enums'; |
|
|
import { tenantManagementExtensionsResolver } from './resolvers'; |
|
|
import { tenantManagementExtensionsResolver } from './resolvers'; |
|
|
|
|
|
|
|
|
export function provideTenantManagement(options: TenantManagementConfigOptions = {}) { |
|
|
export function provideTenantManagement(options: TenantManagementConfigOptions = {}): Provider[] { |
|
|
return [ |
|
|
return [ |
|
|
{ |
|
|
{ |
|
|
provide: TENANT_MANAGEMENT_ENTITY_ACTION_CONTRIBUTORS, |
|
|
provide: TENANT_MANAGEMENT_ENTITY_ACTION_CONTRIBUTORS, |
|
|
|