feat: add IsEnableWhenSelectedOneRow parameter on TableToolbarPopconf…

…irmButton (#602) * doc: 更改注释 * refactor: 更新资源文件赋值逻辑 * feat: add IsEnableWhenSelectedOneRow on TableToolbarPopconfirmButton * doc: 更新注释 * doc: 更新示例代码
dotnetcore · Mar 4, 2023 · b9984b4 · b9984b4
1 parent 3a40fc2
commit b9984b4
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/src/BootstrapBlazor.Shared/Demos/Table/TablesToolbar/TablesToolbarCustomButton.razor b/src/BootstrapBlazor.Shared/Demos/Table/TablesToolbar/TablesToolbarCustomButton.razor
@@ -18,7 +18,13 @@
                                 Color="Color.Success"
                                 Icon="fa-fw fa-solid fa-pen-to-square"
                                 Text="@Localizer["TablesToolbarCustomButton2"]"
-                                IsAsync OnClickCallback="@DownloadAsync" />
+                                IsAsync OnClickCallback="@DownloadAsync" IsEnableWhenSelectedOneRow="true" />
+            <TableToolbarPopconfirmButton TItem="Foo"
+                                          Color="Color.Success"
+                                          Icon="fa-fw fa-solid fa-pen-to-square"
+                                          Text="@Localizer["TableToolbarPopconfirmButton1"]"
+                                          IsEnableWhenSelectedOneRow="true"
+                                          OnConfirmCallback="DownloadAsync" />
         </TableToolbarTemplate>
         <TableColumns>
             <TableColumn @bind-Field="@context.DateTime" Width="180" />

diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -5630,7 +5630,8 @@
   },
   "BootstrapBlazor.Shared.Demos.Table.TablesToolbar.TablesToolbarCustomButton": {
     "TablesToolbarCustomButton1": "Download 1",
-    "TablesToolbarCustomButton2": "Download 2"
+    "TablesToolbarCustomButton2": "Download 2",
+    "TableToolbarPopconfirmButton1": "Confirm"
   },
   "BootstrapBlazor.Shared.Samples.Table.TablesCell": {
     "TablesCellTitle": "Table Cell",

diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5647,7 +5647,8 @@
   },
   "BootstrapBlazor.Shared.Demos.Table.TablesToolbar.TablesToolbarCustomButton": {
     "TablesToolbarCustomButton1": "下载1",
-    "TablesToolbarCustomButton2": "下载2"
+    "TablesToolbarCustomButton2": "下载2",
+    "TableToolbarPopconfirmButton1": "确认下载"
   },
   "BootstrapBlazor.Shared.Samples.Table.TablesCell": {
     "TablesCellTitle": "Table 表格",

diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
@@ -23,7 +23,7 @@
                     {
                         <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes" CustomClass="@pb.CustomClass"
                                           Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size" ShowShadow="@pb.ShowShadow"
-                                          IsAsync="@pb.IsAsync" IsDisabled="@pb.IsDisabled" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
+                                          IsAsync="@pb.IsAsync" IsDisabled="GetDisabled(pb)" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
                                           OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="() => OnToolbarConfirmButtonClick(pb)"
                                           ConfirmIcon="@pb.ConfirmIcon" ConfirmButtonColor="@pb.ConfirmButtonColor"
                                           ConfirmButtonText="@pb.ConfirmButtonText" CloseButtonColor="@pb.CloseButtonColor"

diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
@@ -89,14 +89,14 @@ private async Task OnToolbarConfirmButtonClick(TableToolbarPopconfirmButton<TIte
         }
     }
 
-    private bool GetDisabled(TableToolbarButton<TItem> button)
+    private bool GetDisabled(ButtonBase button)
     {
         var ret = button.IsDisabled;
         if (button.IsAsync && _asyncButtonStateCache.TryGetValue(button, out var b))
         {
             ret = b;
         }
-        else if (button.IsEnableWhenSelectedOneRow)
+        else if (button is TableToolbarButton<TItem> { IsEnableWhenSelectedOneRow: true } || button is TableToolbarPopconfirmButton<TItem> { IsEnableWhenSelectedOneRow: true })
         {
             ret = OnGetSelectedRows().Count() != 1;
         }

diff --git a/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs b/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs
@@ -35,7 +35,7 @@ public class TableToolbarButton<TItem> : ButtonBase
     protected TableToolbar<TItem>? Toolbar { get; set; }
 
     /// <summary>
-    /// 组件初始化方法
+    /// <inheritdoc/>
     /// </summary>
     protected override void OnInitialized()
     {

diff --git a/src/BootstrapBlazor/Components/Table/TableToolbarPopconfirmButton.cs b/src/BootstrapBlazor/Components/Table/TableToolbarPopconfirmButton.cs
@@ -24,6 +24,12 @@ public class TableToolbarPopconfirmButton<TItem> : PopConfirmButtonBase
     [Parameter]
     public bool IsShow { get; set; } = true;
 
+    /// <summary>
+    /// 获得/设置 选中一行时启用按钮 默认 false 均可用
+    /// </summary>
+    [Parameter]
+    public bool IsEnableWhenSelectedOneRow { get; set; }
+
     /// <summary>
     /// 获得/设置 Table Toolbar 实例
     /// </summary>
@@ -35,13 +41,21 @@ public class TableToolbarPopconfirmButton<TItem> : PopConfirmButtonBase
     private IStringLocalizer<PopConfirmButton>? Localizer { get; set; }
 
     /// <summary>
-    /// OnInitialized 方法
+    /// <inheritdoc/>
     /// </summary>
     protected override void OnInitialized()
     {
         base.OnInitialized();
 
         Toolbar?.AddButton(this);
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
 
         ConfirmButtonText ??= Localizer[nameof(ConfirmButtonText)];
         CloseButtonText ??= Localizer[nameof(CloseButtonText)];