From a7090d928a6adf4eef1ae4a7503497fedc104d03 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Mon, 9 Sep 2019 13:57:53 +0300 Subject: [PATCH 1/6] feature(theme-shared): add style class to confirmation and toast components --- .../confirmation/confirmation.component.ts | 17 ++- .../lib/components/toast/toast.component.ts | 2 +- .../theme-shared/src/lib/contants/styles.ts | 105 ++++++++++++++++++ 3 files changed, 114 insertions(+), 10 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts index 917e981338..39cf9b73a2 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts @@ -11,26 +11,25 @@ import { Toaster } from '../../models/toaster'; (onClose)="close(dismiss)" [modal]="true" [baseZIndex]="1000" - styleClass="" + styleClass="abp-confirm" > -
-

- {{ message.summary | abpLocalization: message.titleLocalizationParams }} -

+ +
+ {{ message.summary | abpLocalization: message.titleLocalizationParams }}
-
+
{{ message.detail | abpLocalization: message.messageLocalizationParams }}
-
-
diff --git a/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts b/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts index 3986689c41..73c3455828 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/permission-management.module.ts @@ -4,11 +4,10 @@ import { NgModule } from '@angular/core'; import { NgxsModule } from '@ngxs/store'; import { PermissionManagementComponent } from './components/permission-management.component'; import { PermissionManagementState } from './states/permission-management.state'; -import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; @NgModule({ declarations: [PermissionManagementComponent], - imports: [CoreModule, ThemeSharedModule, NgxsModule.forFeature([PermissionManagementState]), PerfectScrollbarModule], + imports: [CoreModule, ThemeSharedModule, NgxsModule.forFeature([PermissionManagementState])], exports: [PermissionManagementComponent], }) export class PermissionManagementModule {} diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html index 5f57360aa8..75c48d2d15 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html @@ -27,10 +27,9 @@ [style.minHeight]="minHeight || undefined" > - - +
+
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index dd66eec05c..e2646b5128 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -119,11 +119,16 @@ export class ModalComponent implements OnDestroy { this.visibleChange.emit(value); this.showModal = value; - value - ? timer(ANIMATION_TIMEOUT + 100) - .pipe(take(1)) - .subscribe(_ => (this.closable = true)) - : (this.closable = false); + if (value) { + timer(ANIMATION_TIMEOUT + 100) + .pipe(take(1)) + .subscribe(_ => (this.closable = true)); + + this.renderer.addClass(document.body, 'modal-open'); + } else { + this.closable = false; + this.renderer.removeClass(document.body, 'modal-open'); + } } listen() { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts index 7291eb0ab9..16c6433362 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts @@ -32,6 +32,11 @@ export default ` background-color: rgba(0, 0, 0, .6); } +.modal.show { + overflow-x: hidden !important; + overflow-y: auto !important; +} + .abp-ellipsis-inline { display: inline-block; overflow: hidden; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 6d31540305..49269b59d9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -18,22 +18,26 @@ import { ChangePasswordComponent } from './components/change-password/change-pas import { ProfileComponent } from './components/profile/profile.component'; import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component'; -export function appendScript(injector: Injector) { - const fn = function() { - const lazyLoadService: LazyLoadService = injector.get(LazyLoadService); +export function appendScript(styles) { + const higher = (injector: Injector) => { + const fn = function() { + const lazyLoadService: LazyLoadService = injector.get(LazyLoadService); - return forkJoin( - lazyLoadService.load( - null, - 'style', - styles, - 'head', - 'afterbegin', - ) /* lazyLoadService.load(null, 'script', scripts) */, - ).pipe(take(1)); + return forkJoin( + lazyLoadService.load( + null, + 'style', + styles, + 'head', + 'afterbegin', + ) /* lazyLoadService.load(null, 'script', scripts) */, + ).pipe(take(1)); + }; + + return fn; }; - return fn; + return higher; } @NgModule({ @@ -87,7 +91,7 @@ export class ThemeSharedModule { provide: APP_INITIALIZER, multi: true, deps: [Injector, ErrorHandler], - useFactory: appendScript, + useFactory: appendScript(styles), }, { provide: MessageService, useClass: MessageService }, ], From 70ec0b3a63c001f94e7eb5de4b1be6fefb625869 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Mon, 9 Sep 2019 16:55:44 +0300 Subject: [PATCH 4/6] fix(theme-shared): remove unnecessary css style --- .../packages/theme-shared/src/lib/contants/styles.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts index 16c6433362..7291eb0ab9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts @@ -32,11 +32,6 @@ export default ` background-color: rgba(0, 0, 0, .6); } -.modal.show { - overflow-x: hidden !important; - overflow-y: auto !important; -} - .abp-ellipsis-inline { display: inline-block; overflow: hidden; From e4d82550a94500cbf5630b1d3e53ca4e91a3a5f9 Mon Sep 17 00:00:00 2001 From: abp modules <51013007+abphub@users.noreply.github.com> Date: Tue, 10 Sep 2019 09:42:05 +0800 Subject: [PATCH 5/6] Modify an error description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inheritance interface is not “ITenantResolver”，modified “ITenantResolveContributor”. See lines 118 and 134. --- docs/zh-Hans/Multi-Tenancy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/zh-Hans/Multi-Tenancy.md b/docs/zh-Hans/Multi-Tenancy.md index 911803b1be..259cfeda9f 100644 --- a/docs/zh-Hans/Multi-Tenancy.md +++ b/docs/zh-Hans/Multi-Tenancy.md @@ -115,7 +115,7 @@ namespace MyCompany.MyProject { Configure(options => { - options.TenantResolvers.Add(new MyCustomTenantResolver()); + options.TenantResolvers.Add(new MyCustomTenantResolveContributor()); }); //... @@ -124,14 +124,14 @@ namespace MyCompany.MyProject } ```` -MyCustomTenantResolver必须像下面这样实现**ITenantResolver**接口: +MyCustomTenantResolveContributor必须像下面这样实现**ITenantResolveContributor**接口: ````C# using Volo.Abp.MultiTenancy; namespace MyCompany.MyProject { - public class MyCustomTenantResolver : ITenantResolver + public class MyCustomTenantResolveContributor : ITenantResolveContributor { public void Resolve(ITenantResolveContext context) { From 62f21424c1e64f8d3560e00684cbc6f135a23645 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 10 Sep 2019 14:23:55 +0800 Subject: [PATCH 6/6] Update Multi-Tenancy.md --- docs/en/Multi-Tenancy.md | 6 +++--- docs/zh-Hans/Multi-Tenancy.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md index f5510a82db..0ad3c66b26 100644 --- a/docs/en/Multi-Tenancy.md +++ b/docs/en/Multi-Tenancy.md @@ -114,7 +114,7 @@ namespace MyCompany.MyProject { Configure(options => { - options.TenantResolvers.Add(new MyCustomTenantResolver()); + options.TenantResolvers.Add(new MyCustomTenantResolveContributor()); }); //... @@ -123,14 +123,14 @@ namespace MyCompany.MyProject } ```` -MyCustomTenantResolver must implement **ITenantResolver** as shown below: +`MyCustomTenantResolveContributor` must implement **ITenantResolveContributor** as shown below: ````C# using Volo.Abp.MultiTenancy; namespace MyCompany.MyProject { - public class MyCustomTenantResolver : ITenantResolver + public class MyCustomTenantResolveContributor : ITenantResolveContributor { public void Resolve(ITenantResolveContext context) { diff --git a/docs/zh-Hans/Multi-Tenancy.md b/docs/zh-Hans/Multi-Tenancy.md index 259cfeda9f..352190d5cd 100644 --- a/docs/zh-Hans/Multi-Tenancy.md +++ b/docs/zh-Hans/Multi-Tenancy.md @@ -124,7 +124,7 @@ namespace MyCompany.MyProject } ```` -MyCustomTenantResolveContributor必须像下面这样实现**ITenantResolveContributor**接口: +`MyCustomTenantResolveContributor`必须像下面这样实现**ITenantResolveContributor**接口: ````C# using Volo.Abp.MultiTenancy;