修复 ng zorro 单选框 taghelper 必填项验证错误

dotnetcore · Nov 4, 2023 · 4877edf · 4877edf
1 parent d0048b9
commit 4877edf
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>7</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>66</VersionPatch>
+		<VersionPatch>67</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>

diff --git a/src/Util.Ui.NgZorro/Components/Radios/Builders/RadioBuilder.cs b/src/Util.Ui.NgZorro/Components/Radios/Builders/RadioBuilder.cs
@@ -100,7 +100,9 @@ public RadioBuilder Events() {
     /// </summary>
     public override void Config() {
         base.ConfigBase( _config );
-        ConfigForm().Name().AutoFocus().Disabled().Value()
+        NgModel().FormControl().SpaceItem().OnModelChange()
+            .TableEdit()
+            .Name().AutoFocus().Disabled().Value()
             .Label().Events();
     }
 

diff --git a/src/Util.Ui.NgZorro/Components/Radios/Renders/RadioRender.cs b/src/Util.Ui.NgZorro/Components/Radios/Renders/RadioRender.cs
@@ -59,13 +59,11 @@ private TagBuilder GetRadioGroupBuilder() {
         if ( _shareConfig.IsAutoCreateRadioGroup != true )
             return new EmptyContainerTagBuilder();
         var groupBuilder = new RadioGroupBuilder( _config );
-        groupBuilder.SelectExtend();
-        groupBuilder.Data();
-        groupBuilder.Url();
-        groupBuilder.NgModel();
-        groupBuilder.Name();
-        groupBuilder.OnModelChange();
-        return groupBuilder;
+        return groupBuilder.SelectExtend()
+            .Data().Url().NgModel()
+            .Name().OnModelChange()
+            .Required().RequiredMessage()
+            .ValidationExtend();
     }
 
     /// <summary>

diff --git a/test/Util.Ui.NgZorro.Tests/Radios/RadioTagHelperTest.Expression.cs b/test/Util.Ui.NgZorro.Tests/Radios/RadioTagHelperTest.Expression.cs
@@ -35,7 +35,7 @@ public void TestFor_Bool() {
         /// 测试属性表达式 - 布尔值 - 多语言
         /// </summary>
         [Fact]
-        public void TestFor_Bool_I18n() {
+        public void TestFor_Bool_2() {
             NgZorroOptionsService.SetOptions( new NgZorroOptions { EnableI18n = true } );
             _wrapper.SetExpression( t => t.Enabled );
             var result = new StringBuilder();
@@ -56,6 +56,32 @@ public void TestFor_Bool_I18n() {
             Assert.Equal( result.ToString(), GetResult() );
         }
 
+        /// <summary>
+        /// 测试属性表达式 - 布尔值 - 必填项
+        /// </summary>
+        [Fact]
+        public void TestFor_Bool_3() {
+            _wrapper.SetExpression( t => t.IsRequired );
+            var result = new StringBuilder();
+            result.Append( "<nz-form-item>" );
+            result.Append( "<nz-form-label [nzRequired]=\"true\">" );
+            result.Append( "必填项" );
+            result.Append( "</nz-form-label>" );
+            result.Append( "<nz-form-control [nzErrorTip]=\"vt_id\">" );
+            result.Append( "<nz-radio-group #v_id=\"xValidationExtend\" #x_id=\"xSelectExtend\" displayName=\"必填项\" name=\"isRequired\" nzName=\"isRequired\" " );
+            result.Append( "requiredMessage=\"必须填写\" x-select-extend=\"\" x-validation-extend=\"\" [(ngModel)]=\"model.isRequired\" " );
+            result.Append( "[data]=\"[{'text':'是','value':true,'sortId':1},{'text':'否','value':false,'sortId':2}]\" [required]=\"true\"" );
+            result.Append( ">" );
+            result.Append( "<label *ngFor=\"let item of x_id.options\" nz-radio=\"\" [nzDisabled]=\"item.disabled\" [nzValue]=\"item.value\">" );
+            result.Append( "{{item.text}}" );
+            result.Append( "</label>" );
+            result.Append( "</nz-radio-group>" );
+            result.Append( "<ng-template #vt_id=\"\">{{v_id.getErrorMessage()}}</ng-template>" );
+            result.Append( "</nz-form-control>" );
+            result.Append( "</nz-form-item>" );
+            Assert.Equal( result.ToString(), GetResult() );
+        }
+
         /// <summary>
         /// 测试属性表达式 - 枚举值
         /// </summary>

diff --git a/test/Util.Ui.NgZorro.Tests/Samples/Customer.cs b/test/Util.Ui.NgZorro.Tests/Samples/Customer.cs
@@ -81,6 +81,12 @@ public class Customer {
         [Description( "启用" )]
         public bool Enabled { get; set; }
         /// <summary>
+        /// 布尔必填项
+        ///</summary>
+        [Description( "必填项" )]
+        [Required(ErrorMessage = "必须填写")]
+        public bool IsRequired { get; set; }
+        /// <summary>
         /// 正则表达式
         ///</summary>
         [Description( "正则表达式" )]