Merge pull request #7494 from wenzhixin/fix/7472

Fixed compatibility issues when colspan is set as string
wenzhixin · Sep 10, 2024 · 46eb2b0 · 46eb2b0
2 parents f422a05 + 0bbe4c7
commit 46eb2b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -2899,8 +2899,8 @@ class BootstrapTable {
   mergeCells (options) {
     const row = options.index
     let col = this.getVisibleFields().indexOf(options.field)
-    const rowspan = options.rowspan || 1
-    const colspan = options.colspan || 1
+    const rowspan = +options.rowspan || 1
+    const colspan = +options.colspan || 1
     let i
     let j
     const $tr = this.$body.find('>tr[data-index]')

diff --git a/src/extensions/print/bootstrap-table-print.js b/src/extensions/print/bootstrap-table-print.js
@@ -131,8 +131,8 @@ $.BootstrapTable = class extends $.BootstrapTable {
     this.mergedCells.push({
       row: options.index,
       col,
-      rowspan: options.rowspan || 1,
-      colspan: options.colspan || 1
+      rowspan: +options.rowspan || 1,
+      colspan: +options.colspan || 1
     })
   }
 

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -247,7 +247,7 @@ export default {
     const flag = []
 
     for (const column of columns[0]) {
-      totalCol += column.colspan || 1
+      totalCol += +column.colspan || 1
     }
 
     for (let i = 0; i < columns.length; i++) {
@@ -259,8 +259,8 @@ export default {
 
     for (let i = 0; i < columns.length; i++) {
       for (const r of columns[i]) {
-        const rowspan = r.rowspan || 1
-        const colspan = r.colspan || 1
+        const rowspan = +r.rowspan || 1
+        const colspan = +r.colspan || 1
         const index = flag[i].indexOf(false)
 
         r.colspanIndex = index
@@ -272,7 +272,7 @@ export default {
             r.field = index
           }
         } else {
-          r.colspanGroup = r.colspan
+          r.colspanGroup = +r.colspan
         }
 
         for (let j = 0; j < rowspan; j++) {