From c16b08ccdc4ba6c81805d963e3775ea15f5694b4 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 5 Jul 2021 12:35:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowSearchText=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E6=90=9C=E7=B4=A2=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E9=BB=98=E8=AE=A4=20true?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/Table.razor              | 50 +++++++++++--------
 .../Components/Table/Table.razor.Search.cs    | 12 +++--
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index d86d98ed5..46afd6fc6 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -101,28 +101,33 @@
             @if (ShowSearch)
             {
                 <div class="float-right table-toolbar-button btn-group">
-                    <div class="input-group">
-                        <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText" @bind-Value="@SearchText">
-                            <Tooltip Placement="Placement.Top" Title="@SearchTooltip" IsHtml="true" />
-                        </BootstrapInput>
-                        <div class="input-group-append">
-                            <Button Color="@Color.Secondary" Icon="fa fa-search" OnClickWithoutRender="@SearchClick">
-                                <span class="d-none d-sm-inline-block">@SearchButtonText</span>
-                            </Button>
-                            @if (ShowResetSearch)
-                            {
-                                <Button Color="@Color.Secondary" Icon="fa fa-trash" OnClickWithoutRender="@ClearSearchClick">
-                                    <span class="d-none d-sm-inline-block">@ResetSearchButtonText</span>
-                                </Button>
-                            }
-                            @if (ShowAdvancedSearch)
-                            {
-                                <Button class="@AdvanceSearchClass" Icon="fa fa-search-plus" OnClickWithoutRender="@ShowSearchDialog">
-                                    <span class="d-none d-sm-inline-block">@AdvanceButtonText</span>
+                    @if (ShowSearchText)
+                    {
+                        <div class="input-group">
+                            <BootstrapInput class="table-toolbar-search" placeholder="@SearchPlaceholderText" @bind-Value="@SearchText">
+                                <Tooltip Placement="Placement.Top" Title="@SearchTooltip" IsHtml="true" />
+                            </BootstrapInput>
+                            <div class="input-group-append">
+                                <Button Color="@Color.Secondary" Icon="fa fa-search" OnClickWithoutRender="@SearchClick">
+                                    <span class="d-none d-sm-inline-block">@SearchButtonText</span>
                                 </Button>
-                            }
+                                @if (ShowResetSearch)
+                                {
+                                    <Button Color="@Color.Secondary" Icon="fa fa-trash" OnClickWithoutRender="@ClearSearchClick">
+                                        <span class="d-none d-sm-inline-block">@ResetSearchButtonText</span>
+                                    </Button>
+                                }
+                                @if (ShowAdvancedSearch)
+                                {
+                                    @RenderAdvanceSearchButton
+                                }
+                            </div>
                         </div>
-                    </div>
+                    }
+                    else if (ShowAdvancedSearch)
+                    {
+                        @RenderAdvanceSearchButton
+                    }
                 </div>
             }
         </div>
@@ -601,4 +606,9 @@ RenderFragment<TItem> RenderEditForm => item =>
         </div>
     </td>
 </tr>;
+
+RenderFragment RenderAdvanceSearchButton =>
+@<Button class="@AdvanceSearchClass" Icon="fa fa-search-plus" OnClickWithoutRender="@ShowSearchDialog">
+    <span class="d-none d-sm-inline-block">@AdvanceButtonText</span>
+</Button>;
 }
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
index 8d0c2c8b6..1c9323439 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs
@@ -54,17 +54,23 @@ namespace BootstrapBlazor.Components
         public bool ShowSearch { get; set; }
 
         /// <summary>
-        /// 获得/设置 是否显示高级搜索按钮 默认显示
+        /// 获得/设置 是否显示搜索框 默认为 true 显示搜索文本框  <see cref="ShowSearch" />
         /// </summary>
         [Parameter]
-        public bool ShowAdvancedSearch { get; set; } = true;
+        public bool ShowSearchText { get; set; } = true;
 
         /// <summary>
-        /// 获得/设置 是否显示清空搜索按钮 默认显示
+        /// 获得/设置 是否显示清空搜索按钮 默认显示 <see cref="ShowSearch" />
         /// </summary>
         [Parameter]
         public bool ShowResetSearch { get; set; } = true;
 
+        /// <summary>
+        /// 获得/设置 是否显示高级搜索按钮 默认显示 <see cref="ShowSearch" />
+        /// </summary>
+        [Parameter]
+        public bool ShowAdvancedSearch { get; set; } = true;
+
         /// <summary>
         /// 获得/设置 搜索关键字 通过列设置的 Searchable 自动生成搜索拉姆达表达式
         /// </summary>
-- 
Gitee