Merge pull request #7660 from wenzhixin/fix/bug-7588

Fixed column is undefined bug in updateFieldGroup when using refreshO…
wenzhixin · Dec 21, 2024 · 7b9c41d · 7b9c41d
2 parents ce20547 + 830e8f3
commit 7b9c41d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -219,7 +219,9 @@ class BootstrapTable {
     this.columns = []
     this.fieldsColumnsIndex = []
 
-    Utils.setFieldIndex(this.options.columns)
+    if (this.optionsColumnsChanged !== false) {
+      Utils.setFieldIndex(this.options.columns)
+    }
 
     this.options.columns.forEach((columns, i) => {
       columns.forEach((_column, j) => {
@@ -2434,6 +2436,7 @@ class BootstrapTable {
     if (Utils.compareObjects(this.options, options, true)) {
       return
     }
+    this.optionsColumnsChanged = !!options.columns
     this.options = Utils.extend(this.options, options)
     this.trigger('refresh-options', this.options)
     this.destroy()

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -296,10 +296,6 @@ export default {
             const underColumns = allColumns.filter(col => col.fieldIndex === i)
             const column = underColumns[underColumns.length - 1]
 
-            if (!column) {
-              continue
-            }
-
             if (underColumns.length > 1) {
               for (let j = 0; j < underColumns.length - 1; j++) {
                 underColumns[j].visible = column.visible