From 098da731f4432ee8fcd4937b91f36d061fca6f84 Mon Sep 17 00:00:00 2001 From: Darc-Charlie Date: Mon, 23 Sep 2024 16:03:58 -0500 Subject: [PATCH 1/2] Return formatted data for all columns in all rows - Ensures the returned array is an array of objects where each object has a property for every valid column --- src/bootstrap-table.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js index b32510a3f..3f7aae7d3 100644 --- a/src/bootstrap-table.js +++ b/src/bootstrap-table.js @@ -2464,6 +2464,7 @@ class BootstrapTable { if (params && params.formatted) { return data.map(row => { + const formattedColumns = {} for (const [key, value] of Object.entries(row)) { const column = this.columns[this.fieldsColumnsIndex[key]] @@ -2471,9 +2472,10 @@ class BootstrapTable { continue } - return Utils.calculateObjectValue(column, this.header.formatters[column.fieldIndex], + formattedColumns[key] = Utils.calculateObjectValue(column, this.header.formatters[column.fieldIndex], [value, row, row.index, column.field], value) } + return formattedColumns }) } From ee64e5ff658730d554cb5d317000988d52013349 Mon Sep 17 00:00:00 2001 From: Darc-Charlie Date: Thu, 26 Sep 2024 14:14:04 -0500 Subject: [PATCH 2/2] Update src/bootstrap-table.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add padding line Co-authored-by: 文翼 --- src/bootstrap-table.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js index 3f7aae7d3..adbe9dba0 100644 --- a/src/bootstrap-table.js +++ b/src/bootstrap-table.js @@ -2465,6 +2465,7 @@ class BootstrapTable { if (params && params.formatted) { return data.map(row => { const formattedColumns = {} + for (const [key, value] of Object.entries(row)) { const column = this.columns[this.fieldsColumnsIndex[key]]