Browse Source

Merge branch 'master' of https://github.com/abpframework/abp into dev

pull/4672/head
mehmet-erim 6 years ago
parent
commit
8e2616277b
  1. 4
      docs/zh-Hans/Repositories.md
  2. 2
      docs/zh-Hans/docs-nav.json
  3. 6
      modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml
  4. 14
      npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts

4
docs/zh-Hans/Repositories.md

@ -248,6 +248,4 @@ ABP框架使用实际数据库提供程序的API异步执行查询.虽然这不
* 如果你正在构建一个没有数据库提供程序集成包的**可重用库**,但是在某些情况下需要执行 `IQueryable<T>`对象.
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`.
例如,ABP框架在 `CrudAppService` 基类中(参阅[应用程序](Application-Services.md)文档)使用 `IAsyncQueryableExecuter`.

2
docs/zh-Hans/docs-nav.json

@ -34,7 +34,7 @@
"path": "Tutorials/Part-1.md"
},
{
"text": "第一章: 增删改查操作",
"text": "第二章: 增删改查操作",
"path": "Tutorials/Part-2.md"
},
{

6
modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml

@ -11,12 +11,12 @@
}
@section scripts {
<abp-script-bundle name="@typeof(LoggedOutModel).FullName">
<abp-script src="/Pages/Account/LoggedOut.js"/>
<abp-script src="/Pages/Account/LoggedOut.js" />
</abp-script-bundle>
}
@section styles {
<abp-style src="/Pages/Account/LoggedOut.css"/>
<abp-style src="/Pages/Account/LoggedOut.css" />
}
<abp-card>
@ -32,4 +32,4 @@
<iframe class="signout logoutiframe" src="@Model.SignOutIframeUrl"></iframe>
}
</abp-card-body>
</abp-card>
</abp-card>

14
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 = false;
color = '#77b6ff';
progressLevel = 0;

Loading…
Cancel
Save