优化子元素TD选择器

优化固定列高度计算

Author: karsonzhang

dist/bootstrap-table.js

@@ -1937,7 +1937,7 @@
             for (var key in events) {
                 that.$body.find('>tr:not(.no-records-found)').each(function () {
                     var $tr = $(this),
-                        $td = $tr.find(that.options.cardView ? '.card-view' : 'td').eq(fieldIndex),
+                        $td = $tr.find(that.options.cardView ? '.card-view' : '>td').eq(fieldIndex),
                         index = key.indexOf(' '),
                         name = key.substring(0, index),
                         el = key.substring(index + 1),

dist/bootstrap-table.min.js

@@ -287,19 +287,21 @@
             var $fixedBody = $fixedColumns.find('.fixed-table-body');
 
             var tableBody = that.$tableBody.get(0);
-            var scrollHeight = tableBody.scrollWidth > tableBody.clientWidth ? getScrollBarWidth() : 0;
-            var paginationHeight = $(".fixed-table-pagination", that.$tableContainer).height();
-            if (typeof that.options.height !== 'undefined') paginationHeight = 0;
-            var height = that.$tableContainer.outerHeight(true) - scrollHeight - paginationHeight + 1;
-            $fixedColumns.css({
-                height: height,
-                "min-height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
-            });
-            $fixedBody.css({
-                height: height - $fixedHeader.height(),
-                "min-height": "calc(100% - " + $fixedHeader.height() + "px)",
-                overflow: "hidden"
-            });
+
+            var resizeHeight = function (){
+                var scrollHeight = tableBody.scrollWidth > tableBody.clientWidth ? getScrollBarWidth() : 0;
+                var paginationHeight = $(".fixed-table-pagination", that.$tableContainer).height();
+                if (typeof that.options.height !== 'undefined') paginationHeight = 0;
+                $fixedColumns.css({
+                    "height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
+                });
+                $fixedBody.css({
+                    "height": "calc(100% - " + $fixedHeader.height() + "px)",
+                    overflow: "hidden"
+                });
+            };
+            $(window).on("resize", resizeHeight);
+            resizeHeight();
 
             return $fixedBody;
         };

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

@@ -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.9",
+  "version": "1.11.10",
   "main": "./dist/bootstrap-table.js",
   "devDependencies": {
     "cz-conventional-changelog": "^1.1.5",
@@ -36,5 +36,8 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "dependencies": {
+    "uglify-js": "^2.8.29"
   }
 }

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

@@ -1937,7 +1937,7 @@
             for (var key in events) {
                 that.$body.find('>tr:not(.no-records-found)').each(function () {
                     var $tr = $(this),
-                        $td = $tr.find(that.options.cardView ? '.card-view' : 'td').eq(fieldIndex),
+                        $td = $tr.find(that.options.cardView ? '.card-view' : '>td').eq(fieldIndex),
                         index = key.indexOf(' '),
                         name = key.substring(0, index),
                         el = key.substring(index + 1),

package.json

@@ -287,19 +287,21 @@
             var $fixedBody = $fixedColumns.find('.fixed-table-body');
 
             var tableBody = that.$tableBody.get(0);
-            var scrollHeight = tableBody.scrollWidth > tableBody.clientWidth ? getScrollBarWidth() : 0;
-            var paginationHeight = $(".fixed-table-pagination", that.$tableContainer).height();
-            if (typeof that.options.height !== 'undefined') paginationHeight = 0;
-            var height = that.$tableContainer.outerHeight(true) - scrollHeight - paginationHeight + 1;
-            $fixedColumns.css({
-                height: height,
-                "min-height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
-            });
-            $fixedBody.css({
-                height: height - $fixedHeader.height(),
-                "min-height": "calc(100% - " + $fixedHeader.height() + "px)",
-                overflow: "hidden"
-            });
+
+            var resizeHeight = function (){
+                var scrollHeight = tableBody.scrollWidth > tableBody.clientWidth ? getScrollBarWidth() : 0;
+                var paginationHeight = $(".fixed-table-pagination", that.$tableContainer).height();
+                if (typeof that.options.height !== 'undefined') paginationHeight = 0;
+                $fixedColumns.css({
+                    "height": "calc(100% - " + (paginationHeight + scrollHeight) + "px)"
+                });
+                $fixedBody.css({
+                    "height": "calc(100% - " + $fixedHeader.height() + "px)",
+                    overflow: "hidden"
+                });
+            };
+            $(window).on("resize", resizeHeight);
+            resizeHeight();
 
             return $fixedBody;
         };