From 1a3d2a8230e73b29b2c26339e45dbbdd1050b98c Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Fri, 26 Mar 2021 00:49:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor      | 11 +++++++----
 .../Components/Table/Table.razor.Localization.cs      |  4 ++--
 .../Components/Table/Table.razor.Search.cs            |  6 ++++++
 src/BootstrapBlazor/Locales/en.json                   |  2 +-
 src/BootstrapBlazor/Locales/zh.json                   |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 10130ebb0..4f5419b2c 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -113,10 +113,13 @@
                                 <i class="fa fa-search"></i>
                                 <span class="d-none d-sm-inline-block">@SearchButtonText</span>
                             </button>
-                            <button class="btn btn-secondary" type="button" @onclick="@ClearSearchClick">
-                                <i class="fa fa-trash"></i>
-                                <span class="d-none d-sm-inline-block">@ResetButtonText</span>
-                            </button>
+                            @if (ShowResetSearch)
+                            {
+                                <button class="btn btn-secondary" type="button" @onclick="@ClearSearchClick">
+                                    <i class="fa fa-trash"></i>
+                                    <span class="d-none d-sm-inline-block">@ResetSearchButtonText</span>
+                                </button>
+                            }
                             @if (ShowAdvancedSearch)
                             {
                                 <Button class="@AdvanceSearchClass" Icon="fa fa-search-plus" OnClickWithoutRender="@ShowSearchDialog">
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
index 4082eb4ad..110b0ba26 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
@@ -124,7 +124,7 @@ namespace BootstrapBlazor.Components
         /// </summary>
         [Parameter]
         [NotNull]
-        public string? ResetButtonText { get; set; }
+        public string? ResetSearchButtonText { get; set; }
 
         /// <summary>
         /// 高级搜索按钮文本
@@ -250,7 +250,7 @@ namespace BootstrapBlazor.Components
             ExportButtonText ??= Localizer[nameof(ExportButtonText)];
             SearchPlaceholderText ??= Localizer[nameof(SearchPlaceholderText)];
             SearchButtonText ??= Localizer[nameof(SearchButtonText)];
-            ResetButtonText ??= Localizer[nameof(ResetButtonText)];
+            ResetSearchButtonText ??= Localizer[nameof(ResetSearchButtonText)];
             AdvanceButtonText ??= Localizer[nameof(AdvanceButtonText)];
             CheckboxDisplayText ??= Localizer[nameof(CheckboxDisplayText)];
             EditModalTitle ??= Localizer[nameof(EditModalTitle)];
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
index 75d66ba74..58bf480e7 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
@@ -59,6 +59,12 @@ namespace BootstrapBlazor.Components
         [Parameter]
         public bool ShowAdvancedSearch { get; set; } = true;
 
+        /// <summary>
+        /// 获得/设置 是否显示清空搜索按钮 默认显示
+        /// </summary>
+        [Parameter]
+        public bool ShowResetSearch { get; set; } = true;
+
         /// <summary>
         /// 获得/设置 搜索关键字 通过列设置的 Searchable 自动生成搜索拉姆达表达式
         /// </summary>
diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json
index f7c18d5a9..731c81187 100644
--- a/src/BootstrapBlazor/Locales/en.json
+++ b/src/BootstrapBlazor/Locales/en.json
@@ -184,7 +184,7 @@
     "ExportButtonText": "Export",
     "SearchPlaceholderText": "Search",
     "SearchButtonText": "Search",
-    "ResetButtonText": "Reset",
+    "ResetSearchButtonText": "Reset",
     "AdvanceButtonText": "Advance Search",
     "CheckboxDisplayText": "All",
     "EditModalTitle": "Edit Data",
diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json
index f7c2ff298..05b9fef40 100644
--- a/src/BootstrapBlazor/Locales/zh.json
+++ b/src/BootstrapBlazor/Locales/zh.json
@@ -184,7 +184,7 @@
     "ExportButtonText": "导出数据",
     "SearchPlaceholderText": "搜索",
     "SearchButtonText": "搜索",
-    "ResetButtonText": "清空过滤",
+    "ResetSearchButtonText": "清空搜索",
     "AdvanceButtonText": "高级搜索",
     "CheckboxDisplayText": "选择",
     "EditModalTitle": "编辑数据窗口",
-- 
Gitee


From 31aeb8a9d75bf65cef274218fa65c34ef99c63c0 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Fri, 26 Mar 2021 00:49:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/Table/Tables.razor.cs            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/Tables.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/Table/Tables.razor.cs
index 0fe07750e..08e775201 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/Tables.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/Tables.razor.cs
@@ -355,6 +355,20 @@ namespace BootstrapBlazor.Shared.Pages.Table
                 ValueList = "true / false",
                 DefaultValue = "false"
             },
+            new AttributeItem() {
+                Name = "ShowResetSearch",
+                Description = "显示清空搜索按钮",
+                Type = "boolean",
+                ValueList = "true / false",
+                DefaultValue = "true"
+            },
+            new AttributeItem() {
+                Name = "ShowAdvancedSearch",
+                Description = "显示高级搜索按钮",
+                Type = "boolean",
+                ValueList = "true / false",
+                DefaultValue = "true"
+            },
             new AttributeItem() {
                 Name = "ShowToolbar",
                 Description = "显示 Toolbar",
-- 
Gitee