diff --git a/src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor b/src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor index 9ed0be32..bfe7b9d0 100644 --- a/src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor +++ b/src/admin/Bootstrap.Admin/Pages/Shared/EditPage.razor @@ -6,6 +6,7 @@ 查询结果
+ @TableInfoTemplate @TableToolbarTemplate diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css index 04f404ca..d7c58dcb 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/blazor.css @@ -136,7 +136,7 @@ nav .dropdown .nav-link-close.dropdown-toggle:after { } .bootstrap-table .table-fixed { - height: 388px; + height: 324px; overflow: hidden; } @@ -149,7 +149,7 @@ nav .dropdown .nav-link-close.dropdown-toggle:after { } .bootstrap-table .fixed-table-body { - min-height: 348px; + min-height: 284px; } .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 b416d09a..744d1389 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js @@ -187,16 +187,10 @@ $(header).width($(element).width()); }); }, - resetTableHeight(source) { + resetTableHeight: function (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 - 38; + var height = source.parents('.bootstrap-table').position().top; + height = $(window).height() - height - 184 - 51 - 45 - 37; table.height(height); }, initTable: function (id, firstRender) { diff --git a/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js index 2ba5dd01..ceceeeca 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js +++ b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js @@ -474,7 +474,7 @@ marginHeight += calcPrevHeight($prev); marginHeight += calcParentHeight(element.parent()); } - return Math.max(settings.minHeight, $(window).height() - $('header').outerHeight(true) - $('footer').outerHeight(true) - marginHeight - 15 - 10); + return Math.max(settings.minHeight, $(window).height() - $('header').outerHeight(true) - $('footer').outerHeight(true) - marginHeight - 20 - 10); }; }