feat(IValidateComponent): update ToggleMessage return value as Task (#6112)

ArgoZhang · web-flow · commit 7065ff2df1ae · 2025-05-29T10:15:01.000+08:00
* chore: bump version 9.7.0

* refactor: ToggleMessage 方法更改为 Task

# Conflicts:
#	src/BootstrapBlazor/Components/Validate/IValidateComponent.cs
#	src/BootstrapBlazor/Components/Validate/ValidateBase.cs

* refactor: 增加 await 关键字

* refactor: 更改为异步方法
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.5-beta03</Version>
+    <Version>9.7.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs
@@ -454,7 +454,7 @@ private async Task SetValue()
             var validationResults = new List<ValidationResult>();
 
             await ValidatePropertyAsync(CurrentValue, validationContext, validationResults);
-            ToggleMessage(validationResults);
+            await ToggleMessage(validationResults);
         }
 
         if (OnSelectedItemsChanged != null)
diff --git a/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor.cs b/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor.cs
@@ -430,7 +430,7 @@ private async Task SetValue()
             var validationResults = new List<ValidationResult>();
 
             await ValidatePropertyAsync(CurrentValue, validationContext, validationResults);
-            ToggleMessage(validationResults);
+            await ToggleMessage(validationResults);
         }
 
         if (OnSelectedItemsChanged != null)
diff --git a/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs b/src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs
@@ -317,7 +317,7 @@ private async Task TransferItems(List<SelectedItem> source, List<SelectedItem> t
                 var validationResults = new List<ValidationResult>();
 
                 await ValidatePropertyAsync(RightItems, validationContext, validationResults);
-                ToggleMessage(validationResults);
+                await ToggleMessage(validationResults);
             }
         }
     }
diff --git a/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/InputUpload.razor.cs
@@ -153,7 +153,7 @@ private async Task OnDeleteFile()
     /// <inheritdoc/>
     /// </summary>
     /// <param name="results"></param>
-    public override void ToggleMessage(IEnumerable<ValidationResult> results)
+    public override Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)
     {
         if (results.Any())
         {
@@ -166,5 +166,6 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)
             IsValid = true;
         }
         OnValidate(IsValid);
+        return Task.CompletedTask;
     }
 }
diff --git a/src/BootstrapBlazor/Components/Upload/UploadBase.cs b/src/BootstrapBlazor/Components/Upload/UploadBase.cs
@@ -57,10 +57,10 @@ public abstract class UploadBase<TValue> : ValidateBase<TValue>, IUpload
     public Func<UploadFile, Task>? OnChange { get; set; }
 
     /// <summary>
-    /// 显示/隐藏验证结果方法
+    /// <inheritdoc/>
     /// </summary>
     /// <param name="results"></param>
-    public override void ToggleMessage(IEnumerable<ValidationResult> results)
+    public override Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)
     {
         if (FieldIdentifier != null)
         {
@@ -84,6 +84,7 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)
             }
             OnValidate(IsValid);
         }
+        return Task.CompletedTask;
     }
 
     /// <summary>
diff --git a/src/BootstrapBlazor/Components/Validate/IValidateComponent.cs b/src/BootstrapBlazor/Components/Validate/IValidateComponent.cs
@@ -33,5 +33,5 @@ public interface IValidateComponent
     /// 显示或者隐藏提示信息方法
     /// </summary>
     /// <param name="results"></param>
-    void ToggleMessage(IEnumerable<ValidationResult> results);
+    Task ToggleMessage(IReadOnlyCollection<ValidationResult> results);
 }
diff --git a/src/BootstrapBlazor/Components/Validate/ValidateBase.cs b/src/BootstrapBlazor/Components/Validate/ValidateBase.cs
@@ -460,7 +460,7 @@ private void ValidateType(ValidationContext context, List<ValidationResult> resu
     /// 显示/隐藏验证结果方法
     /// </summary>
     /// <param name="results"></param>
-    public virtual void ToggleMessage(IEnumerable<ValidationResult> results)
+    public virtual Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)
     {
         if (FieldIdentifier != null)
         {
@@ -481,6 +481,7 @@ public virtual void ToggleMessage(IEnumerable<ValidationResult> results)
 
         // 必须刷新一次 UI 保证状态正确
         StateHasChanged();
+        return Task.CompletedTask;
     }
 
     private JSModule? ValidateModule { get; set; }
diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs
@@ -169,20 +169,20 @@ internal void AddValidator((string FieldName, Type ModelType) key, (FieldIdentif
     /// </summary>
     /// <param name="expression"></param>
     /// <param name="errorMessage">错误描述信息，可为空，为空时查找资源文件</param>
-    public void SetError<TModel>(Expression<Func<TModel, object?>> expression, string errorMessage)
+    public async Task SetError<TModel>(Expression<Func<TModel, object?>> expression, string errorMessage)
     {
         switch (expression.Body)
         {
             case UnaryExpression { Operand: MemberExpression mem }:
-                InternalSetError(mem, errorMessage);
+                await InternalSetError(mem, errorMessage);
                 break;
             case MemberExpression exp:
-                InternalSetError(exp, errorMessage);
+                await InternalSetError(exp, errorMessage);
                 break;
         }
     }
 
-    private void InternalSetError(MemberExpression exp, string errorMessage)
+    private async Task InternalSetError(MemberExpression exp, string errorMessage)
     {
         if (exp.Expression != null)
         {
@@ -198,7 +198,7 @@ private void InternalSetError(MemberExpression exp, string errorMessage)
             {
                 new(errorMessage, [fieldName])
             };
-            validator.ToggleMessage(results);
+            await validator.ToggleMessage(results);
         }
     }
 
@@ -207,15 +207,15 @@ private void InternalSetError(MemberExpression exp, string errorMessage)
     /// </summary>
     /// <param name="propertyName">字段名，可以使用多层，如 a.b.c</param>
     /// <param name="errorMessage">错误描述信息，可为空，为空时查找资源文件</param>
-    public void SetError(string propertyName, string errorMessage)
+    public async Task SetError(string propertyName, string errorMessage)
     {
         if (TryGetModelField(propertyName, out var modelType, out var fieldName) && TryGetValidator(modelType, fieldName, out var validator))
         {
             var results = new List<ValidationResult>
             {
                 new(errorMessage, [fieldName])
             };
-            validator.ToggleMessage(results);
+            await validator.ToggleMessage(results);
         }
     }
 
@@ -327,7 +327,7 @@ internal async Task ValidateObject(ValidationContext context, List<ValidationRes
             ValidMemberNames.RemoveAll(name => _validateResults.Values.SelectMany(i => i).Any(i => i.MemberNames.Contains(name)));
             foreach (var (validator, messages) in _validateResults)
             {
-                validator.ToggleMessage(messages);
+                await validator.ToggleMessage(messages);
             }
         }
     }
@@ -352,7 +352,7 @@ internal async Task ValidateFieldAsync(ValidationContext context, List<Validatio
                 }
 
                 // 客户端提示
-                validator.ToggleMessage(results);
+                await validator.ToggleMessage(results);
             }
         }
     }
@@ -477,7 +477,7 @@ private async Task ValidateProperty(ValidationContext context, List<ValidationRe
                         await ValidateAsync(validator, context, messages, pi, propertyValue);
 
                         // 客户端提示
-                        validator.ToggleMessage(messages);
+                        await validator.ToggleMessage(messages);
                     }
                     results.AddRange(messages);
                 }

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ private async Task SetValue()`
`454`	`454`	`var validationResults = new List<ValidationResult>();`
`455`	`455`
`456`	`456`	`await ValidatePropertyAsync(CurrentValue, validationContext, validationResults);`
`457`		`- ToggleMessage(validationResults);`
	`457`	`+ await ToggleMessage(validationResults);`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`if (OnSelectedItemsChanged != null)`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ private async Task SetValue()`
`430`	`430`	`var validationResults = new List<ValidationResult>();`
`431`	`431`
`432`	`432`	`await ValidatePropertyAsync(CurrentValue, validationContext, validationResults);`
`433`		`- ToggleMessage(validationResults);`
	`433`	`+ await ToggleMessage(validationResults);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`if (OnSelectedItemsChanged != null)`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ private async Task TransferItems(List<SelectedItem> source, List<SelectedItem> t`
`317`	`317`	`var validationResults = new List<ValidationResult>();`
`318`	`318`
`319`	`319`	`await ValidatePropertyAsync(RightItems, validationContext, validationResults);`
`320`		`- ToggleMessage(validationResults);`
	`320`	`+ await ToggleMessage(validationResults);`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private async Task OnDeleteFile()`
`153`	`153`	`/// <inheritdoc/>`
`154`	`154`	`/// </summary>`
`155`	`155`	`/// <param name="results"></param>`
`156`		`- public override void ToggleMessage(IEnumerable<ValidationResult> results)`
	`156`	`+ public override Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)`
`157`	`157`	`{`
`158`	`158`	`if (results.Any())`
`159`	`159`	`{`
`@@ -166,5 +166,6 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)`
`166`	`166`	`IsValid = true;`
`167`	`167`	`}`
`168`	`168`	`OnValidate(IsValid);`
	`169`	`+ return Task.CompletedTask;`
`169`	`170`	`}`
`170`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,10 @@ public abstract class UploadBase<TValue> : ValidateBase<TValue>, IUpload`
`57`	`57`	`public Func<UploadFile, Task>? OnChange { get; set; }`
`58`	`58`
`59`	`59`	`/// <summary>`
`60`		`- /// 显示/隐藏验证结果方法`
	`60`	`+ /// <inheritdoc/>`
`61`	`61`	`/// </summary>`
`62`	`62`	`/// <param name="results"></param>`
`63`		`- public override void ToggleMessage(IEnumerable<ValidationResult> results)`
	`63`	`+ public override Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)`
`64`	`64`	`{`
`65`	`65`	`if (FieldIdentifier != null)`
`66`	`66`	`{`
`@@ -84,6 +84,7 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)`
`84`	`84`	`}`
`85`	`85`	`OnValidate(IsValid);`
`86`	`86`	`}`
	`87`	`+ return Task.CompletedTask;`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ public interface IValidateComponent`
`33`	`33`	`/// 显示或者隐藏提示信息方法`
`34`	`34`	`/// </summary>`
`35`	`35`	`/// <param name="results"></param>`
`36`		`- void ToggleMessage(IEnumerable<ValidationResult> results);`
	`36`	`+ Task ToggleMessage(IReadOnlyCollection<ValidationResult> results);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ private void ValidateType(ValidationContext context, List<ValidationResult> resu`
`460`	`460`	`/// 显示/隐藏验证结果方法`
`461`	`461`	`/// </summary>`
`462`	`462`	`/// <param name="results"></param>`
`463`		`- public virtual void ToggleMessage(IEnumerable<ValidationResult> results)`
	`463`	`+ public virtual Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)`
`464`	`464`	`{`
`465`	`465`	`if (FieldIdentifier != null)`
`466`	`466`	`{`
`@@ -481,6 +481,7 @@ public virtual void ToggleMessage(IEnumerable<ValidationResult> results)`
`481`	`481`
`482`	`482`	`// 必须刷新一次 UI 保证状态正确`
`483`	`483`	`StateHasChanged();`
	`484`	`+ return Task.CompletedTask;`
`484`	`485`	`}`
`485`	`486`
`486`	`487`	`private JSModule? ValidateModule { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -169,20 +169,20 @@ internal void AddValidator((string FieldName, Type ModelType) key, (FieldIdentif`
`169`	`169`	`/// </summary>`
`170`	`170`	`/// <param name="expression"></param>`
`171`	`171`	`/// <param name="errorMessage">错误描述信息，可为空，为空时查找资源文件</param>`
`172`		`- public void SetError<TModel>(Expression<Func<TModel, object?>> expression, string errorMessage)`
	`172`	`+ public async Task SetError<TModel>(Expression<Func<TModel, object?>> expression, string errorMessage)`
`173`	`173`	`{`
`174`	`174`	`switch (expression.Body)`
`175`	`175`	`{`
`176`	`176`	`case UnaryExpression { Operand: MemberExpression mem }:`
`177`		`- InternalSetError(mem, errorMessage);`
	`177`	`+ await InternalSetError(mem, errorMessage);`
`178`	`178`	`break;`
`179`	`179`	`case MemberExpression exp:`
`180`		`- InternalSetError(exp, errorMessage);`
	`180`	`+ await InternalSetError(exp, errorMessage);`
`181`	`181`	`break;`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`185`		`- private void InternalSetError(MemberExpression exp, string errorMessage)`
	`185`	`+ private async Task InternalSetError(MemberExpression exp, string errorMessage)`
`186`	`186`	`{`
`187`	`187`	`if (exp.Expression != null)`
`188`	`188`	`{`
`@@ -198,7 +198,7 @@ private void InternalSetError(MemberExpression exp, string errorMessage)`
`198`	`198`	`{`
`199`	`199`	`new(errorMessage, [fieldName])`
`200`	`200`	`};`
`201`		`- validator.ToggleMessage(results);`
	`201`	`+ await validator.ToggleMessage(results);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
`@@ -207,15 +207,15 @@ private void InternalSetError(MemberExpression exp, string errorMessage)`
`207`	`207`	`/// </summary>`
`208`	`208`	`/// <param name="propertyName">字段名，可以使用多层，如 a.b.c</param>`
`209`	`209`	`/// <param name="errorMessage">错误描述信息，可为空，为空时查找资源文件</param>`
`210`		`- public void SetError(string propertyName, string errorMessage)`
	`210`	`+ public async Task SetError(string propertyName, string errorMessage)`
`211`	`211`	`{`
`212`	`212`	`if (TryGetModelField(propertyName, out var modelType, out var fieldName) && TryGetValidator(modelType, fieldName, out var validator))`
`213`	`213`	`{`
`214`	`214`	`var results = new List<ValidationResult>`
`215`	`215`	`{`
`216`	`216`	`new(errorMessage, [fieldName])`
`217`	`217`	`};`
`218`		`- validator.ToggleMessage(results);`
	`218`	`+ await validator.ToggleMessage(results);`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`@@ -327,7 +327,7 @@ internal async Task ValidateObject(ValidationContext context, List<ValidationRes`
`327`	`327`	`ValidMemberNames.RemoveAll(name => _validateResults.Values.SelectMany(i => i).Any(i => i.MemberNames.Contains(name)));`
`328`	`328`	`foreach (var (validator, messages) in _validateResults)`
`329`	`329`	`{`
`330`		`- validator.ToggleMessage(messages);`
	`330`	`+ await validator.ToggleMessage(messages);`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`	`}`
`@@ -352,7 +352,7 @@ internal async Task ValidateFieldAsync(ValidationContext context, List<Validatio`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`// 客户端提示`
`355`		`- validator.ToggleMessage(results);`
	`355`	`+ await validator.ToggleMessage(results);`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`	`}`
`@@ -477,7 +477,7 @@ private async Task ValidateProperty(ValidationContext context, List<ValidationRe`
`477`	`477`	`await ValidateAsync(validator, context, messages, pi, propertyValue);`
`478`	`478`
`479`	`479`	`// 客户端提示`
`480`		`- validator.ToggleMessage(messages);`
	`480`	`+ await validator.ToggleMessage(messages);`
`481`	`481`	`}`
`482`	`482`	`results.AddRange(messages);`
`483`	`483`	`}`