From c3b461aa7cc7c4c185a1aca1e1a049e2bfc912e1 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 12 Apr 2026 16:47:58 +0800 Subject: [PATCH] feat: update MudBlazor bundling and enhance email settings UI components --- ...AspNetCoreComponentsServerThemingMudBlazorModule.cs | 4 ++-- ...dles.cs => BlazorServerMudBlazorStandardBundles.cs} | 2 +- .../MudDateTimeExtensionProperty.razor.cs | 2 +- .../MudDateTimeOffsetExtensionProperty.razor.cs | 2 +- .../MudSelectExtensionProperty.razor.cs | 5 +---- .../Themes/Basic/NavMenu.razor.cs | 9 ++++++--- .../Themes/Basic/NavToolbar.razor | 9 ++++++--- .../Components/FeatureManagementModal.razor | 2 +- .../EmailSettingGroupViewComponent.razor | 10 +++++----- 9 files changed, 24 insertions(+), 21 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/{BlazorStandardBundles.cs => BlazorServerMudBlazorStandardBundles.cs} (84%) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs index ecee654648..7d7a784256 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs @@ -20,14 +20,14 @@ public class AbpAspNetCoreComponentsServerThemingMudBlazorModule : AbpModule { options .StyleBundles - .Add(BlazorStandardBundles.Styles.Global, bundle => + .Add(BlazorServerMudBlazorStandardBundles.Styles.Global, bundle => { bundle.AddContributors(typeof(BlazorServerMudBlazorStyleContributor)); }); options .ScriptBundles - .Add(BlazorStandardBundles.Scripts.Global, bundle => + .Add(BlazorServerMudBlazorStandardBundles.Scripts.Global, bundle => { bundle.AddContributors(typeof(BlazorServerMudBlazorScriptContributor)); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorStandardBundles.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorServerMudBlazorStandardBundles.cs similarity index 84% rename from framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorStandardBundles.cs rename to framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorServerMudBlazorStandardBundles.cs index 54345b289c..1b463f8871 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorStandardBundles.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Bundling/BlazorServerMudBlazorStandardBundles.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.Bundling; -public class BlazorStandardBundles +public class BlazorServerMudBlazorStandardBundles { public static class Styles { diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeExtensionProperty.razor.cs b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeExtensionProperty.razor.cs index 06722f6226..00de58baa5 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeExtensionProperty.razor.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeExtensionProperty.razor.cs @@ -50,7 +50,7 @@ public partial class MudDateTimeExtensionProperty return dataFormatString.Replace("{0:", "").Replace("}", ""); } - return PropertyInfo.IsDate() ? "yyyy-MM-dd" : "yyyy-MM-dd"; + return PropertyInfo.IsDate() ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm"; } protected string GetTimeLabel() diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeOffsetExtensionProperty.razor.cs b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeOffsetExtensionProperty.razor.cs index f0bea16613..ee2a965004 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeOffsetExtensionProperty.razor.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudDateTimeOffsetExtensionProperty.razor.cs @@ -83,7 +83,7 @@ public partial class MudDateTimeOffsetExtensionProperty return dataFormatString.Replace("{0:", "").Replace("}", ""); } - return PropertyInfo.IsDate() ? "yyyy-MM-dd" : "yyyy-MM-dd"; + return PropertyInfo.IsDate() ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm"; } protected string GetTimeLabel() diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudSelectExtensionProperty.razor.cs b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudSelectExtensionProperty.razor.cs index 692e989472..ee9f5b2bb7 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudSelectExtensionProperty.razor.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/ObjectExtending/MudSelectExtensionProperty.razor.cs @@ -52,10 +52,7 @@ public partial class MudSelectExtensionProperty var isNullableType = Nullable.GetUnderlyingType(PropertyInfo.Type!) != null; if (!isNullableType) { - var enumType = isNullableType - ? Nullable.GetUnderlyingType(PropertyInfo.Type)! - : PropertyInfo.Type; - SelectedValue = (int)enumType.GetEnumValues().GetValue(0)!; + SelectedValue = (int)PropertyInfo.Type.GetEnumValues().GetValue(0)!; } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor.cs index 80a534f791..8387850970 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor.cs @@ -22,10 +22,13 @@ public partial class NavMenu : IDisposable ApplicationConfigurationChangedService.Changed += ApplicationConfigurationChanged; } - private async void ApplicationConfigurationChanged() + private void ApplicationConfigurationChanged() { - Menu = await MenuManager.GetMainMenuAsync(); - await InvokeAsync(StateHasChanged); + _ = InvokeAsync(async () => + { + Menu = await MenuManager.GetMainMenuAsync(); + StateHasChanged(); + }); } public void Dispose() diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavToolbar.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavToolbar.razor index 039de58e52..91ded03c1e 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavToolbar.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavToolbar.razor @@ -44,10 +44,13 @@ } } - private async void ApplicationConfigurationChanged() + private void ApplicationConfigurationChanged() { - await GetToolbarItemRendersAsync(); - await InvokeAsync(StateHasChanged); + _ = InvokeAsync(async () => + { + await GetToolbarItemRendersAsync(); + StateHasChanged(); + }); } public void Dispose() diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor index 1e32c68f3a..57831e2598 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor @@ -5,7 +5,7 @@ @using Volo.Abp.FeatureManagement.Localization @inherits AbpFeatureManagementComponentBase - + @L["Features"]@ProviderKeyDisplayName diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor index c100b424af..e306bebe83 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor @@ -5,7 +5,7 @@ @if (EmailSettings != null) { - + - - @if (!EmailSettings.SmtpUseDefaultCredentials) @@ -58,7 +58,7 @@ @if (HasSendTestEmailPermission) { @L["SendTestEmail"] @@ -73,7 +73,7 @@ @if (HasSendTestEmailPermission) { - + @L["SendTestEmail"]