diff --git a/Directory.Packages.props b/Directory.Packages.props index 15f9016131..1157509643 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,7 +23,7 @@ - + diff --git a/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs b/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs index f502d671c9..3d27ab8dd8 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/AbpMudCrudPageBase.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Authorization; @@ -332,7 +333,7 @@ public abstract class AbpMudCrudPageBase< } } - protected virtual async Task> OnDataGridReadAsync(GridState state) + protected virtual async Task> OnDataGridReadAsync(GridState state, CancellationToken cancellationToken = default) { CurrentSorting = state.SortDefinitions .Select(s => _dataGrid.ResolveSortPropertyName(s) + (s.Descending ? " DESC" : "")) @@ -617,7 +618,7 @@ public abstract class AbpMudCrudPageBase< protected virtual async Task ConfirmDeleteAsync(TListViewModel entity) { - var result = await DialogService.ShowMessageBox( + var result = await DialogService.ShowMessageBoxAsync( UiLocalizer["AreYouSure"], GetDeleteConfirmationMessage(entity), yesText: UiLocalizer["Yes"], diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs index 0efd289d64..1c57c40a80 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; +using System.Threading; using System.Threading.Tasks; using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Components; @@ -28,9 +29,9 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase /// Maps SortBy func references to their corresponding property names. /// Used to resolve property names from MudBlazor SortDefinition.SortFunc. /// - private readonly Dictionary, string> _sortFuncToPropertyMap = new(); + private readonly Dictionary, string> _sortFuncToPropertyMap = new(); - [Parameter] public Func, Task>>? ServerData { get; set; } + [Parameter] public Func, CancellationToken, Task>>? ServerData { get; set; } [Parameter] public bool Loading { get; set; } @@ -192,7 +193,7 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase return string.Empty; } - protected virtual Func? GetSortByFunc(TableColumn column) + protected virtual Func? GetSortByFunc(TableColumn column) { if (!column.Sortable) { @@ -221,7 +222,7 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase var parameter = System.Linq.Expressions.Expression.Parameter(typeof(TItem), "x"); System.Linq.Expressions.Expression expression = parameter; - Func? sortFunc = null; + Func? sortFunc = null; foreach (var prop in properties) { var propertyInfo = expression.Type.GetProperty(prop, BindingFlags.Public | BindingFlags.Instance); @@ -237,7 +238,7 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase if (sortFunc == null) { var convertExpression = System.Linq.Expressions.Expression.Convert(expression, typeof(object)); - var lambda = System.Linq.Expressions.Expression.Lambda>(convertExpression, parameter); + var lambda = System.Linq.Expressions.Expression.Lambda>(convertExpression, parameter); sortFunc = lambda.Compile(); } @@ -247,7 +248,7 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase return sortFunc; } - protected virtual Func? GetExtensionPropertySortFunc(TableColumn column) + protected virtual Func? GetExtensionPropertySortFunc(TableColumn column) { if (!column.Sortable || string.IsNullOrWhiteSpace(column.Data)) { @@ -261,7 +262,7 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase } var propertyName = match.Groups[1].Value; - Func sortFunc = item => + Func sortFunc = item => { var entity = item as IHasExtraProperties; return entity?.GetProperty(propertyName) ?? string.Empty; diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor index 295080fa04..8a55cd7751 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor @@ -14,7 +14,7 @@ - + diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor index 1cb4c41718..2c6fbf6c6c 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor @@ -17,7 +17,7 @@ - + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor.cs index cfbee7f16f..c913b05f3c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor.cs @@ -140,7 +140,7 @@ public partial class FeatureManagementModal { try { - var confirmed = await DialogService.ShowMessageBox( + var confirmed = await DialogService.ShowMessageBoxAsync( L["AreYouSure"], L["AreYouSureToResetToDefault"], yesText: L["Yes"], diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs index 0d2b3d4192..9ed212236c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs @@ -144,7 +144,7 @@ public partial class PermissionManagementModal if (!updateDto.Permissions.Any(x => x.IsGranted)) { - var confirmed = await DialogService.ShowMessageBox( + var confirmed = await DialogService.ShowMessageBoxAsync( L["Warning"], L["SaveWithoutAnyPermissionsWarningMessage"], yesText: L["Yes"], diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs index 1df024471e..485451c5bf 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs @@ -291,7 +291,7 @@ public partial class ResourcePermissionManagementModal protected virtual async Task DeleteResourcePermissionAsync(ResourcePermissionGrantInfoDto permission) { - var confirmed = await DialogService.ShowMessageBox( + var confirmed = await DialogService.ShowMessageBoxAsync( L["AreYouSure"], L["ResourcePermissionDeletionConfirmationMessage"], yesText: L["Yes"],