From bf2422a549d6f56704c8ba40217a22ec5eb0a3e3 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Sun, 20 Feb 2022 16:19:22 +0100 Subject: [PATCH] Migrate new naming schema --- .../PageToolbars/PageToolbarExtensions.cs | 4 ++-- framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs | 4 ++-- framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 2 +- .../Components/AbpExtensibleDataGrid.razor | 2 +- .../src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs | 4 ++-- .../Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs | 2 +- .../Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor | 2 +- .../Themes/Basic/LoginDisplay.razor | 2 +- .../Themes/Basic/LoginDisplay.razor | 2 +- .../Components/FeatureManagementModal.razor | 2 +- .../Components/PermissionManagementModal.razor | 2 +- .../Pages/SettingManagement/SettingManagement.razor | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs index dd2063d0cf..9d9448d281 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs @@ -47,7 +47,7 @@ public static class PageToolbarExtensions string text, Func clicked, object icon = null, - Color color = Color.Primary, + Color color = null, bool disabled = false, int order = 0, string requiredPolicyName = null) @@ -55,7 +55,7 @@ public static class PageToolbarExtensions toolbar.AddComponent( new Dictionary { - { nameof(ToolbarButton.Color), color}, + { nameof(ToolbarButton.Color), color ?? Color.Primary}, { nameof(ToolbarButton.Text), text}, { nameof(ToolbarButton.Disabled), disabled}, { nameof(ToolbarButton.Icon), icon}, diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs index 0a40a412ad..5a66e1b247 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs @@ -23,8 +23,8 @@ public class AbpBlazoriseUIModule : AbpModule { context.Services.AddBlazorise(options => { - options.DelayTextOnKeyPress = true; - options.DelayTextOnKeyPressInterval = 800; + options.Debounce = true; + options.DebounceInterval = 800; }); context.Services.AddSingleton(typeof(AbpBlazorMessageLocalizerHelper<>)); diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs index f5d06f5ba1..f777eb2cdc 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs @@ -307,7 +307,7 @@ public abstract class AbpCrudPageBase< protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs e) { CurrentSorting = e.Columns - .Where(c => c.SortDirection != SortDirection.None) + .Where(c => c.SortDirection != SortDirection.Default) .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : "")) .JoinAsString(","); CurrentPage = e.Page; diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor index 39a86456b8..9ec408cc41 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor @@ -52,7 +52,7 @@ { Color.Warning, AlertType.Danger => Color.Danger, AlertType.Dark => Color.Dark, - AlertType.Default => Color.None, + AlertType.Default => Color.Default, AlertType.Light => Color.Light, AlertType.Primary => Color.Primary, AlertType.Secondary => Color.Secondary, - _ => Color.None, + _ => Color.Default, }; return color; diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs index 26467f7707..f313591042 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs @@ -51,7 +51,7 @@ public partial class UiPageProgress : ComponentBase, IDisposable UiPageProgressType.Success => Color.Success, UiPageProgressType.Warning => Color.Warning, UiPageProgressType.Error => Color.Danger, - _ => Color.None, + _ => Color.Default, }; } } diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor index a2f7ca4f31..a3a4e76b58 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor +++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor @@ -4,7 +4,7 @@ - + @L["ProfileTab:Password"] @L["ProfileTab:PersonalInfo"] diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor index 0fc99ce980..b2af7c2e1d 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -11,7 +11,7 @@ - + @if (CurrentTenant.Name != null) { @CurrentTenant.Name\@CurrentUser.UserName diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor index 8512815a26..0715560b1c 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -11,7 +11,7 @@ - + @if (CurrentTenant.Name != null) { @CurrentTenant.Name\@CurrentUser.UserName diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor index 98f81a3237..6b9690baa3 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor @@ -15,7 +15,7 @@ } else { - + @foreach (var group in Groups) { diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor index 1fcd5eb3d3..681ccaa352 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor @@ -17,7 +17,7 @@ @if (_groups != null) { - + @foreach (var group in _groups) { diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor index bf49fe61c8..b37dbe6b4e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor @@ -11,7 +11,7 @@ - + @foreach (var group in SettingComponentCreationContext.Groups) {