From fd27c4247000c22c2f540d068aa0a22e91477367 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 10 Dec 2020 16:13:31 +0800 Subject: [PATCH 1/4] Added OnSearchAsync method --- .../src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs index 30a5c8ad26..16b382ecf7 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs @@ -175,7 +175,7 @@ namespace Volo.Abp.BlazoriseUI protected virtual int PageSize { get; } = LimitedResultRequestDto.DefaultMaxResultCount; - protected int CurrentPage; + protected int CurrentPage = 1; protected string CurrentSorting; protected int? TotalCount; protected TGetListInput GetListInput = new TGetListInput(); @@ -255,7 +255,7 @@ namespace Volo.Abp.BlazoriseUI if (GetListInput is IPagedResultRequest pagedResultRequestInput) { - pagedResultRequestInput.SkipCount = CurrentPage * PageSize; + pagedResultRequestInput.SkipCount = (CurrentPage - 1) * PageSize; } if (GetListInput is ILimitedResultRequest limitedResultRequestInput) @@ -266,13 +266,22 @@ namespace Volo.Abp.BlazoriseUI return Task.CompletedTask; } + protected virtual async Task OnSearchAsync() + { + CurrentPage = 1; + + await GetEntitiesAsync(); + + StateHasChanged(); + } + protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs e) { CurrentSorting = e.Columns .Where(c => c.Direction != SortDirection.None) .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : "")) .JoinAsString(","); - CurrentPage = e.Page - 1; + CurrentPage = e.Page; await GetEntitiesAsync(); From b00ef7570fd3a38f4ac0fdbea43baa3b002bff02 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 10 Dec 2020 22:56:04 +0800 Subject: [PATCH 2/4] Rename OnSearchAsync to SearchEntitiesAsync --- framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs index 16b382ecf7..612034af19 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs @@ -266,7 +266,7 @@ namespace Volo.Abp.BlazoriseUI return Task.CompletedTask; } - protected virtual async Task OnSearchAsync() + protected virtual async Task SearchEntitiesAsync() { CurrentPage = 1; From bbcd8d53fe659d3a2efdcffad8aabe0b6a27a762 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 11 Dec 2020 10:59:10 +0800 Subject: [PATCH 3/4] Update blazor document --- docs/en/Tutorials/Part-2.md | 1 + docs/en/Tutorials/Part-3.md | 1 + docs/en/Tutorials/Part-9.md | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/en/Tutorials/Part-2.md b/docs/en/Tutorials/Part-2.md index 7bc42b1fc9..1a1d29f7d1 100644 --- a/docs/en/Tutorials/Part-2.md +++ b/docs/en/Tutorials/Part-2.md @@ -604,6 +604,7 @@ Open the `Books.razor` and replace the content as the following: diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md index 2106e82069..486475ff9d 100644 --- a/docs/en/Tutorials/Part-3.md +++ b/docs/en/Tutorials/Part-3.md @@ -1429,6 +1429,7 @@ Here the complete code to create the book management CRUD page, that has been de diff --git a/docs/en/Tutorials/Part-9.md b/docs/en/Tutorials/Part-9.md index 65a59f39e1..b8b198f9dc 100644 --- a/docs/en/Tutorials/Part-9.md +++ b/docs/en/Tutorials/Part-9.md @@ -868,6 +868,7 @@ Create a new Razor Component Page, `/Pages/Authors.razor`, in the `Acme.BookStor From a29e91df93e78ba7483024115b19694e166e406f Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 11 Dec 2020 17:19:55 +0800 Subject: [PATCH 4/4] Make GuidGenerator in EfCoreRepository public. Resolve #6586 --- .../Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs index d75133cb07..0d44fd1249 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore private readonly IDbContextProvider _dbContextProvider; private readonly Lazy> _entityOptionsLazy; - protected virtual IGuidGenerator GuidGenerator { get; set; } + public virtual IGuidGenerator GuidGenerator { get; set; } public EfCoreRepository(IDbContextProvider dbContextProvider) {