From 77832889630c85a66ca99c26feb3029a49b7abd5 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Mon, 29 Mar 2021 15:26:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=AA=8C=E8=AF=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E5=BC=82=E6=AD=A5=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Button/Button.razor.cs         | 46 +++++++++++++++++++
 .../Components/Validate/ValidateBase.cs       |  2 +-
 .../ValidateForm/ValidateForm.razor           |  2 +-
 .../ValidateForm/ValidateForm.razor.cs        | 39 +++++++++++-----
 4 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 src/BootstrapBlazor/Components/Button/Button.razor.cs

diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.cs b/src/BootstrapBlazor/Components/Button/Button.razor.cs
new file mode 100644
index 000000000..5ef009488
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Button/Button.razor.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+using BootstrapBlazor.Components;
+using Microsoft.AspNetCore.Components;
+using System;
+
+namespace BootstrapBlazor.Components
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class Button
+    {
+        /// <summary>
+        /// 获得 ValidateForm 实例
+        /// </summary>
+        [CascadingParameter]
+        protected ValidateForm? ValidateForm { get; set; }
+
+        /// <summary>
+        /// OnInitialized 方法
+        /// </summary>
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+
+            if (IsAsync && ValidateForm != null)
+            {
+                // 开启异步操作时与 ValidateForm 联动
+                ValidateForm.RegisterAsyncSubmitButton(this);
+            }
+        }
+
+        /// <summary>
+        /// 触发按钮异步操作方法
+        /// </summary>
+        /// <param name="loading">true 时显示正在操作 false 时表示结束</param>
+        internal void TriggerAsync(bool loading)
+        {
+            ButtonIcon = loading ? LoadingIcon : Icon;
+            SetDisable(loading);
+        }
+    }
+}
diff --git a/src/BootstrapBlazor/Components/Validate/ValidateBase.cs b/src/BootstrapBlazor/Components/Validate/ValidateBase.cs
index 501dc5acd..003cde416 100644
--- a/src/BootstrapBlazor/Components/Validate/ValidateBase.cs
+++ b/src/BootstrapBlazor/Components/Validate/ValidateBase.cs
@@ -236,7 +236,7 @@ namespace BootstrapBlazor.Components
         protected EditContext? CascadedEditContext { get; set; }
 
         /// <summary>
-        /// 获得 ValidateFormBase 实例
+        /// 获得 ValidateForm 实例
         /// </summary>
         [CascadingParameter]
         protected ValidateForm? EditForm { get; set; }
diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor
index c602b124a..75aeef639 100644
--- a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor
+++ b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor
@@ -2,7 +2,7 @@
 @inherits IdComponentBase
 
 <CascadingValue Value="this">
-    <EditForm Model="@Model" @attributes="@AdditionalAttributes" id="@Id" OnSubmit="@OnSubmit" OnValidSubmit="@OnValidSubmit" OnInvalidSubmit="@OnInvalidSubmit">
+    <EditForm Model="@Model" @attributes="@AdditionalAttributes" id="@Id" OnValidSubmit="@OnValidSubmitForm" OnInvalidSubmit="@OnInvalidSubmit">
         <BootstrapBlazorDataAnnotationsValidator />
         @ChildContent
     </EditForm>
diff --git a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs
index d20eaaca0..6169e7e9b 100644
--- a/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs
+++ b/src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs
@@ -5,7 +5,6 @@
 using BootstrapBlazor.Localization.Json;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Concurrent;
@@ -22,17 +21,8 @@ namespace BootstrapBlazor.Components
     /// <summary>
     /// ValidateForm 组件类
     /// </summary>
-    public sealed partial class ValidateForm
+    public partial class ValidateForm
     {
-        /// <summary>
-        /// A callback that will be invoked when the form is submitted.
-        /// If using this parameter, you are responsible for triggering any validation
-        /// manually, e.g., by calling <see cref="EditContext.Validate"/>.
-        /// </summary>
-        [Parameter]
-        [NotNull]
-        public Func<EditContext, Task>? OnSubmit { get; set; }
-
         /// <summary>
         /// A callback that will be invoked when the form is submitted and the
         /// <see cref="EditContext"/> is determined to be valid.
@@ -334,5 +324,32 @@ namespace BootstrapBlazor.Components
                 }
             }
         }
+
+        private List<Button> AsyncSubmitButtons { get; set; } = new List<Button>();
+
+        /// <summary>
+        /// 注册提交按钮
+        /// </summary>
+        /// <param name="button"></param>
+        internal void RegisterAsyncSubmitButton(Button button)
+        {
+            AsyncSubmitButtons.Add(button);
+        }
+
+        private async Task OnValidSubmitForm(EditContext context)
+        {
+            if (OnValidSubmit != null)
+            {
+                foreach (var b in AsyncSubmitButtons)
+                {
+                    b.TriggerAsync(true);
+                }
+                await OnValidSubmit(context);
+                foreach (var b in AsyncSubmitButtons)
+                {
+                    b.TriggerAsync(false);
+                }
+            }
+        }
     }
 }
-- 
Gitee


From b868b3183d2f0d5c3903ed8f6d807607559b393f Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Mon, 29 Mar 2021 15:26:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E5=A2=9E=E5=8A=A0=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/ValidateForms.razor                  |  3 ++-
 .../Pages/Samples/ValidateForms.razor.cs               | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor b/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor
index 85c7cb4fe..b80323dd1 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor
@@ -45,6 +45,7 @@
             <li>教育为枚举类型</li>
             <li>爱好为集合类型</li>
         </ul>
+        <p>本例中通过设置 <b>提交按钮</b> 属性 <code>IsAsync</code> 来异步提交表单，点击提交后禁用自身，异步操作完毕后恢复</p>
         <ValidateForm class="form-inline" Model="@Model" OnValidSubmit="@OnValidSubmit" OnInvalidSubmit="@OnInvalidSubmit">
             <div class="row">
                 <div class="form-group col-12 col-sm-6">
@@ -63,7 +64,7 @@
                     <CheckboxList @bind-Value="@Model.Hobby" Items="@Hobbys" />
                 </div>
                 <div class="form-group col-12">
-                    <Button ButtonType="@ButtonType.Submit" Text="提交表单" />
+                    <Button ButtonType="@ButtonType.Submit" Icon="fa fa-fw fa-save" IsAsync="true" Text="提交表单" />
                 </div>
             </div>
         </ValidateForm>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor.cs
index 90f675088..c9982a486 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/ValidateForms.razor.cs
@@ -8,6 +8,7 @@ using BootstrapBlazor.Shared.Pages.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Localization;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
@@ -36,7 +37,7 @@ namespace BootstrapBlazor.Shared.Pages
         [NotNull]
         private IStringLocalizer<Foo>? LocalizerFoo { get; set; }
 
-        private Foo Model { get; set; } = new();
+        private Foo Model { get; set; } = new() { Name = "Name", Education = EnumEducation.Primary, DateTime = DateTime.Now };
 
         [NotNull]
         private IEnumerable<SelectedItem>? Hobbys { get; set; }
@@ -71,10 +72,11 @@ namespace BootstrapBlazor.Shared.Pages
             return Task.CompletedTask;
         }
 
-        private Task OnValidSubmit(EditContext context)
+        private async Task OnValidSubmit(EditContext context)
         {
-            Trace2.Log("OnValidSubmit 回调委托");
-            return Task.CompletedTask;
+            Trace2.Log("OnValidSubmit 回调委托: Starting ...");
+            await Task.Delay(3000);
+            Trace2.Log("OnValidSubmit 回调委托: Done!");
         }
 
         private Task OnInvalidSubmit(EditContext context)
-- 
Gitee