Angular UI下拉组件分组项文本支持多语言

UtilCore · UtilCore · commit b9c67f85f548 · 2023-12-06T14:58:09.000+08:00
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>7</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>102</VersionPatch>
+		<VersionPatch>106</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>
diff --git a/src/Util.Scheduling.Hangfire/HangfireExecutionContext.cs b/src/Util.Scheduling.Hangfire/HangfireExecutionContext.cs
@@ -37,6 +37,7 @@ public T GetService<T>() {
     /// </summary>
     /// <typeparam name="T">参数类型</typeparam>
     public T GetData<T>() {
-        return Util.Helpers.Convert.To<T>( _data );
+        var result = Util.Helpers.Convert.To<T>( _data );
+        return result ?? Util.Helpers.Json.ToObject<T>( _data.SafeString() );
     }
 }
diff --git a/src/Util.Ui.NgZorro/Components/Descriptions/Builders/DescriptionItemBuilder.cs b/src/Util.Ui.NgZorro/Components/Descriptions/Builders/DescriptionItemBuilder.cs
@@ -79,7 +79,7 @@ protected override void ConfigContent( Config config ) {
     /// 配置值
     /// </summary>
     private void ConfigValue() {
-        var dataType = _config.GetValue<DataType?>( UiConst.DataType );
+        var dataType = _config.GetValue<DataType?>( UiConst.Type );
         var value = _config.GetValue( UiConst.Value );
         if ( value.IsEmpty() )
             return;
diff --git a/src/Util.Ui.NgZorro/Components/Display/Builders/DisplayBuilder.cs b/src/Util.Ui.NgZorro/Components/Display/Builders/DisplayBuilder.cs
@@ -28,7 +28,7 @@ public DisplayBuilder( Config config ) : base( config, "span" ) {
     /// 配置值
     /// </summary>
     public DisplayBuilder Value() {
-        var dataType = _config.GetValue<DataType?>( UiConst.DataType );
+        var dataType = _config.GetValue<DataType?>( UiConst.Type );
         var value = _config.GetValue( UiConst.Value );
         if ( value.IsEmpty() )
             return this;
diff --git a/src/Util.Ui.NgZorro/Components/Display/DisplayTagHelper.cs b/src/Util.Ui.NgZorro/Components/Display/DisplayTagHelper.cs
@@ -5,6 +5,7 @@
 using Util.Ui.NgZorro.Components.Display.Helpers;
 using Util.Ui.NgZorro.Components.Display.Renders;
 using Util.Ui.NgZorro.Components.Forms.Helpers;
+using Util.Ui.NgZorro.Enums;
 using Util.Ui.Renders;
 
 namespace Util.Ui.NgZorro.Components.Display; 
@@ -27,6 +28,10 @@ public class DisplayTagHelper : FormContainerTagHelperBase {
     /// </summary>
     public string Value { get; set; }
     /// <summary>
+    /// 数据类型
+    /// </summary>
+    public DataType Type { get; set; }
+    /// <summary>
     /// 是否显示左侧的标签,默认不显示,注意:设置For属性时生效
     /// </summary>
     public bool ShowLabel { get; set; }
diff --git a/src/Util.Ui.NgZorro/Components/Display/Helpers/DisplayExpressionLoader.cs b/src/Util.Ui.NgZorro/Components/Display/Helpers/DisplayExpressionLoader.cs
@@ -46,11 +46,11 @@ private bool IsEnabledFormLabel( Config config ) {
     protected virtual void LoadValue( Config config, ModelExpressionInfo info ) {
         config.SetAttribute( UiConst.Value, info.SafePropertyName, false );
         if ( info.IsBool ) {
-            config.SetAttribute( UiConst.DataType, DataType.Bool );
+            config.SetAttribute( UiConst.Type, DataType.Bool );
             return;
         }
         if ( info.IsDate ) {
-            config.SetAttribute( UiConst.DataType, DataType.Date );
+            config.SetAttribute( UiConst.Type, DataType.Date );
             return;
         }
     }
diff --git a/src/Util.Ui.NgZorro/Components/Selects/Builders/SelectBuilder.cs b/src/Util.Ui.NgZorro/Components/Selects/Builders/SelectBuilder.cs
@@ -629,7 +629,7 @@ private void ConfigOptionGroup() {
         var groupBuilder = new OptionGroupBuilder( _config );
         containerBuilder.AppendContent( groupBuilder );
         groupBuilder.NgFor( $"let group of {ExtendId}.optionGroups" );
-        groupBuilder.BindLabel( "group.text" );
+        ConfigGroupBindLabel( groupBuilder );
         var optionBuilder = new OptionBuilder( _config );
         groupBuilder.AppendContent( optionBuilder );
         optionBuilder.NgFor( "let item of group.value" );
@@ -638,4 +638,16 @@ private void ConfigOptionGroup() {
         optionBuilder.Disabled( "item.disabled" );
         AppendContent( containerBuilder );
     }
+
+    /// <summary>
+    /// 配置选项组标签文本
+    /// </summary>
+    private void ConfigGroupBindLabel( OptionGroupBuilder groupBuilder ) {
+        var options = NgZorroOptionsService.GetOptions();
+        if( options.EnableI18n ) {
+            groupBuilder.BindLabel( "group.text|i18n" );
+            return;
+        }
+        groupBuilder.BindLabel( "group.text" );
+    }
 }
diff --git a/test/Util.Ui.NgZorro.Tests/Display/DisplayTagHelperTest.cs b/test/Util.Ui.NgZorro.Tests/Display/DisplayTagHelperTest.cs
@@ -3,6 +3,7 @@
 using Util.Ui.NgZorro.Components.Display;
 using Util.Ui.NgZorro.Components.Forms.Configs;
 using Util.Ui.NgZorro.Configs;
+using Util.Ui.NgZorro.Enums;
 using Util.Ui.NgZorro.Tests.Samples;
 using Util.Ui.TagHelpers;
 using Xunit;
@@ -62,6 +63,35 @@ public void TestValue() {
             Assert.Equal( result.ToString(), GetResult() );
         }
 
+        /// <summary>
+        /// 测试值 - 布尔类型
+        /// </summary>
+        [Fact]
+        public void TestValue_Bool() {
+            _wrapper.SetContextAttribute( UiConst.Value, "a" );
+            _wrapper.SetContextAttribute( UiConst.Type,DataType.Bool );
+            var result = new StringBuilder();
+            result.Append( "<span>" );
+            result.Append( "{{a?'是':'否'}}" );
+            result.Append( "</span>" );
+            Assert.Equal( result.ToString(), GetResult() );
+        }
+
+        /// <summary>
+        /// 测试值 - 布尔类型 - 多语言
+        /// </summary>
+        [Fact]
+        public void TestValue_Bool_I18n() {
+            NgZorroOptionsService.SetOptions( new NgZorroOptions { EnableI18n = true } );
+            _wrapper.SetContextAttribute( UiConst.Value, "a" );
+            _wrapper.SetContextAttribute( UiConst.Type, DataType.Bool );
+            var result = new StringBuilder();
+            result.Append( "<span>" );
+            result.Append( "{{(a?'util.yes':'util.no')|i18n}}" );
+            result.Append( "</span>" );
+            Assert.Equal( result.ToString(), GetResult() );
+        }
+
         /// <summary>
         /// 测试设置内容
         /// </summary>
diff --git a/test/Util.Ui.NgZorro.Tests/Selects/SelectTagHelperTest.Expression.cs b/test/Util.Ui.NgZorro.Tests/Selects/SelectTagHelperTest.Expression.cs
@@ -55,7 +55,7 @@ public void TestFor_Bool_I18n() {
             result.Append( "</nz-option>" );
             result.Append( "</ng-container>" );
             result.Append( "<ng-container *ngIf=\"x_id.isGroup\">" );
-            result.Append( "<nz-option-group *ngFor=\"let group of x_id.optionGroups\" [nzLabel]=\"group.text\">" );
+            result.Append( "<nz-option-group *ngFor=\"let group of x_id.optionGroups\" [nzLabel]=\"group.text|i18n\">" );
             result.Append( "<nz-option *ngFor=\"let item of group.value\" [nzDisabled]=\"item.disabled\" [nzLabel]=\"item.text|i18n\" [nzValue]=\"item.value\">" );
             result.Append( "</nz-option>" );
             result.Append( "</nz-option-group>" );
diff --git a/test/Util.Ui.NgZorro.Tests/Selects/SelectTagHelperTest.Extend.cs b/test/Util.Ui.NgZorro.Tests/Selects/SelectTagHelperTest.Extend.cs
@@ -181,7 +181,7 @@ public void TestData_I18n() {
             result.Append( "</nz-option>" );
             result.Append( "</ng-container>" );
             result.Append( "<ng-container *ngIf=\"x_id.isGroup\">" );
-            result.Append( "<nz-option-group *ngFor=\"let group of x_id.optionGroups\" [nzLabel]=\"group.text\">" );
+            result.Append( "<nz-option-group *ngFor=\"let group of x_id.optionGroups\" [nzLabel]=\"group.text|i18n\">" );
             result.Append( "<nz-option *ngFor=\"let item of group.value\" [nzDisabled]=\"item.disabled\" [nzLabel]=\"item.text|i18n\" [nzValue]=\"item.value\">" );
             result.Append( "</nz-option>" );
             result.Append( "</nz-option-group>" );

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public T GetService<T>() {`
`37`	`37`	`/// </summary>`
`38`	`38`	`/// <typeparam name="T">参数类型</typeparam>`
`39`	`39`	`public T GetData<T>() {`
`40`		`- return Util.Helpers.Convert.To<T>( _data );`
	`40`	`+ var result = Util.Helpers.Convert.To<T>( _data );`
	`41`	`+ return result ?? Util.Helpers.Json.ToObject<T>( _data.SafeString() );`
`41`	`42`	`}`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ private bool IsEnabledFormLabel( Config config ) {`
`46`	`46`	`protected virtual void LoadValue( Config config, ModelExpressionInfo info ) {`
`47`	`47`	`config.SetAttribute( UiConst.Value, info.SafePropertyName, false );`
`48`	`48`	`if ( info.IsBool ) {`
`49`		`- config.SetAttribute( UiConst.DataType, DataType.Bool );`
	`49`	`+ config.SetAttribute( UiConst.Type, DataType.Bool );`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`	`52`	`if ( info.IsDate ) {`
`53`		`- config.SetAttribute( UiConst.DataType, DataType.Date );`
	`53`	`+ config.SetAttribute( UiConst.Type, DataType.Date );`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`	`}`