优化固定列高度计算

Author: karsonzhang

dist/extensions/fixed-columns/bootstrap-table-fixed-columns.js

@@ -292,11 +292,13 @@
             if (typeof that.options.height !== 'undefined') paginationHeight = 0;
             var height = that.$tableContainer.outerHeight(true) - scrollHeight - paginationHeight + 1;
             $fixedColumns.css({
-                height: height
+                height: height,
+                "min-height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
             });
-
             $fixedBody.css({
-                height: height - $fixedHeader.height()
+                height: height - $fixedHeader.height(),
+                "min-height": "calc(100% - " + $fixedHeader.height() + "px)",
+                overflow: "hidden"
             });
 
             return $fixedBody;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fastadmin-bootstraptable",
   "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features. (supports twitter bootstrap v2 and v3).",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "main": "./dist/bootstrap-table.js",
   "devDependencies": {
     "cz-conventional-changelog": "^1.1.5",

src/extensions/fixed-columns/bootstrap-table-fixed-columns.js

@@ -292,11 +292,13 @@
             if (typeof that.options.height !== 'undefined') paginationHeight = 0;
             var height = that.$tableContainer.outerHeight(true) - scrollHeight - paginationHeight + 1;
             $fixedColumns.css({
-                height: height
+                height: height,
+                "min-height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
             });
-
             $fixedBody.css({
-                height: height - $fixedHeader.height()
+                height: height - $fixedHeader.height(),
+                "min-height": "calc(100% - " + $fixedHeader.height() + "px)",
+                overflow: "hidden"
             });
 
             return $fixedBody;