From b3f281b2146085226ec6741ce30cb9c6cbd6b00c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 7 Mar 2018 14:49:36 +0530 Subject: [PATCH] refresh api can now update columns --- dist/frappe-datatable.cjs.js | 9 ++++++--- dist/frappe-datatable.js | 9 ++++++--- docs/assets/frappe-datatable.js | 9 ++++++--- src/datamanager.js | 5 ++++- src/datatable.js | 4 ++-- src/rowmanager.js | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dist/frappe-datatable.cjs.js b/dist/frappe-datatable.cjs.js index c170bf6..d10f8ad 100644 --- a/dist/frappe-datatable.cjs.js +++ b/dist/frappe-datatable.cjs.js @@ -853,10 +853,13 @@ class DataManager { this.filterRows = promisify(this.filterRows, this); } - init(data) { + init(data, columns) { if (!data) { data = this.options.data; } + if (columns) { + this.options.columns = columns; + } this.data = data; @@ -3420,8 +3423,8 @@ class DataTable { this.toastMessage = $('.toast-message', this.wrapper); } - refresh(data) { - this.datamanager.init(data); + refresh(data, columns) { + this.datamanager.init(data, columns); this.render(); this.setDimensions(); } diff --git a/dist/frappe-datatable.js b/dist/frappe-datatable.js index dcf52e5..351a037 100644 --- a/dist/frappe-datatable.js +++ b/dist/frappe-datatable.js @@ -852,10 +852,13 @@ class DataManager { this.filterRows = promisify(this.filterRows, this); } - init(data) { + init(data, columns) { if (!data) { data = this.options.data; } + if (columns) { + this.options.columns = columns; + } this.data = data; @@ -3419,8 +3422,8 @@ class DataTable { this.toastMessage = $('.toast-message', this.wrapper); } - refresh(data) { - this.datamanager.init(data); + refresh(data, columns) { + this.datamanager.init(data, columns); this.render(); this.setDimensions(); } diff --git a/docs/assets/frappe-datatable.js b/docs/assets/frappe-datatable.js index dcf52e5..351a037 100644 --- a/docs/assets/frappe-datatable.js +++ b/docs/assets/frappe-datatable.js @@ -852,10 +852,13 @@ class DataManager { this.filterRows = promisify(this.filterRows, this); } - init(data) { + init(data, columns) { if (!data) { data = this.options.data; } + if (columns) { + this.options.columns = columns; + } this.data = data; @@ -3419,8 +3422,8 @@ class DataTable { this.toastMessage = $('.toast-message', this.wrapper); } - refresh(data) { - this.datamanager.init(data); + refresh(data, columns) { + this.datamanager.init(data, columns); this.render(); this.setDimensions(); } diff --git a/src/datamanager.js b/src/datamanager.js index 47ff9c7..4f834de 100644 --- a/src/datamanager.js +++ b/src/datamanager.js @@ -14,10 +14,13 @@ export default class DataManager { this.filterRows = promisify(this.filterRows, this); } - init(data) { + init(data, columns) { if (!data) { data = this.options.data; } + if (columns) { + this.options.columns = columns; + } this.data = data; diff --git a/src/datatable.js b/src/datatable.js index 595b45d..966c9ee 100644 --- a/src/datatable.js +++ b/src/datatable.js @@ -73,8 +73,8 @@ class DataTable { this.toastMessage = $('.toast-message', this.wrapper); } - refresh(data) { - this.datamanager.init(data); + refresh(data, columns) { + this.datamanager.init(data, columns); this.render(); this.setDimensions(); } diff --git a/src/rowmanager.js b/src/rowmanager.js index 6c1a3c7..8f104d3 100644 --- a/src/rowmanager.js +++ b/src/rowmanager.js @@ -76,7 +76,7 @@ export default class RowManager { for (let rowIndex in this.checkMap) { const checked = this.checkMap[rowIndex]; if (checked === 1) { - out.push(rowIndex) + out.push(rowIndex); } }