Browse Source
Merge pull request #19201 from abpframework/auto-merge/rel-8-0/2554
Merge branch rel-8.1 with rel-8.0
pull/19202/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
8 additions and
6 deletions
-
framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
|
|
|
@ -306,10 +306,12 @@ public abstract class AbpCrudPageBase< |
|
|
|
|
|
|
|
protected virtual async Task SearchEntitiesAsync() |
|
|
|
{ |
|
|
|
var currentPage = CurrentPage; |
|
|
|
CurrentPage = 1; |
|
|
|
|
|
|
|
await GetEntitiesAsync(); |
|
|
|
|
|
|
|
if (currentPage == 1) |
|
|
|
{ |
|
|
|
await GetEntitiesAsync(); |
|
|
|
} |
|
|
|
await InvokeAsync(StateHasChanged); |
|
|
|
} |
|
|
|
|
|
|
|
@ -596,12 +598,12 @@ public abstract class AbpCrudPageBase< |
|
|
|
|
|
|
|
await SetEntityActionsAsync(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected virtual ValueTask SetEntityActionsAsync() |
|
|
|
{ |
|
|
|
return ValueTask.CompletedTask; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private async ValueTask TrySetTableColumnsAsync() |
|
|
|
{ |
|
|
|
if (IsDisposed) |
|
|
|
@ -614,7 +616,7 @@ public abstract class AbpCrudPageBase< |
|
|
|
|
|
|
|
protected virtual ValueTask SetTableColumnsAsync() |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
return ValueTask.CompletedTask; |
|
|
|
} |
|
|
|
|
|
|
|
|
