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
parent
commit
33af479062
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

14
framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@ -306,10 +306,12 @@ public abstract class AbpCrudPageBase<
protected virtual async Task SearchEntitiesAsync() protected virtual async Task SearchEntitiesAsync()
{ {
var currentPage = CurrentPage;
CurrentPage = 1; CurrentPage = 1;
if (currentPage == 1)
await GetEntitiesAsync(); {
await GetEntitiesAsync();
}
await InvokeAsync(StateHasChanged); await InvokeAsync(StateHasChanged);
} }
@ -596,12 +598,12 @@ public abstract class AbpCrudPageBase<
await SetEntityActionsAsync(); await SetEntityActionsAsync();
} }
protected virtual ValueTask SetEntityActionsAsync() protected virtual ValueTask SetEntityActionsAsync()
{ {
return ValueTask.CompletedTask; return ValueTask.CompletedTask;
} }
private async ValueTask TrySetTableColumnsAsync() private async ValueTask TrySetTableColumnsAsync()
{ {
if (IsDisposed) if (IsDisposed)
@ -614,7 +616,7 @@ public abstract class AbpCrudPageBase<
protected virtual ValueTask SetTableColumnsAsync() protected virtual ValueTask SetTableColumnsAsync()
{ {
return ValueTask.CompletedTask; return ValueTask.CompletedTask;
} }

Loading…
Cancel
Save