Browse Source

Update bootstrap-table-export.js

文翼 5 years ago
parent
commit
b76890d1de
2 changed files with 5 additions and 2 deletions
  1. 4 1
      src/bootstrap-table.js
  2. 1 1
      src/extensions/export/bootstrap-table-export.js

+ 4 - 1
src/bootstrap-table.js

@@ -252,7 +252,10 @@ class BootstrapTable {
       let detailViewTemplate = ''
 
       if (i === 0 && Utils.hasDetailViewIcon(this.options)) {
-        detailViewTemplate = `<th class="detail" rowspan="${this.options.columns.length}">
+        const rowspan = this.options.columns.length > 1 ?
+          ` rowspan="${this.options.columns.length}"` : ''
+
+        detailViewTemplate = `<th class="detail"${rowspan}>
           <div class="fht-cell"></div>
           </th>`
       }

+ 1 - 1
src/extensions/export/bootstrap-table-export.js

@@ -199,7 +199,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
       if (o.detailView && o.detailViewIcon) {
         const detailViewIndex = o.detailViewAlign === 'left' ? 0 : this.getVisibleFields().length + Utils.getDetailViewIndexOffset(this.options)
 
-        o.exportOptions.ignoreColumn = $.merge(o.exportOptions.ignoreColumn || [], [detailViewIndex])
+        o.exportOptions.ignoreColumn = [detailViewIndex].concat(o.exportOptions.ignoreColumn || [])
       }
 
       if (o.exportFooter) {