From 301565d8c83cafcdde404c938fd581160fc066b0 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 22:19:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowSearch=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Shared/Table.razor  | 35 ++++++++++++++-----
 .../Bootstrap.Admin/wwwroot/css/blazor.css    | 16 ++++++---
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 8b2be987..d7f28abb 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -2,14 +2,31 @@
 @inherits TableBase<TItem>
 
 <div class="bootstrap-table">
-    <div class="@(ShowToolBar ? "bs-bars" : "bs-bars d-none")">
-        <TableToolbar>
-            <TableToolbarContent />
-            <TableToolbarButton class="btn btn-success" Icon="fa fa-plus" Title="新增" OnClick="Add" />
-            <TableToolbarButton class="btn btn-danger" Icon="fa fa-remove" Title="删除" OnClick="Delete" />
-            <TableToolbarButton class="btn btn-primary" Icon="fa fa-pencil" Title="编辑" OnClick="Edit" />
-            @TableToolbarTemplate
-        </TableToolbar>
+    <div class="fixed-table-toolbar">
+        <div class="float-left @(ShowToolBar ? "bs-bars" : "bs-bars d-none")">
+            <TableToolbar>
+                <TableToolbarContent />
+                <TableToolbarButton class="btn btn-success" Icon="fa fa-plus" Title="新增" OnClick="Add" />
+                <TableToolbarButton class="btn btn-danger" Icon="fa fa-remove" Title="删除" OnClick="Delete" />
+                <TableToolbarButton class="btn btn-primary" Icon="fa fa-pencil" Title="编辑" OnClick="Edit" />
+                @TableToolbarTemplate
+            </TableToolbar>
+        </div>
+        <div class="float-right @(ShowSearch ? "search btn-group" : "search btn-group d-none")">
+            <div class="input-group">
+                <input class="form-control search-input" type="text" placeholder="搜索" data-original-title="" title="">
+                <div class="input-group-append">
+                    <button class="btn btn-secondary" type="button" name="search" title="搜索">
+                        <i class="fa fa-search"></i><span>搜索</span>
+                    </button>
+                    <button class="btn btn-secondary" type="button" name="clearSearch" title="清空过滤">
+                        <i class="fa fa-trash"></i> <span>清空过滤</span>
+                    </button><button class="btn btn-secondary" type="button" name="advancedSearch" title="高级搜索">
+                        <i class="fa fa-search-plus"></i><span>高级搜索</span>
+                    </button>
+                </div>
+            </div>
+        </div>
     </div>
 
     <div class="@(FixedHeader ? "table-wrapper table-fixed-header" : "table-wrapper")">
@@ -36,7 +53,7 @@
                     </thead>
                 </table>
             </div>   
-            <div class="fixed-table-body invisible">                
+            <div class="fixed-table-body visible">                
                 <table class="table table-bordered table-hover table-selected" id="@RetrieveId()">
                     <thead>
                         <tr>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index 903523db..99df5df0 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -105,10 +105,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     vertical-align: text-bottom;
 }
 
-.card-body .bootstrap-table {
-    margin-top: 0rem;
-}
-
 .bs-bars {
     margin-bottom: 0.625rem;
 }
@@ -130,6 +126,18 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     margin-bottom: 0;
 }
 
+    .bootstrap-table .fixed-table-toolbar:after {
+        display: block;
+        content: "";
+        clear: both;
+    }
+
+        .bootstrap-table .fixed-table-toolbar .bs-bars, 
+        .bootstrap-table .fixed-table-toolbar .search, 
+        .bootstrap-table .fixed-table-toolbar .columns {
+            margin-top: 10px;
+        }
+
     .bootstrap-table .fixed-table-header {
         overflow: hidden;
     }