浏览代码

Not support detailView option

zhixin 5 年之前
父节点
当前提交
966a7501db
共有 2 个文件被更改,包括 16 次插入10 次删除
  1. 4 0
      site/docs/extensions/fixed-columns.md
  2. 12 10
      src/extensions/fixed-columns/bootstrap-table-fixed-columns.js

+ 4 - 0
site/docs/extensions/fixed-columns.md

@@ -52,3 +52,7 @@ toc: true
   The number of the right fixed columns.
   The number of the right fixed columns.
 
 
 - **Default:** `0`
 - **Default:** `0`
+
+## Note
+
+* This extension does not support `detailView` option.

+ 12 - 10
src/extensions/fixed-columns/bootstrap-table-fixed-columns.js

@@ -11,19 +11,17 @@ $.extend($.fn.bootstrapTable.defaults, {
 $.BootstrapTable = class extends $.BootstrapTable {
 $.BootstrapTable = class extends $.BootstrapTable {
 
 
   initContainer () {
   initContainer () {
-    if (
-      this.options.fixedColumns &&
-      (this.options.fixedNumber || this.options.fixedRightNumber)
-    ) {
+    if (!this.options.fixedColumns || this.options.detailView) {
+      super.initContainer()
+      return
+    }
+
+    if (this.options.fixedNumber || this.options.fixedRightNumber) {
       this.options.classes = this.options.classes.replace('table-hover', '')
       this.options.classes = this.options.classes.replace('table-hover', '')
     }
     }
 
 
     super.initContainer()
     super.initContainer()
 
 
-    if (!this.options.fixedColumns) {
-      return
-    }
-
     if (this.options.fixedNumber) {
     if (this.options.fixedNumber) {
       this.$tableContainer.append('<div class="fixed-columns"></div>')
       this.$tableContainer.append('<div class="fixed-columns"></div>')
       this.$fixedColumns = this.$tableContainer.find('.fixed-columns')
       this.$fixedColumns = this.$tableContainer.find('.fixed-columns')
@@ -38,7 +36,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
   fitHeader (...args) {
   fitHeader (...args) {
     super.fitHeader(...args)
     super.fitHeader(...args)
 
 
-    if (!this.options.fixedColumns) {
+    if (!this.options.fixedColumns || this.options.detailView) {
       return
       return
     }
     }
 
 
@@ -76,7 +74,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
   initBody (...args) {
   initBody (...args) {
     super.initBody(...args)
     super.initBody(...args)
 
 
-    if (!this.options.fixedColumns) {
+    if (!this.options.fixedColumns || this.options.detailView) {
       return
       return
     }
     }
 
 
@@ -131,6 +129,10 @@ $.BootstrapTable = class extends $.BootstrapTable {
   trigger (...args) {
   trigger (...args) {
     super.trigger(...args)
     super.trigger(...args)
 
 
+    if (!this.options.fixedColumns || this.options.detailView) {
+      return
+    }
+
     if (args[0] === 'scroll-body') {
     if (args[0] === 'scroll-body') {
       if (this.needFixedColumns && this.options.fixedNumber) {
       if (this.needFixedColumns && this.options.fixedNumber) {
         this.$fixedBody.scrollTop(this.$tableBody.scrollTop())
         this.$fixedBody.scrollTop(this.$tableBody.scrollTop())