feat(Localizer): add GetStringFromBaseType logic support base type (#6006)

* 属性自动尝试从父类中获取json语言资源

* test: 更新单元测试

* refactor: 重构代码

* 增加单元测试

* revert: 撤销更改

* test: 更新单元测试

* refactor: 更新单元测试

* chore: bump version 9.6.2-beta02

Co-Authored-By: Diego2098 <[email protected]>

---------

Co-Authored-By: Argo Zhang <[email protected]>

Author: kimdiego2098

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.2-beta01</Version>
+    <Version>9.6.2-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Localization/Json/JsonStringLocalizer.cs

@@ -119,7 +119,36 @@ public override LocalizedString this[string name]
             }
             else
             {
-                HandleMissingResourceItem(name);
+                // 如果没有找到资源信息则尝试从父类中查找
+                ret ??= GetStringFromBaseType(name);
+
+                if (ret is null)
+                {
+                    // 加入缺失资源信息缓存中
+                    HandleMissingResourceItem(name);
+                }
+            }
+        }
+        return ret;
+    }
+
+    private string? GetStringFromBaseType(string name)
+    {
+        string? ret = null;
+        var type = Assembly.GetType(typeName);
+        var propertyInfo = type?.GetPropertyByName(name);
+        if (propertyInfo is { DeclaringType: not null })
+        {
+            var baseType = propertyInfo.DeclaringType;
+            if (baseType != type)
+            {
+                var baseAssembly = baseType.Assembly;
+                var localizerStrings = MegerResolveLocalizers(CacheManager.GetAllStringsByTypeName(baseAssembly, baseType.FullName!));
+                var l = localizerStrings.Find(i => i.Name == name);
+                if (l is { ResourceNotFound: false })
+                {
+                    ret = l.Value;
+                }
             }
         }
         return ret;

test/UnitTest/Components/DisplayTest.cs

@@ -56,15 +56,15 @@ public async Task LookupService_Ok()
         {
             pb.Add(a => a.LookupService, new MockLookupService());
         });
-        await Task.Delay(20);
+        await Task.Delay(50);
         Assert.Contains("Test1,Test2", cut.Markup);
 
         cut.SetParametersAndRender(pb =>
         {
             pb.Add(a => a.LookupServiceKey, null);
             pb.Add(a => a.Lookup, new List<SelectedItem> { new("v1", "Test3"), new("v2", "Test4") });
         });
-        await Task.Delay(20);
+        await Task.Delay(50);
         Assert.Contains("Test3,Test4", cut.Markup);
     }
 

test/UnitTest/Localization/JsonStringLocalizerTest.cs

@@ -237,6 +237,23 @@ public void GetAllStrings_FromJson()
         Assert.Empty(resolve.GetAllStringsByCulture(true));
     }
 
+    [Fact]
+    public void GetString_FromBaseTypeJson()
+    {
+        var sc = new ServiceCollection();
+        sc.AddConfiguration();
+        sc.AddBootstrapBlazor();
+
+        var provider = sc.BuildServiceProvider();
+        var localizer = provider.GetRequiredService<IStringLocalizer<SubFoo>>();
+        Assert.Equal("姓名", localizer["Name"].Value);
+    }
+
+    class SubFoo : Foo
+    {
+
+    }
+
     [Fact]
     public void GetAllStrings_FromResolver()
     {

test/UnitTest/Services/FullScreenServiceTest.cs

@@ -91,7 +91,7 @@ public void FullScreenOption_Ok()
         var option = new FullScreenOption() { Element = new("test01", null), Id = "test", Selector = "test-selector" };
         Assert.NotNull(option.Id);
         Assert.Null(option.Element.Context);
-        Assert.Null(option.Selector);
+        Assert.NotNull(option.Selector);
     }
 
     private class MockFullScreen : ComponentBase