diff --git a/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs b/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs index 9bc201bdca..e0f9e05e23 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs @@ -180,6 +180,7 @@ public abstract class AbpMudCrudPageBase< protected virtual int PageSize { get; set; } = LimitedResultRequestDto.DefaultMaxResultCount; + protected IReadOnlyList Entities = Array.Empty(); protected int CurrentPage = 1; protected string CurrentSorting = default!; protected TGetListInput GetListInput = new TGetListInput(); @@ -349,6 +350,7 @@ public abstract class AbpMudCrudPageBase< await UpdateGetListInputAsync(); var result = await AppService.GetListAsync(GetListInput); var items = MapToListViewModel(result.Items); + Entities = items; await InvokeAsync(StateHasChanged); @@ -599,7 +601,17 @@ public abstract class AbpMudCrudPageBase< protected virtual async Task OnDeletedEntityAsync() { - if (_dataGrid != null) + if (Entities.Count == 1 && CurrentPage > 1) + { + // The data grid loads the previous page by itself when it receives the new CurrentPage + CurrentPage -= 1; + await InvokeAsync(StateHasChanged); + if (_dataGrid != null) + { + await InvokeAsync(() => _dataGrid.WaitForServerDataAsync()); + } + } + else if (_dataGrid != null) { await InvokeAsync(() => _dataGrid.ReloadServerDataAsync()); } diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor index 2bf9b47935..50575c8049 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor @@ -2,7 +2,7 @@ @using MudBlazor @using Volo.Abp.Data - @@ -71,12 +71,12 @@ @if (column.ValueConverter == null) {