From 02f0c54f10593918165b34c6735ec5dcb7cbf93a Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 30 Jan 2024 17:15:34 +0100 Subject: [PATCH] Adapted Filter.js to ensure displaying tabulator 'formatter' columns not provided by filtersupdate filter definition ...like rowSelection checkboxes or custom formatted action buttons --- public/js/components/filter/Filter.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js index b7fd30df7..07bdeac02 100644 --- a/public/js/components/filter/Filter.js +++ b/public/js/components/filter/Filter.js @@ -136,9 +136,9 @@ export const CoreFilterCmpt = { for (let col of columns) { // If the column has to be displayed or not - col.visible = selectedFields.indexOf(col.field) >= 0; - if (col.formatter == 'rowSelection') - col.visible = true; + /* fields.indexOf(col.field) == -1; ensures displaying formatter colums + e.g. column with rowSelection checkboxes or with custom formatted action buttons */ + col.visible = selectedFields.indexOf(col.field) >= 0 || fields.indexOf(col.field) == -1; if (col.hasOwnProperty('resizable')) col.resizable = col.visible; @@ -265,6 +265,7 @@ export const CoreFilterCmpt = { this.filterName = data.filterName; this.dataset = data.dataset; this.datasetMetadata = data.datasetMetadata; + this.fields = data.fields; this.selectedFields = data.selectedFields; this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);