diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index b5c6f72b0b5..c510f140fd0 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 10.2.1-beta02 + 10.2.1-beta03 diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs index 271577b7ebe..5ce1d425d9e 100644 --- a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs +++ b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs @@ -270,6 +270,7 @@ private bool TryGetValidator(Type modelType, string fieldName, out IValidateComp /// internal async Task ValidateObject(ValidationContext context, List results) { + _tcs = new TaskCompletionSource(); _validateResults.Clear(); if (ValidateAllProperties) @@ -343,14 +344,9 @@ internal async Task ValidateObject(ValidationContext context, List 0; - } } + + _tcs.TrySetResult(results.Count == 0); } /// @@ -539,9 +535,6 @@ private async Task ValidateAsync(IValidateComponent validator, ValidationContext } ValidateDataAnnotations(propertyValue, context, messages, pi); } - - _tcs = new TaskCompletionSource(); - _tcs.TrySetResult(messages.Count == 0); } else { @@ -549,9 +542,7 @@ private async Task ValidateAsync(IValidateComponent validator, ValidationContext if (messages.Count == 0) { // 自定义验证组件 - _tcs = new TaskCompletionSource(); await validator.ValidatePropertyAsync(propertyValue, context, messages); - _tcs.TrySetResult(messages.Count == 0); } if (messages.Count == 0) @@ -574,12 +565,8 @@ private async Task ValidateAsync(IValidateComponent validator, ValidationContext } } } - - _invalid = messages.Count > 0; } - private bool _invalid = false; - private List AsyncSubmitButtons { get; } = []; /// @@ -665,11 +652,7 @@ private async Task OnInvalidSubmitForm(EditContext context) /// 验证方法 用于代码调用触发表单验证 /// /// - public bool Validate() - { - _invalid = true; - return Validator.Validate() && !_invalid; - } + public bool Validate() => Validator.Validate(); /// /// 通知属性改变方法