diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/EnumHelper.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/EnumHelper.cs index a3d26fd317..a42d0b0362 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/EnumHelper.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/EnumHelper.cs @@ -9,7 +9,7 @@ public static class EnumHelper [Obsolete("Use IAbpEnumLocalizer instead.")] public static string GetLocalizedMemberName(Type enumType, object value, IStringLocalizerFactory stringLocalizerFactory) { - var memberName = enumType.GetEnumName(value); + var memberName = enumType.GetEnumName(value) ?? Enum.ToObject(enumType, value).ToString(); var localizedMemberName = AbpInternalLocalizationHelper.LocalizeWithFallback( new[] { diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpEnumLocalizer.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpEnumLocalizer.cs index b2acb3d072..395c21e58d 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpEnumLocalizer.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpEnumLocalizer.cs @@ -26,7 +26,7 @@ public class AbpEnumLocalizer : IAbpEnumLocalizer, ITransientDependency protected virtual string GetStringInternal(Type enumType, object enumValue, params IStringLocalizer?[] specifyLocalizers) { - var memberName = enumType.GetEnumName(enumValue)!; + var memberName = enumType.GetEnumName(enumValue) ?? Enum.ToObject(enumType, enumValue).ToString()!; var localizedString = GetStringOrNull( specifyLocalizers, new[] diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpEnumLocalizer_Tests.cs b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpEnumLocalizer_Tests.cs index c53236809f..b13f088fea 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpEnumLocalizer_Tests.cs +++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpEnumLocalizer_Tests.cs @@ -37,6 +37,24 @@ public class AbpEnumLocalizer_Tests : AbpIntegratedTest(BookType.Biography, specifyLocalizer).ShouldBe("Biography from ValidationResource"); } } + + [Fact] + public void GetString_With_Undefined_Value_Test() + { + using (CultureHelper.Use("en")) + { + _enumLocalizer.GetString(42).ShouldBe("42"); + _enumLocalizer.GetString((BookType)42).ShouldBe("42"); + _enumLocalizer.GetString(BookPermissions.Read | BookPermissions.Write).ShouldBe("Read, Write"); + _enumLocalizer.GetString(3).ShouldBe("Read, Write"); + + var specifyLocalizer = new[] + { + GetRequiredService().Create() + }; + _enumLocalizer.GetString(42, specifyLocalizer).ShouldBe("42"); + } + } } enum BookType @@ -45,3 +63,11 @@ enum BookType Adventure, Biography, } + +[System.Flags] +enum BookPermissions +{ + None = 0, + Read = 1, + Write = 2, +}