From ae6c2eee6b1be3598615e81428ecb884b1c23518 Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Tue, 19 Apr 2016 15:28:37 +0200 Subject: [PATCH] Continued columns visibility persistence --- dist/tablefilter/style/colsVisibility.css | 2 +- dist/tablefilter/style/filtersVisibility.css | 2 +- dist/tablefilter/style/tablefilter.css | 2 +- .../style/themes/default/default.css | 2 +- .../style/themes/mytheme/mytheme.css | 2 +- .../style/themes/skyblue/skyblue.css | 2 +- dist/tablefilter/tablefilter.js | 46 +++++++++++------- dist/tablefilter/tf-1.js | 28 ++++++++--- .../colsVisibility/colsVisibility.js | 34 ++++++++----- src/modules/state.js | 48 ++++++++++++------- static/templates/columns-visibility.html | 2 +- 11 files changed, 112 insertions(+), 58 deletions(-) diff --git a/dist/tablefilter/style/colsVisibility.css b/dist/tablefilter/style/colsVisibility.css index f100e211..6253e1a0 100644 --- a/dist/tablefilter/style/colsVisibility.css +++ b/dist/tablefilter/style/colsVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff} \ No newline at end of file diff --git a/dist/tablefilter/style/filtersVisibility.css b/dist/tablefilter/style/filtersVisibility.css index 5e4e78b0..1b45dc5c 100644 --- a/dist/tablefilter/style/filtersVisibility.css +++ b/dist/tablefilter/style/filtersVisibility.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px} \ No newline at end of file diff --git a/dist/tablefilter/style/tablefilter.css b/dist/tablefilter/style/tablefilter.css index 23d882c4..bf83745d 100644 --- a/dist/tablefilter/style/tablefilter.css +++ b/dist/tablefilter/style/tablefilter.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ .activeHeader{background-color:#66afe9 !important;color:#fff !important} diff --git a/dist/tablefilter/style/themes/default/default.css b/dist/tablefilter/style/themes/default/default.css index efec4224..bc19c6c9 100644 --- a/dist/tablefilter/style/themes/default/default.css +++ b/dist/tablefilter/style/themes/default/default.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ table.TF{border-left:1px solid #ccc;border-top:none;border-right:none;border-bottom:none;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;border-left:1px solid #fff;border-top:1px solid #fff;color:#333}table.TF td{border-bottom:1px dotted #999;padding:5px}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#999 !important} \ No newline at end of file diff --git a/dist/tablefilter/style/themes/mytheme/mytheme.css b/dist/tablefilter/style/themes/mytheme/mytheme.css index 0866d508..6306cb02 100644 --- a/dist/tablefilter/style/themes/mytheme/mytheme.css +++ b/dist/tablefilter/style/themes/mytheme/mytheme.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ table.TF{border-left:1px dotted #81963b;border-top:none;border-right:0;border-bottom:none;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x;border-bottom:0;border-right:1px dotted #d0d0d0;border-left:0;border-top:0;color:#fff}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#81963b !important} \ No newline at end of file diff --git a/dist/tablefilter/style/themes/skyblue/skyblue.css b/dist/tablefilter/style/themes/skyblue/skyblue.css index 34024bc1..b11ad410 100644 --- a/dist/tablefilter/style/themes/skyblue/skyblue.css +++ b/dist/tablefilter/style/themes/skyblue/skyblue.css @@ -1,6 +1,6 @@ /** * tablefilter v0.2.12 by Max Guglielmi - * build date: 2016-04-18T07:24:04.224Z + * build date: 2016-04-19T12:19:44.232Z * MIT License */ table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important} \ No newline at end of file diff --git a/dist/tablefilter/tablefilter.js b/dist/tablefilter/tablefilter.js index 27110d87..9df388ac 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -7656,7 +7656,7 @@ return /******/ (function(modules) { // webpackBootstrap this.emitter.on(['sort-initialized'], function () { return _this2._syncSort(); }); - this.emitter.on(['colsVisibility-initialized'], function () { + this.emitter.on(['columns-visibility-initialized'], function () { return _this2._syncColsVisibility(); }); this.emitter.on(['column-shown', 'column-hidden'], function (tf, feature, colIndex, hiddenCols) { @@ -7738,8 +7738,7 @@ return /******/ (function(modules) { // webpackBootstrap if (this.persistColsVisibility) { if (!_types2.default.isNull(this.hiddenCols)) { - console.log(this.hiddenCols); - // Remove previuosly hidden columns + // Clear previuosly hidden columns Object.keys(state).forEach(function (key) { if (key.indexOf(_this3.prfxCol) !== -1 && state[key]) { state[key].hidden = undefined; @@ -7751,7 +7750,6 @@ return /******/ (function(modules) { // webpackBootstrap state[key] = state[key] || {}; state[key].hidden = true; }); - console.log(state); } } @@ -7759,7 +7757,7 @@ return /******/ (function(modules) { // webpackBootstrap }; /** - * Refresh page number field on page number change + * Refresh page number field on page number changes * * @param pageNb Current page number */ @@ -7771,7 +7769,7 @@ return /******/ (function(modules) { // webpackBootstrap }; /** - * Refresh page length field on page length change + * Refresh page length field on page length changes * * @param pageLength Current page length value */ @@ -7783,7 +7781,7 @@ return /******/ (function(modules) { // webpackBootstrap }; /** - * Refresh column sorting information on sort change + * Refresh column sorting information on sort changes * * @param index {Number} Column index * @param descending {Boolean} Descending manner @@ -7798,8 +7796,14 @@ return /******/ (function(modules) { // webpackBootstrap this.update(); }; + /** + * Refresh hidden columns information on columns visibility changes + * + * @param hiddenCols {Array} Columns indexes + */ + + State.prototype.updateColsVisibility = function updateColsVisibility(hiddenCols) { - console.log(hiddenCols); this.hiddenCols = hiddenCols; this.update(); }; @@ -7913,29 +7917,39 @@ return /******/ (function(modules) { // webpackBootstrap }); }; + /** + * Sync hidden columns with stored information + * + * @private + */ + + State.prototype._syncColsVisibility = function _syncColsVisibility() { var _this6 = this; - console.log('init', this.state); if (!this.persistColsVisibility) { return; } var state = this.state; var tf = this.tf; + var hiddenCols = []; Object.keys(state).forEach(function (key) { if (key.indexOf(_this6.prfxCol) !== -1) { var colIdx = parseInt(key.replace(_this6.prfxCol, ''), 10); if (!_types2.default.isUndef(state[key].hidden)) { - var feature = tf.extension('colsVisibility'); - console.log(feature); - // feature.hiddenCols.push(colIdx); - // let hidden = state[key].hidden; - console.log('hide', colIdx); - _this6.emitter.emit('hide-column', tf, colIdx); + hiddenCols.push(colIdx); } } }); + + console.log(hiddenCols); + this.emitter.emit('set-hidden-columns', tf, hiddenCols); + + hiddenCols.forEach(function (colIdx) { + console.log('hide', colIdx); + _this6.emitter.emit('hide-column', tf, colIdx); + }); }; /** @@ -7967,7 +7981,7 @@ return /******/ (function(modules) { // webpackBootstrap this.emitter.off(['sort-initialized'], function () { return _this7._syncSort(); }); - this.emitter.off(['colsVisibility-initialized'], function () { + this.emitter.off(['columns-visibility-initialized'], function () { return _this7._syncColsVisibility(); }); this.emitter.off(['column-shown', 'column-hidden'], function (tf, feature, colIndex, hiddenCols) { diff --git a/dist/tablefilter/tf-1.js b/dist/tablefilter/tf-1.js index 65182fa0..40f1cb73 100644 --- a/dist/tablefilter/tf-1.js +++ b/dist/tablefilter/tf-1.js @@ -1125,10 +1125,14 @@ webpackJsonp([1],{ this.buildManager(); this.initialized = true; + this.emitter.on(['hide-column'], function (tf, colIndex) { return _this.hideCol(colIndex); }); - this.emitter.emit('colsVisibility-initialized', tf, this); + this.emitter.on(['set-hidden-columns'], function (tf, hiddenCols) { + return _this.setHiddenCols(hiddenCols); + }); + this.emitter.emit('columns-visibility-initialized', tf, this); }; /** @@ -1293,10 +1297,11 @@ webpackJsonp([1],{ if (this.atStart) { var a = this.atStart; for (var k = 0; k < a.length; k++) { - var itm = _dom2.default.id('col_' + a[k] + '_' + tf.id); - if (itm) { - itm.click(); - } + // let itm = Dom.id('col_' + a[k] + '_' + tf.id); + // if (itm) { + // itm.click(); + // } + this.hideCol(a[k]); } } }; @@ -1309,7 +1314,6 @@ webpackJsonp([1],{ ColsVisibility.prototype.setHidden = function setHidden(colIndex, hide) { - console.log('extension:', colIndex, hide); var tf = this.tf; var tbl = tf.tbl; @@ -1408,6 +1412,7 @@ webpackJsonp([1],{ ColsVisibility.prototype.hideCol = function hideCol(colIndex) { + console.log(colIndex); if (colIndex === undefined || this.isColHidden(colIndex)) { return; } @@ -1417,6 +1422,7 @@ webpackJsonp([1],{ itm.click(); } } else { + console.log(colIndex, this.isColHidden(colIndex)); this.setHidden(colIndex, true); } }; @@ -1458,6 +1464,12 @@ webpackJsonp([1],{ return this.hiddenCols; }; + ColsVisibility.prototype.setHiddenCols = function setHiddenCols() { + var hiddenCols = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0]; + + this.hiddenCols = hiddenCols; + }; + /** * Remove the columns manager */ @@ -1483,6 +1495,10 @@ webpackJsonp([1],{ this.emitter.off(['hide-column'], function (tf, colIndex) { return _this4.hideCol(colIndex); }); + this.emitter.off(['set-hidden-columns'], function (tf, hiddenCols) { + return _this4.setHiddenCols(hiddenCols); + }); + this.initialized = false; }; diff --git a/src/extensions/colsVisibility/colsVisibility.js b/src/extensions/colsVisibility/colsVisibility.js index 02acd9c3..72973221 100644 --- a/src/extensions/colsVisibility/colsVisibility.js +++ b/src/extensions/colsVisibility/colsVisibility.js @@ -178,9 +178,12 @@ export default class ColsVisibility { this.buildManager(); this.initialized = true; + this.emitter.on(['hide-column'], - (tf, colIndex)=> this.hideCol(colIndex)); - this.emitter.emit('colsVisibility-initialized', tf, this); + (tf, colIndex) => this.hideCol(colIndex)); + this.emitter.on(['set-hidden-columns'], + (tf, hiddenCols) => this.setHiddenCols(hiddenCols)); + this.emitter.emit('columns-visibility-initialized', tf, this); } /** @@ -328,10 +331,11 @@ export default class ColsVisibility { if (this.atStart) { let a = this.atStart; for (let k = 0; k < a.length; k++) { - let itm = Dom.id('col_' + a[k] + '_' + tf.id); - if (itm) { - itm.click(); - } + // let itm = Dom.id('col_' + a[k] + '_' + tf.id); + // if (itm) { + // itm.click(); + // } + this.hideCol(a[k]); } } } @@ -341,7 +345,7 @@ export default class ColsVisibility { * @param {Numner} colIndex Column index * @param {Boolean} hide Hide column if true or show if false */ - setHidden(colIndex, hide) {console.log('extension:', colIndex, hide); + setHidden(colIndex, hide) { let tf = this.tf; let tbl = tf.tbl; @@ -388,7 +392,7 @@ export default class ColsVisibility { headTbl.style.width = headTblW - hiddenWidth + 'px'; tbl.style.width = headTbl.style.width; } - if(this.onAfterColHidden){ + if (this.onAfterColHidden) { this.onAfterColHidden.call(null, this, colIndex); } this.emitter.emit('column-hidden', tf, this, colIndex, @@ -409,7 +413,7 @@ export default class ColsVisibility { (parseInt(headTbl.style.width, 10) + width) + 'px'; tf.tbl.style.width = headTbl.style.width; } - if(this.onAfterColDisplayed){ + if (this.onAfterColDisplayed) { this.onAfterColDisplayed.call(null, this, colIndex); } this.emitter.emit('column-shown', tf, this, colIndex, @@ -439,7 +443,7 @@ export default class ColsVisibility { * Hide specified column * @param {Number} colIndex Column index */ - hideCol(colIndex) { + hideCol(colIndex) {console.log(colIndex); if (colIndex === undefined || this.isColHidden(colIndex)) { return; } @@ -449,6 +453,7 @@ export default class ColsVisibility { itm.click(); } } else { + console.log(colIndex, this.isColHidden(colIndex)); this.setHidden(colIndex, true); } } @@ -484,6 +489,10 @@ export default class ColsVisibility { return this.hiddenCols; } + setHiddenCols(hiddenCols=[]){ + this.hiddenCols = hiddenCols; + } + /** * Remove the columns manager */ @@ -503,7 +512,10 @@ export default class ColsVisibility { this.btnEl = null; this.emitter.off(['hide-column'], - (tf, colIndex)=> this.hideCol(colIndex)); + (tf, colIndex) => this.hideCol(colIndex)); + this.emitter.off(['set-hidden-columns'], + (tf, hiddenCols) => this.setHiddenCols(hiddenCols)); + this.initialized = false; } diff --git a/src/modules/state.js b/src/modules/state.js index 511524c2..ceccf999 100644 --- a/src/modules/state.js +++ b/src/modules/state.js @@ -67,7 +67,7 @@ export class State extends Feature { this.emitter.on(['column-sorted'], (tf, index, descending) => this.updateSort(index, descending)); this.emitter.on(['sort-initialized'], () => this._syncSort()); - this.emitter.on(['colsVisibility-initialized'], + this.emitter.on(['columns-visibility-initialized'], () => this._syncColsVisibility()); this.emitter.on(['column-shown', 'column-hidden'], (tf, feature, colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols)); @@ -142,10 +142,9 @@ export class State extends Feature { } } - if(this.persistColsVisibility){ + if (this.persistColsVisibility) { if (!Types.isNull(this.hiddenCols)) { - console.log(this.hiddenCols); - // Remove previuosly hidden columns + // Clear previuosly hidden columns Object.keys(state).forEach((key) => { if (key.indexOf(this.prfxCol) !== -1 && state[key]) { state[key].hidden = undefined; @@ -157,7 +156,6 @@ export class State extends Feature { state[key] = state[key] || {}; state[key].hidden = true; }); - console.log(state); } } @@ -165,7 +163,7 @@ export class State extends Feature { } /** - * Refresh page number field on page number change + * Refresh page number field on page number changes * * @param pageNb Current page number */ @@ -175,7 +173,7 @@ export class State extends Feature { } /** - * Refresh page length field on page length change + * Refresh page length field on page length changes * * @param pageLength Current page length value */ @@ -185,7 +183,7 @@ export class State extends Feature { } /** - * Refresh column sorting information on sort change + * Refresh column sorting information on sort changes * * @param index {Number} Column index * @param descending {Boolean} Descending manner @@ -198,7 +196,12 @@ export class State extends Feature { this.update(); } - updateColsVisibility(hiddenCols){console.log(hiddenCols); + /** + * Refresh hidden columns information on columns visibility changes + * + * @param hiddenCols {Array} Columns indexes + */ + updateColsVisibility(hiddenCols) { this.hiddenCols = hiddenCols; this.update(); } @@ -298,26 +301,35 @@ export class State extends Feature { }); } - _syncColsVisibility(){console.log('init', this.state); - if(!this.persistColsVisibility){ + /** + * Sync hidden columns with stored information + * + * @private + */ + _syncColsVisibility() { + if (!this.persistColsVisibility) { return; } let state = this.state; let tf = this.tf; + let hiddenCols = []; Object.keys(state).forEach((key) => { if (key.indexOf(this.prfxCol) !== -1) { let colIdx = parseInt(key.replace(this.prfxCol, ''), 10); if (!Types.isUndef(state[key].hidden)) { - let feature = tf.extension('colsVisibility'); - console.log(feature); - // feature.hiddenCols.push(colIdx); - // let hidden = state[key].hidden; - console.log('hide', colIdx); - this.emitter.emit('hide-column', tf, colIdx); + hiddenCols.push(colIdx); } } }); + + console.log(hiddenCols); + this.emitter.emit('set-hidden-columns', tf, hiddenCols); + + hiddenCols.forEach((colIdx) => { + console.log('hide', colIdx); + this.emitter.emit('hide-column', tf, colIdx); + }); } /** @@ -338,7 +350,7 @@ export class State extends Feature { this.emitter.off(['column-sorted'], (tf, index, descending) => this.updateSort(index, descending)); this.emitter.off(['sort-initialized'], () => this._syncSort()); - this.emitter.off(['colsVisibility-initialized'], + this.emitter.off(['columns-visibility-initialized'], () => this._syncColsVisibility()); this.emitter.off(['column-shown', 'column-hidden'], (tf, feature, colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols)); diff --git a/static/templates/columns-visibility.html b/static/templates/columns-visibility.html index f7c5ddec..8e73a7f5 100644 --- a/static/templates/columns-visibility.html +++ b/static/templates/columns-visibility.html @@ -45,7 +45,7 @@ var tfConfig = { extensions:[ { name: 'colsVisibility', - //at_start: [3, 5], + at_start: [3, 5], text: 'Columns: ', enable_tick_all: true }, {