From 6f62b277d3f79a5425bc93b5a80c0e025226807f Mon Sep 17 00:00:00 2001 From: htlsmile Date: Tue, 7 Jul 2020 11:44:38 +0800 Subject: [PATCH 1/5] Update docs-nav.json Fixing translation errors --- docs/zh-Hans/docs-nav.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-Hans/docs-nav.json b/docs/zh-Hans/docs-nav.json index 66229da6da..732acc8806 100644 --- a/docs/zh-Hans/docs-nav.json +++ b/docs/zh-Hans/docs-nav.json @@ -34,7 +34,7 @@ "path": "Tutorials/Part-1.md" }, { - "text": "第一章: 增删改查操作", + "text": "第二章: 增删改查操作", "path": "Tutorials/Part-2.md" }, { From d62ee8ff8d568472784f69041387d99af7a18a1a Mon Sep 17 00:00:00 2001 From: htlsmile Date: Tue, 7 Jul 2020 13:31:25 +0800 Subject: [PATCH 2/5] Update Repositories.md Fixing translation errors --- docs/zh-Hans/Repositories.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/zh-Hans/Repositories.md b/docs/zh-Hans/Repositories.md index 86d2f2e43d..18bfa5f77d 100644 --- a/docs/zh-Hans/Repositories.md +++ b/docs/zh-Hans/Repositories.md @@ -248,6 +248,4 @@ ABP框架使用实际数据库提供程序的API异步执行查询.虽然这不 * 如果你正在构建一个没有数据库提供程序集成包的**可重用库**,但是在某些情况下需要执行 `IQueryable`对象. -For example, ABP Framework uses the `IAsyncQueryableExecuter` in the `CrudAppService` base class (see the [application services](Application-Services.md) document). - -例如,ABP框架在 `CrudAppService` 基类中(参阅[应用程序](Application-Services.md)文档)使用 `IAsyncQueryableExecuter`. \ No newline at end of file +例如,ABP框架在 `CrudAppService` 基类中(参阅[应用程序](Application-Services.md)文档)使用 `IAsyncQueryableExecuter`. From 02dbdc7b15fcec2ba5f10657ef9f0014596acf42 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 7 Jul 2020 10:51:38 +0300 Subject: [PATCH 3/5] fix: Expression has changed after it was checked error in loader-bar resolves #4652 --- .../src/lib/components/loader-bar/loader-bar.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts index 512d959c5f..5f2e922263 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts @@ -31,7 +31,7 @@ export class LoaderBarComponent implements OnDestroy, OnInit { color = '#77b6ff'; @Input() - isLoading = false; + isLoading: boolean; progressLevel = 0; @@ -122,7 +122,7 @@ export class LoaderBarComponent implements OnDestroy, OnInit { if (this.interval) this.interval.unsubscribe(); this.progressLevel = 100; - this.isLoading = false; + setTimeout(() => (this.isLoading = false), 0); if (this.timer && !this.timer.closed) return; From 746aa22561bfd2e73235bebefc752be81437998e Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Tue, 7 Jul 2020 10:57:18 +0300 Subject: [PATCH 4/5] add layout to loggedout.cshtml #4647 --- .../Pages/Account/LoggedOut.cshtml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml index 0e7b14236a..abeaf25610 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml @@ -3,16 +3,20 @@ @using Volo.Abp.Account.Localization @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.Account.Web.Pages.Account +@using Volo.Abp.AspNetCore.Mvc.UI.Theming +@inject IThemeManager ThemeManager @inject IHtmlLocalizer L - +@{ + Layout = ThemeManager.CurrentTheme.GetApplicationLayout(); +} @section scripts { - + } @section styles { - + } @@ -28,4 +32,4 @@ } - + \ No newline at end of file From ac62b8cb07cec4b50d8ce6fb8a6ec3bd2baab5fa Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 7 Jul 2020 11:45:13 +0300 Subject: [PATCH 5/5] refactor(theme-shared): run detectChanges in isLoading setter --- .../loader-bar/loader-bar.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts index 5f2e922263..47ff4d057d 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts @@ -24,14 +24,22 @@ import { filter } from 'rxjs/operators'; styleUrls: ['./loader-bar.component.scss'], }) export class LoaderBarComponent implements OnDestroy, OnInit { + protected _isLoading: boolean; + @Input() - containerClass = 'abp-loader-bar'; + set isLoading(value: boolean) { + this._isLoading = value; + this.cdRef.detectChanges(); + } + get isLoading(): boolean { + return this._isLoading; + } @Input() - color = '#77b6ff'; + containerClass = 'abp-loader-bar'; @Input() - isLoading: boolean; + color = '#77b6ff'; progressLevel = 0; @@ -122,7 +130,7 @@ export class LoaderBarComponent implements OnDestroy, OnInit { if (this.interval) this.interval.unsubscribe(); this.progressLevel = 100; - setTimeout(() => (this.isLoading = false), 0); + this.isLoading = false; if (this.timer && !this.timer.closed) return;