Merge pull request #25368 from abpframework/auto-merge/rel-10-4/4543

Merge branch dev with rel-10.4

framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs

@@ -375,7 +375,7 @@ public abstract class AbpMudCrudPageBase<
 
             if (_createDialog != null)
             {
-                await _createDialog.ShowAsync();
+                await InvokeAsync(() => _createDialog.ShowAsync());
             }
         }
         catch (Exception ex)
@@ -384,13 +384,14 @@ public abstract class AbpMudCrudPageBase<
         }
     }
 
-    protected virtual async Task CloseCreateDialogAsync()
+    protected virtual Task CloseCreateDialogAsync()
     {
         NewEntity = new TCreateViewModel();
         if (_createDialog != null)
         {
-            await _createDialog.CloseAsync();
+            return InvokeAsync(() => _createDialog.CloseAsync());
         }
+        return Task.CompletedTask;
     }
 
     protected virtual async Task OpenEditDialogAsync(TListViewModel entity)
@@ -406,7 +407,7 @@ public abstract class AbpMudCrudPageBase<
 
             if (_editDialog != null)
             {
-                await _editDialog.ShowAsync();
+                await InvokeAsync(() => _editDialog.ShowAsync());
             }
         }
         catch (Exception ex)
@@ -440,12 +441,13 @@ public abstract class AbpMudCrudPageBase<
         return ObjectMapper.Map<TUpdateViewModel, TUpdateInput>(updateViewModel);
     }
 
-    protected virtual async Task CloseEditDialogAsync()
+    protected virtual Task CloseEditDialogAsync()
     {
         if (_editDialog != null)
         {
-            await _editDialog.CloseAsync();
+            return InvokeAsync(() => _editDialog.CloseAsync());
         }
+        return Task.CompletedTask;
     }
 
     protected virtual async Task CreateEntityAsync()

framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs

@@ -61,7 +61,7 @@ public partial class AbpMudExtensibleDataGrid<TItem> : ComponentBase
     {
         if (_dataGrid != null && ServerData != null)
         {
-            await _dataGrid.ReloadServerData();
+            await InvokeAsync(() => _dataGrid.ReloadServerData());
         }
     }
 

framework/src/Volo.Abp.MudBlazorUI/Components/MudEntityAction.razor.cs

@@ -69,7 +69,7 @@ public partial class MudEntityAction<TItem> : ComponentBase
         {
             if (await UiMessageService.Confirm(ConfirmationMessage()))
             {
-                await InvokeAsync(async () => await Clicked.InvokeAsync());
+                await InvokeAsync(() => Clicked.InvokeAsync());
             }
         }
         else

framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudLookupExtensionProperty.razor.cs

@@ -58,7 +58,7 @@ public partial class MudLookupExtensionProperty<TEntity, TResourceType>
         if (firstRender)
         {
             LookupItems = await GetLookupItemsAsync(string.Empty);
-            StateHasChanged();
+            await InvokeAsync(StateHasChanged);
         }
     }