From af980e53c44661976a5f94a3e29df16e2f8a4950 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Thu, 13 Oct 2022 13:03:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=AA=8C=E8=AF=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=A2=9E=E5=8A=A0=E4=B8=8E=E5=BC=82=E6=AD=A5=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ValidateForm/ValidateForm.razor | 2 +- .../ValidateForm/ValidateForm.razor.cs | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor index ad9292bc0..07e7515f7 100644 --- a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor +++ b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor @@ -4,7 +4,7 @@ @if (Model != null) { - + @ChildContent diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs index 8f0d77415..5962ed948 100644 --- a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs +++ b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs @@ -484,6 +484,27 @@ public partial class ValidateForm : IAsyncDisposable } } + private async Task OnInvalidSubmitForm(EditContext context) + { + if (OnValidSubmit != null) + { + var isAsync = AsyncSubmitButtons.Any(); + foreach (var b in AsyncSubmitButtons) + { + b.TriggerAsync(true); + } + if (isAsync) + { + await Task.Yield(); + } + await OnInvalidSubmit(context); + foreach (var b in AsyncSubmitButtons) + { + b.TriggerAsync(false); + } + } + } + [NotNull] private BootstrapBlazorDataAnnotationsValidator? Validator { get; set; } -- Gitee From 3c89d9fde947cccd21ab6589e935230d76de74b6 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Thu, 13 Oct 2022 13:04:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Samples/ValidateForms.razor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/ValidateForms.razor.cs b/src/BootstrapBlazor.Shared/Samples/ValidateForms.razor.cs index 356bb227e..7427bae72 100644 --- a/src/BootstrapBlazor.Shared/Samples/ValidateForms.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/ValidateForms.razor.cs @@ -91,10 +91,10 @@ public partial class ValidateForms return Task.CompletedTask; } - private Task OnInvalidSubmit1(EditContext context) + private async Task OnInvalidSubmit1(EditContext context) { + await Task.Delay(1000); Trace.Log(Localizer["OnInvalidSubmitLog"]); - return Task.CompletedTask; } private async Task OnValidSubmit1(EditContext context) -- Gitee