修复固定列在cardView模式下报错的BUG

karsonzhang · karsonzhang · commit a5fd46c86704 · 2020-09-17T16:58:00.000+08:00
diff --git a/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.js b/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.js
@@ -169,22 +169,25 @@
                 this.$tableBody.css("height", "100%");
                 this.$fixedColumns && this.$fixedColumns.show();
                 this.$fixedColumnsRight && this.$fixedColumnsRight.show();
-                this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());
-                this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());
+                this.$fixedHeaderRight && this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());
+                this.$fixedBodyRight && this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());
             }
         }
         if (!that.fixedColumnsSupported()) {
             return;
         }
         if (arguments[0] === 'post-header') {
+            if (!this.$fixedColumns && !this.$fixedColumnsRight) {
+                this.initFixedContainer();
+            }
             this.initFixedColumnsHeader();
         } else if (arguments[0] === 'scroll-body') {
             if (this.needFixedColumns && this.options.fixedNumber) {
-                this.$fixedBody.scrollTop(this.$tableBody.scrollTop());
+                this.$fixedBody && this.$fixedBody.scrollTop(this.$tableBody.scrollTop());
             }
 
             if (this.needFixedColumns && this.options.fixedRightNumber) {
-                this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());
+                this.$fixedBodyRight && this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());
             }
         } else if (arguments[0] === 'load-success') {
             this.hideLoading();
diff --git a/src/extensions/fixed-columns/bootstrap-table-fixed-columns.js b/src/extensions/fixed-columns/bootstrap-table-fixed-columns.js
@@ -169,22 +169,25 @@
                 this.$tableBody.css("height", "100%");
                 this.$fixedColumns && this.$fixedColumns.show();
                 this.$fixedColumnsRight && this.$fixedColumnsRight.show();
-                this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());
-                this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());
+                this.$fixedHeaderRight && this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());
+                this.$fixedBodyRight && this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());
             }
         }
         if (!that.fixedColumnsSupported()) {
             return;
         }
         if (arguments[0] === 'post-header') {
+            if (!this.$fixedColumns && !this.$fixedColumnsRight) {
+                this.initFixedContainer();
+            }
             this.initFixedColumnsHeader();
         } else if (arguments[0] === 'scroll-body') {
             if (this.needFixedColumns && this.options.fixedNumber) {
-                this.$fixedBody.scrollTop(this.$tableBody.scrollTop());
+                this.$fixedBody && this.$fixedBody.scrollTop(this.$tableBody.scrollTop());
             }
 
             if (this.needFixedColumns && this.options.fixedRightNumber) {
-                this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());
+                this.$fixedBodyRight && this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());
             }
         } else if (arguments[0] === 'load-success') {
             this.hideLoading();

Original file line number	Diff line number	Diff line change
`@@ -169,22 +169,25 @@`
`169`	`169`	`this.$tableBody.css("height", "100%");`
`170`	`170`	`this.$fixedColumns && this.$fixedColumns.show();`
`171`	`171`	`this.$fixedColumnsRight && this.$fixedColumnsRight.show();`
`172`		`- this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());`
`173`		`- this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());`
	`172`	`+ this.$fixedHeaderRight && this.$fixedHeaderRight.scrollLeft(this.$tableBody.find('table').width());`
	`173`	`+ this.$fixedBodyRight && this.$fixedBodyRight.scrollLeft(this.$tableBody.find('table').width());`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`if (!that.fixedColumnsSupported()) {`
`177`	`177`	`return;`
`178`	`178`	`}`
`179`	`179`	`if (arguments[0] === 'post-header') {`
	`180`	`+ if (!this.$fixedColumns && !this.$fixedColumnsRight) {`
	`181`	`+ this.initFixedContainer();`
	`182`	`+ }`
`180`	`183`	`this.initFixedColumnsHeader();`
`181`	`184`	`} else if (arguments[0] === 'scroll-body') {`
`182`	`185`	`if (this.needFixedColumns && this.options.fixedNumber) {`
`183`		`- this.$fixedBody.scrollTop(this.$tableBody.scrollTop());`
	`186`	`+ this.$fixedBody && this.$fixedBody.scrollTop(this.$tableBody.scrollTop());`
`184`	`187`	`}`
`185`	`188`
`186`	`189`	`if (this.needFixedColumns && this.options.fixedRightNumber) {`
`187`		`- this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());`
	`190`	`+ this.$fixedBodyRight && this.$fixedBodyRight.scrollTop(this.$tableBody.scrollTop());`
`188`	`191`	`}`
`189`	`192`	`} else if (arguments[0] === 'load-success') {`
`190`	`193`	`this.hideLoading();`