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

* 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: 更改为异步方法

Author: ArgoZhang

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>

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)

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)

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);
             }
         }
     }

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;
     }
 }

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>

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);
 }

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; }

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);
                 }