From acdf57a0f86e7f883a8d0a98882de2e74e4a22eb Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Mon, 20 Jan 2020 21:12:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20Blazor=20=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=A2=9E=E5=8A=A0=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/EditPageBase.cs                |   6 +
 .../Bootstrap.Admin/Components/TableBase.cs   |  18 +++
 .../Bootstrap.Admin/Pages/Admin/Dicts.razor   |   2 +-
 .../Pages/Components/QueryPageBase.cs         |  18 ++-
 .../Bootstrap.Admin/Shared/EditPage.razor     |   2 +-
 src/admin/Bootstrap.Admin/Shared/Table.razor  | 133 ++++++++++++++----
 .../Bootstrap.Admin/wwwroot/css/blazor.css    |  10 ++
 7 files changed, 155 insertions(+), 34 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Components/EditPageBase.cs b/src/admin/Bootstrap.Admin/Components/EditPageBase.cs
index 185ec4c9..4f8c561b 100644
--- a/src/admin/Bootstrap.Admin/Components/EditPageBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/EditPageBase.cs
@@ -78,6 +78,12 @@ namespace Bootstrap.Admin.Components
         [Parameter]
         public RenderFragment<TItem>? EditTemplate { get; set; }
 
+        /// <summary>
+        /// 获得/设置 是否固定表头 默认为 false 不固定表头
+        /// </summary>
+        [Parameter]
+        public bool FixedHeader { get; set; }
+
         /// <summary>
         /// 获得/设置 Table 实例
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Components/TableBase.cs b/src/admin/Bootstrap.Admin/Components/TableBase.cs
index d5dfaa09..1012cb72 100644
--- a/src/admin/Bootstrap.Admin/Components/TableBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/TableBase.cs
@@ -60,6 +60,24 @@ namespace Bootstrap.Admin.Components
         [Parameter]
         public RenderFragment? TableFooter { get; set; }
 
+        /// <summary>
+        /// 获得/设置 是否固定表头 默认为 false 不固定表头
+        /// </summary>
+        [Parameter]
+        public bool FixedHeader { get; set; }
+
+        /// <summary>
+        /// 获得/设置 是否自适应高度 默认为 false 不自适应高度
+        /// </summary>
+        [Parameter]
+        public bool AutoHeight { get; set; }
+
+        /// <summary>
+        /// 获得/设置 是否显示搜索框 默认为 false 不显示搜索框
+        /// </summary>
+        [Parameter]
+        public bool ShowSearch { get; set; }
+
         /// <summary>
         /// 获得/设置 数据集合
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor
index dd8c55c3..94567e6c 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Dicts.razor
@@ -1,6 +1,6 @@
 @inherits DictsBase
 
-<EditPage Id="dict" TItem="Bootstrap.Security.BootstrapDict" SubmitModalTitle="字典编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
+<EditPage Id="dict" FixedHeader="@FixedHeader" TItem="Bootstrap.Security.BootstrapDict" SubmitModalTitle="字典编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
     <QueryBody>
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.Category" maxlength="50" />
         <Select ColumnClass="col-sm-auto" Items="QueryDefine" TItem="int" @bind-Value="@context.Define" />
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs
index 00c0101d..28bf17b3 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/QueryPageBase.cs
@@ -1,5 +1,7 @@
-using System.Collections.Generic;
 using Bootstrap.Admin.Components;
+using Bootstrap.DataAccess;
+using Microsoft.AspNetCore.Components;
+using System.Collections.Generic;
 
 namespace Bootstrap.Pages.Admin.Components
 {
@@ -8,6 +10,12 @@ namespace Bootstrap.Pages.Admin.Components
     /// </summary>
     public abstract class QueryPageBase<TItem> : PageBase where TItem : class, new()
     {
+        /// <summary>
+        /// 获得/设置 是否固定表头 默认为 false 不固定表头
+        /// </summary>
+        [Parameter]
+        public bool FixedHeader { get; set; }
+
         /// <summary>
         /// 获得/设置 TItem 实例
         /// </summary>
@@ -20,6 +28,14 @@ namespace Bootstrap.Pages.Admin.Components
         /// <param name="pageItems">每页显示数据条目数量</param>
         protected abstract QueryData<TItem> Query(int pageIndex, int pageItems);
 
+        /// <summary>
+        /// OnParametersSet 方法
+        /// </summary>
+        protected override void OnParametersSet()
+        {
+            FixedHeader = DictHelper.RetrieveFixedTableHeader();
+        }
+
         /// <summary>
         /// 新建方法
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Shared/EditPage.razor b/src/admin/Bootstrap.Admin/Shared/EditPage.razor
index 72998534..b3c25c51 100644
--- a/src/admin/Bootstrap.Admin/Shared/EditPage.razor
+++ b/src/admin/Bootstrap.Admin/Shared/EditPage.razor
@@ -9,7 +9,7 @@
         查询结果
     </div>
     <div class="card-body">
-        <Table @ref="Table" Id="@Id" TItem="TItem" SubmitModalTitle="@SubmitModalTitle" OnQuery="QueryData" OnAdd="OnAdd" OnDelete="OnDelete" OnSave="OnSave">
+        <Table @ref="Table" Id="@Id" FixedHeader="@FixedHeader" TItem="TItem" SubmitModalTitle="@SubmitModalTitle" OnQuery="QueryData" OnAdd="OnAdd" OnDelete="OnDelete" OnSave="OnSave">
             <TableToolbarTemplate>
                 @TableToolbarTemplate
             </TableToolbarTemplate>
diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 543c8c2f..11c67c91 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -13,48 +13,119 @@
     </div>
 
     <div class="table-wrapper">
-        <table class="table table-striped table-bordered table-hover table-selected" id="@($"{Id}_table")">
-            <thead>
-                <tr>
-                    @if (ShowCheckbox)
-                    {
-                        <th class="table-col-checkbox"><Checkbox TItem="TItem" SetCheckCallback="CheckState" ToggleCallback="ToggleCheck"></Checkbox></th>
-                    }
-                    @if (ShowLineNo)
-                    {
-                        <th class="table-col-lineno">行号</th>
-                    }
-                    @TableHeader?.Invoke(EditModel)
-                    @if (ShowButtons)
-                    {
-                        <th>@ButtonTemplateHeaderText</th>
-                    }
-                </tr>
-            </thead>
-            <tbody>
-                @for (int index = 0; index < Items.Count(); index++)
-                {
+        @if(FixedHeader)
+        {
+            <div class="fixed-table-header">
+                <table class="table table-bordered table-hover table-selected">
+                    <thead>
+                        <tr>
+                            @if (ShowCheckbox)
+                            {
+                                <th class="table-col-checkbox"><Checkbox TItem="TItem" SetCheckCallback="CheckState" ToggleCallback="ToggleCheck"></Checkbox></th>
+                            }
+                            @if (ShowLineNo)
+                            {
+                                <th class="table-col-lineno">行号</th>
+                            }
+                            @TableHeader?.Invoke(EditModel)
+                            @if (ShowButtons)
+                            {
+                                <th>@ButtonTemplateHeaderText</th>
+                            }
+                        </tr>
+                    </thead>
+                </table>
+            </div>   
+            <div class="fixed-table-body">                
+                <table class="table table-bordered table-hover table-selected" style="margin-top: -38px;">
+                    <thead>
+                        <tr>
+                            @if (ShowCheckbox)
+                            {
+                                <th class="table-col-checkbox"><Checkbox TItem="TItem" SetCheckCallback="CheckState" ToggleCallback="ToggleCheck"></Checkbox></th>
+                            }
+                            @if (ShowLineNo)
+                            {
+                                <th class="table-col-lineno">行号</th>
+                            }
+                            @TableHeader?.Invoke(EditModel)
+                            @if (ShowButtons)
+                            {
+                                <th>@ButtonTemplateHeaderText</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @for (int index = 0; index < Items.Count(); index++)
+                        {
+                            <tr>
+                                @if (ShowCheckbox)
+                                {
+                                    <td class="table-col-checkbox"><Checkbox TItem="TItem" Item="Items.ElementAt(index)" SetCheckCallback="item => SelectedItems.Contains(item) ? CheckBoxState.Checked : CheckBoxState.UnChecked" ToggleCallback="ToggleCheck"></Checkbox></td>
+                                }
+                                @if (ShowLineNo)
+                                {
+                                    <td class="table-col-lineno">@(index + 1 + (PageIndex - 1) * PageItems)</td>
+                                }
+                                @RowTemplate?.Invoke(Items.ElementAt(index))
+                                @if (ShowButtons)
+                                {
+                                    <td>@ButtonTemplate?.Invoke(Items.ElementAt(index))</td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                    <tfoot>
+                        <tr>@TableFooter</tr>
+                    </tfoot>
+                </table>
+            </div>        
+        }
+        else
+        {
+            <table class="table table-striped table-bordered table-hover table-selected" id="@($"{Id}_table")">
+                <thead>
                     <tr>
                         @if (ShowCheckbox)
                         {
-                            <td class="table-col-checkbox"><Checkbox TItem="TItem" Item="Items.ElementAt(index)" SetCheckCallback="item => SelectedItems.Contains(item) ? CheckBoxState.Checked : CheckBoxState.UnChecked" ToggleCallback="ToggleCheck"></Checkbox></td>
+                            <th class="table-col-checkbox"><Checkbox TItem="TItem" SetCheckCallback="CheckState" ToggleCallback="ToggleCheck"></Checkbox></th>
                         }
                         @if (ShowLineNo)
                         {
-                            <td class="table-col-lineno">@(index + 1 + (PageIndex - 1) * PageItems)</td>
+                            <th class="table-col-lineno">行号</th>
                         }
-                        @RowTemplate?.Invoke(Items.ElementAt(index))
+                        @TableHeader?.Invoke(EditModel)
                         @if (ShowButtons)
                         {
-                            <td>@ButtonTemplate?.Invoke(Items.ElementAt(index))</td>
+                            <th>@ButtonTemplateHeaderText</th>
                         }
                     </tr>
-                }
-            </tbody>
-            <tfoot>
-                <tr>@TableFooter</tr>
-            </tfoot>
-        </table>
+                </thead>
+                <tbody>
+                    @for (int index = 0; index < Items.Count(); index++)
+                    {
+                        <tr>
+                            @if (ShowCheckbox)
+                            {
+                                <td class="table-col-checkbox"><Checkbox TItem="TItem" Item="Items.ElementAt(index)" SetCheckCallback="item => SelectedItems.Contains(item) ? CheckBoxState.Checked : CheckBoxState.UnChecked" ToggleCallback="ToggleCheck"></Checkbox></td>
+                            }
+                            @if (ShowLineNo)
+                            {
+                                <td class="table-col-lineno">@(index + 1 + (PageIndex - 1) * PageItems)</td>
+                            }
+                            @RowTemplate?.Invoke(Items.ElementAt(index))
+                            @if (ShowButtons)
+                            {
+                                <td>@ButtonTemplate?.Invoke(Items.ElementAt(index))</td>
+                            }
+                        </tr>
+                    }
+                </tbody>
+                <tfoot>
+                    <tr>@TableFooter</tr>
+                </tfoot>
+            </table>
+        }
     </div>
     <Pagination PageItems="PageItems" TotalCount="TotalCount" PageIndex="PageIndex" OnPageClick="PageClick" OnPageItemsChange="PageItemsChange"></Pagination>
 </div>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index 1fa75a24..94372a89 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -130,6 +130,16 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     margin-bottom: 0;
 }
 
+    .bootstrap-table .fixed-table-body {
+        overflow: auto;
+        border-radius: 4px;
+        height: 300px;
+    }
+
+        .bootstrap-table .fixed-table-body thead th, .bootstrap-table .fixed-table-header thead th {
+            border-bottom: 1px solid #dee2e6;
+        }
+
 .table-wrapper {
     border-radius: 4px;
     overflow: auto;

From 08adc81d1d04ef6a50fcea27a47d139b9e49625c Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Tue, 21 Jan 2020 21:42:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4=E8=A1=A8=E5=A4=B4=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/Components/TableBase.cs   | 24 +++++++++++++++
 .../Extensions/JSRuntimeExtensions.cs         |  5 ++++
 .../Bootstrap.Admin/Pages/Admin/Groups.razor  |  2 +-
 .../Bootstrap.Admin/Pages/Admin/Menus.razor   |  2 +-
 .../Bootstrap.Admin/Pages/Admin/Roles.razor   |  2 +-
 .../Bootstrap.Admin/Pages/Admin/Users.razor   |  2 +-
 src/admin/Bootstrap.Admin/Shared/Table.razor  |  2 +-
 .../Bootstrap.Admin/wwwroot/css/blazor.css    |  4 +++
 .../Bootstrap.Admin/wwwroot/js/ba.blazor.js   | 30 +++++++++++++++++--
 9 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Components/TableBase.cs b/src/admin/Bootstrap.Admin/Components/TableBase.cs
index 1012cb72..87516a25 100644
--- a/src/admin/Bootstrap.Admin/Components/TableBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/TableBase.cs
@@ -2,6 +2,7 @@
 using Bootstrap.Admin.Shared;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -66,6 +67,12 @@ namespace Bootstrap.Admin.Components
         [Parameter]
         public bool FixedHeader { get; set; }
 
+        /// <summary>
+        /// 获得 IJSRuntime 实例
+        /// </summary>
+        [Inject]
+        protected IJSRuntime? JSRuntime { get; set; }
+
         /// <summary>
         /// 获得/设置 是否自适应高度 默认为 false 不自适应高度
         /// </summary>
@@ -203,6 +210,18 @@ namespace Bootstrap.Admin.Components
             }
         }
 
+        /// <summary>
+        /// OnInitialized 方法
+        /// </summary>
+        protected override async System.Threading.Tasks.Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (FixedHeader)
+            {
+                // 调用客户端脚本 resetWith
+                await JSRuntime.InitTableAsync(RetrieveId());
+            }
+        }
+
         /// <summary>
         /// 点击页码调用此方法
         /// </summary>
@@ -365,5 +384,10 @@ namespace Bootstrap.Admin.Components
             }
             ShowMessage("删除数据", "删除数据" + (result ? "成功" : "失败"), result ? ToastCategory.Success : ToastCategory.Error);
         }
+
+        /// <summary>
+        /// 获取 Id 字符串
+        /// </summary>
+        public string RetrieveId() => $"{Id}_table";
     }
 }
diff --git a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs b/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
index 8bfa3dde..1caf030a 100644
--- a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
@@ -97,5 +97,10 @@ namespace Bootstrap.Admin.Extensions
         /// <param name="showCardTitle"></param>
         /// <param name="fixedTableHeader"></param>
         public static void SetWebSettings(this IJSRuntime? jSRuntime, bool showSidebar, bool showCardTitle, bool fixedTableHeader) => jSRuntime.InvokeVoidAsync("$.setWebSettings", showSidebar, showCardTitle, fixedTableHeader);
+
+        /// <summary>
+        /// 初始化 Table 组件
+        /// </summary>
+        public static ValueTask InitTableAsync(this IJSRuntime? jSRuntime, string id) => jSRuntime.InvokeVoidAsync("$.initTable", id);
     }
 }
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor
index 2a4f3018..1c15e147 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Groups.razor
@@ -1,6 +1,6 @@
 @inherits GroupsBase
 
-<EditPage Id="group" TItem="Bootstrap.DataAccess.Group" SubmitModalTitle="部门编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
+<EditPage Id="group" FixedHeader="@FixedHeader" TItem="Bootstrap.DataAccess.Group" SubmitModalTitle="部门编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
     <QueryBody>
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.GroupName" maxlength="50" />
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.Description" maxlength="50" />
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
index a3100691..0fafa7d7 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
@@ -1,6 +1,6 @@
 @inherits MenusBase
 
-<EditPage Id="role" TItem="Bootstrap.Security.BootstrapMenu" SubmitModalTitle="菜单编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
+<EditPage Id="role" FixedHeader="@FixedHeader" TItem="Bootstrap.Security.BootstrapMenu" SubmitModalTitle="菜单编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
     <QueryBody>
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.Name" maxlength="50" />
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.ParentName" maxlength="50" />
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor
index 1e40ba7b..cb1851c4 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Roles.razor
@@ -1,6 +1,6 @@
 @inherits RolesBase
 
-<EditPage Id="role" TItem="Bootstrap.DataAccess.Role" SubmitModalTitle="角色编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
+<EditPage Id="role" FixedHeader="@FixedHeader" TItem="Bootstrap.DataAccess.Role" SubmitModalTitle="角色编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
     <QueryBody>
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.RoleName" maxlength="50" />
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.Description" maxlength="50" />
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Users.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Users.razor
index 2b3677fc..a171efe4 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Users.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Users.razor
@@ -1,6 +1,6 @@
 @inherits UsersBase
 
-<EditPage Id="user" TItem="Bootstrap.DataAccess.User" SubmitModalTitle="用户编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
+<EditPage Id="user" FixedHeader="@FixedHeader" TItem="Bootstrap.DataAccess.User" SubmitModalTitle="用户编辑窗口" QueryModel="QueryModel" OnQuery="Query" OnAdd="Add" OnDelete="Delete" OnSave="Save">
     <QueryBody>
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.UserName" maxlength="50" />
         <LgbInputText ColumnClass="col-sm-auto" @bind-Value="@context.DisplayName" maxlength="50" />
diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 11c67c91..424a7cac 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -37,7 +37,7 @@
                 </table>
             </div>   
             <div class="fixed-table-body">                
-                <table class="table table-bordered table-hover table-selected" style="margin-top: -38px;">
+                <table class="table table-bordered table-hover table-selected" id="@RetrieveId()">
                     <thead>
                         <tr>
                             @if (ShowCheckbox)
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index 94372a89..945d5da1 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -136,6 +136,10 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
         height: 300px;
     }
 
+        .bootstrap-table .fixed-table-body table {
+            margin-top: -38px;
+        }
+
         .bootstrap-table .fixed-table-body thead th, .bootstrap-table .fixed-table-header thead th {
             border-bottom: 1px solid #dee2e6;
         }
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
index 9e13acf5..4a21e4b3 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
@@ -140,10 +140,34 @@
             var $tabContent = $('section .tab-content');
             if (showCardTitle) $tabContent.removeClass('no-card-header');
             else $tabContent.addClass('no-card-header');
+        },
+        initTable: function (id) {
+            var $table = $('#' + id);
+            var $tableContainer = $table.parents('.table-wrapper');
+            var $tableHeader = $tableContainer.find('.fixed-table-header table');
 
-            var $table = $(".bootstrap-table");
-            if (fixedTableHeader) $table.attr('data-header', 'fixed');
-            else $table.attr('data-header', 'scroll');
+            // resetWidth()
+            var $heads = $tableHeader.find('th');
+            var resetWidth = function () {
+                $table.find('th').each(function (index, element) {
+                    var header = $heads.get(index);
+                    $(header).width($(element).width());
+                });
+            }
+            resetWidth();
+
+            // modify scroll
+            $table.parent().overlayScrollbars({
+                className: 'os-theme-dark',
+                scrollbars: {
+                    autoHide: 'leave',
+                    autoHideDelay: 100
+                }
+            }).removeClass('d-none');
+
+            $(window).on('resize', function () {
+                resetWidth();
+            });
         }
     });
 

From 261f91683f381e80c906c30b861fc3b4cdd25140 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 09:34:33 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4=E4=B8=8D=E8=B5=B7=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
index 56701589..f10307a6 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
@@ -103,6 +103,7 @@ namespace Bootstrap.Pages.Admin.Components
         /// <returns></returns>
         protected override void OnParametersSet()
         {
+            base.OnParametersSet();
             QueryModel.Category = "";
             QueryModel.IsResource = -1;
             QueryApp.AddRange(DictHelper.RetrieveApps().Select(app => new SelectedItem() { Text = app.Value, Value = app.Key }));

From ef1718360e7edf74ad2ff00aca2ae5b01dd61fbb Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 10:24:14 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E4=BB=85=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=88=9D=E5=A7=8B=E5=8C=96=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Components/TableBase.cs           | 2 +-
 src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Components/TableBase.cs b/src/admin/Bootstrap.Admin/Components/TableBase.cs
index 87516a25..7f8313fe 100644
--- a/src/admin/Bootstrap.Admin/Components/TableBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/TableBase.cs
@@ -218,7 +218,7 @@ namespace Bootstrap.Admin.Components
             if (FixedHeader)
             {
                 // 调用客户端脚本 resetWith
-                await JSRuntime.InitTableAsync(RetrieveId());
+                await JSRuntime.InitTableAsync(RetrieveId(), firstRender);
             }
         }
 
diff --git a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs b/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
index 1caf030a..0da63861 100644
--- a/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
+++ b/src/admin/Bootstrap.Admin/Extensions/JSRuntimeExtensions.cs
@@ -101,6 +101,9 @@ namespace Bootstrap.Admin.Extensions
         /// <summary>
         /// 初始化 Table 组件
         /// </summary>
-        public static ValueTask InitTableAsync(this IJSRuntime? jSRuntime, string id) => jSRuntime.InvokeVoidAsync("$.initTable", id);
+        /// <param name="jSRuntime"></param>
+        /// <param name="id"></param>
+        /// <param name="firstRender"></param>
+        public static ValueTask InitTableAsync(this IJSRuntime? jSRuntime, string id, bool firstRender) => jSRuntime.InvokeVoidAsync("$.initTable", id, firstRender);
     }
 }

From 0aabbb8c504408fcc385026d3eb052204f09837a Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 10:28:27 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E6=B6=88=E9=99=A4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=AE=BD=E5=BA=A6=E6=97=B6=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E6=8A=96=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Shared/Table.razor  |  2 +-
 .../Bootstrap.Admin/wwwroot/css/blazor.css    |  6 ++-
 .../Bootstrap.Admin/wwwroot/js/ba.blazor.js   | 53 +++++++++++--------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 424a7cac..406eae98 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -36,7 +36,7 @@
                     </thead>
                 </table>
             </div>   
-            <div class="fixed-table-body">                
+            <div class="fixed-table-body invisible">                
                 <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 945d5da1..11090234 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -130,6 +130,10 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     margin-bottom: 0;
 }
 
+    .bootstrap-table .fixed-table-header {
+        overflow: hidden;
+    }
+
     .bootstrap-table .fixed-table-body {
         overflow: auto;
         border-radius: 4px;
@@ -151,7 +155,7 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
 }
 
     .table-wrapper .table {
-        margin-bottom: 1px;
+        margin-bottom: 0;
     }
 
 .pagination-bar {
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
index 4a21e4b3..abbe4d5d 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
@@ -141,33 +141,42 @@
             if (showCardTitle) $tabContent.removeClass('no-card-header');
             else $tabContent.addClass('no-card-header');
         },
-        initTable: function (id) {
-            var $table = $('#' + id);
-            var $tableContainer = $table.parents('.table-wrapper');
-            var $tableHeader = $tableContainer.find('.fixed-table-header table');
+        resetTableWidth: function (source, target) {
+            // 设置表格宽度
+            target.width(source.width());
 
-            // resetWidth()
-            var $heads = $tableHeader.find('th');
-            var resetWidth = function () {
-                $table.find('th').each(function (index, element) {
-                    var header = $heads.get(index);
-                    $(header).width($(element).width());
+            // 设置各列宽度
+            var $heads = target.find('th');
+            source.find('th').each(function (index, element) {
+                var header = $heads.get(index);
+                $(header).width($(element).width());
+            });
+        },
+        initTable: function (id, firstRender) {
+            var $table = $('#' + id);
+
+            if (firstRender) {
+                // modify scroll
+                $table.parent().overlayScrollbars({
+                    className: 'os-theme-dark',
+                    scrollbars: {
+                        autoHide: 'leave',
+                        autoHideDelay: 100
+                    }
                 });
             }
-            resetWidth();
 
-            // modify scroll
-            $table.parent().overlayScrollbars({
-                className: 'os-theme-dark',
-                scrollbars: {
-                    autoHide: 'leave',
-                    autoHideDelay: 100
-                }
-            }).removeClass('d-none');
+            var $tableContainer = $table.parents('.table-wrapper');
+            var $tableHeader = $tableContainer.find('.fixed-table-header table');
+            $.resetTableWidth($table, $tableHeader);
 
-            $(window).on('resize', function () {
-                resetWidth();
-            });
+            if (firstRender) {
+                $tableContainer.find('.fixed-table-body').removeClass('invisible');
+
+                $(window).on('resize', function () {
+                    $.resetTableWidth($table, $tableHeader);
+                });
+            }
         }
     });
 

From 38134e2f0acd8e81e5922d039c7f8ab5b86e12f9 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 10:43:21 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E8=A1=A8=E5=A4=B4=20table=20border=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Shared/Table.razor  |  2 +-
 .../Bootstrap.Admin/wwwroot/css/blazor.css    | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Shared/Table.razor b/src/admin/Bootstrap.Admin/Shared/Table.razor
index 406eae98..8b2be987 100644
--- a/src/admin/Bootstrap.Admin/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Shared/Table.razor
@@ -12,7 +12,7 @@
         </TableToolbar>
     </div>
 
-    <div class="table-wrapper">
+    <div class="@(FixedHeader ? "table-wrapper table-fixed-header" : "table-wrapper")">
         @if(FixedHeader)
         {
             <div class="fixed-table-header">
diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index 11090234..a91f7526 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -135,8 +135,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     }
 
     .bootstrap-table .fixed-table-body {
-        overflow: auto;
-        border-radius: 4px;
         height: 300px;
     }
 
@@ -150,7 +148,6 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
 
 .table-wrapper {
     border-radius: 4px;
-    overflow: auto;
     margin-bottom: 1rem;
 }
 
@@ -158,6 +155,22 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
         margin-bottom: 0;
     }
 
+.table-fixed-header {
+    border: solid 1px #dee2e6;
+}
+
+    .table-fixed-header .table {
+        border: none;
+    }
+
+        .table-fixed-header .table th:last-child {
+            border-right-width: 0;
+        }
+
+        .table-fixed-header .table th:first-child, .table-fixed-header .table td:first-child {
+            border-left-width: 0;
+        }
+
 .pagination-bar {
     flex: 1 1 auto;
     margin-bottom: 1rem;

From ca3cbdc6e5d7d55b5ae1284777e42688af3ff2f0 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 22 Jan 2020 15:34:25 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20Blazor=20=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4=E6=98=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=AB=98=E5=BA=A6=E5=8A=A8=E6=80=81=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/wwwroot/css/blazor.css      |  2 +-
 .../Bootstrap.Admin/wwwroot/js/ba.blazor.js     | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
index a91f7526..903523db 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
+++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css
@@ -135,7 +135,7 @@ nav .dropdown .nav-link-close.dropdown-toggle:after {
     }
 
     .bootstrap-table .fixed-table-body {
-        height: 300px;
+        min-height: 400px;
     }
 
         .bootstrap-table .fixed-table-body table {
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
index abbe4d5d..042ef339 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
@@ -152,10 +152,26 @@
                 $(header).width($(element).width());
             });
         },
+        resetTableHeight(source) {
+            var table = source;
+            var height = 0;
+            do {
+                height += source.position().top;
+                source = source.parent();
+                if (source.hasClass('tab-content')) break;
+            }
+            while (source.length === 1);
+            height = $(window).height() - height - 15;
+            table.height(height);
+        },
         initTable: function (id, firstRender) {
             var $table = $('#' + id);
+            var $fixedBody = $table.parents('.fixed-table-body');
 
             if (firstRender) {
+                // calc height
+                $.resetTableHeight($fixedBody);
+
                 // modify scroll
                 $table.parent().overlayScrollbars({
                     className: 'os-theme-dark',
@@ -175,6 +191,7 @@
 
                 $(window).on('resize', function () {
                     $.resetTableWidth($table, $tableHeader);
+                    $.resetTableHeight($fixedBody);
                 });
             }
         }