deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-17 13:56:38 +02:00
Code Issues Releases Wiki Activity

Continued columns visibility persistence

Browse source
This commit is contained in:
Max Guglielmi 2016-04-18 11:04:50 +02:00
parent 0900d81dfd
commit 29d58d3a45
12 changed files with 10667 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.2.11 - Starter</title>
<title>tablefilter v0.2.12 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.11</h1>
<h1>tablefilter v0.2.12</h1>

4
dist/tablefilter/style/colsVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* 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}

4
dist/tablefilter/style/filtersVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* 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}

4
dist/tablefilter/style/tablefilter.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

4
dist/tablefilter/style/themes/default/default.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* 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}

4
dist/tablefilter/style/themes/mytheme/mytheme.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* 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}

4
dist/tablefilter/style/themes/skyblue/skyblue.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-14T08:05:52.776Z
* tablefilter v0.2.12 by Max Guglielmi
* build date: 2016-04-18T07:24:04.224Z
* 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}

8326
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2263
dist/tablefilter/tf-1.js vendored
View file

File diff suppressed because one or more lines are too long

25
src/extensions/colsVisibility/colsVisibility.js
View file

@ -178,6 +178,8 @@ 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);
}
@ -339,7 +341,7 @@ export default class ColsVisibility {
* @param {Numner} colIndex Column index
* @param {Boolean} hide Hide column if true or show if false
*/
setHidden(colIndex, hide) {
setHidden(colIndex, hide) {console.log('extension:', colIndex, hide);
let tf = this.tf;
let tbl = tf.tbl;
@ -370,7 +372,7 @@ export default class ColsVisibility {
let gridLayout;
let headTbl;
let gridColElms;
if (this.onAfterColHidden && hide) {
if (hide) {
//This event is fired just after a column is displayed for
//grid_layout support
//TODO: grid layout module should be responsible for those
@ -386,11 +388,14 @@ export default class ColsVisibility {
headTbl.style.width = headTblW - hiddenWidth + 'px';
tbl.style.width = headTbl.style.width;
}
this.onAfterColHidden.call(null, this, colIndex);
this.emitter.emit('hide-column', tf, this, colIndex);
if(this.onAfterColHidden){
this.onAfterColHidden.call(null, this, colIndex);
}
this.emitter.emit('column-hidden', tf, this, colIndex,
this.hiddenCols);
}
if (this.onAfterColDisplayed && !hide) {
if (!hide) {
//This event is fired just after a column is displayed for
//grid_layout support
//TODO: grid layout module should be responsible for those
@ -404,8 +409,11 @@ export default class ColsVisibility {
(parseInt(headTbl.style.width, 10) + width) + 'px';
tf.tbl.style.width = headTbl.style.width;
}
this.onAfterColDisplayed.call(null, this, colIndex);
this.emitter.emit('show-column', tf, this, colIndex);
if(this.onAfterColDisplayed){
this.onAfterColDisplayed.call(null, this, colIndex);
}
this.emitter.emit('column-shown', tf, this, colIndex,
this.hiddenCols);
}
}
@ -493,6 +501,9 @@ export default class ColsVisibility {
this.btnEl.innerHTML = '';
Dom.remove(this.btnEl);
this.btnEl = null;
this.emitter.off(['hide-column'],
(tf, colIndex)=> this.hideCol(colIndex));
this.initialized = false;
}

61
src/modules/state.js
View file

@ -34,6 +34,7 @@ export class State extends Feature {
this.persistPageNumber = Boolean(cfg.page_number);
this.persistPageLength = Boolean(cfg.page_length);
this.persistSort = Boolean(cfg.sort);
this.persistColsVisibility = Boolean(cfg.columns_visibility);
this.cookieDuration = !isNaN(cfg.cookie_duration) ?
parseInt(cfg.cookie_duration, 10) : 87600;
@ -42,6 +43,7 @@ export class State extends Feature {
this.pageNb = null;
this.pageLength = null;
this.sort = null;
this.hiddenCols = null;
this.state = {};
this.prfxCol = 'col_';
@ -65,6 +67,10 @@ 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._syncColsVisibility());
this.emitter.on(['column-shown', 'column-hidden'], (tf, feature,
colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols));
if (this.enableHash) {
this.hash = new Hash(this);
@ -79,7 +85,7 @@ export class State extends Feature {
/**
* Update state field based on current features state
* Update state object based on current features state
*/
update() {
if (!this.isEnabled()) {
@ -96,7 +102,7 @@ export class State extends Feature {
if (Types.isString(val) && Str.isEmpty(val)) {
if (state.hasOwnProperty(key)) {
state[key] = undefined;
state[key].flt = undefined;
}
} else {
state[key] = state[key] || {};
@ -136,6 +142,25 @@ export class State extends Feature {
}
}
if(this.persistColsVisibility){
if (!Types.isNull(this.hiddenCols)) {
console.log(this.hiddenCols);
// Remove previuosly hidden columns
Object.keys(state).forEach((key) => {
if (key.indexOf(this.prfxCol) !== -1 && state[key]) {
state[key].hidden = undefined;
}
});
this.hiddenCols.forEach((colIdx) => {
let key = `${this.prfxCol}${colIdx}`;
state[key] = state[key] || {};
state[key].hidden = true;
});
console.log(state);
}
}
this.emitter.emit('state-changed', tf, state);
}
@ -173,6 +198,11 @@ export class State extends Feature {
this.update();
}
updateColsVisibility(hiddenCols){console.log(hiddenCols);
this.hiddenCols = hiddenCols;
this.update();
}
/**
* Override state field
*
@ -202,6 +232,7 @@ export class State extends Feature {
}
this._syncSort();
this._syncColsVisibility();
}
/**
@ -267,6 +298,28 @@ export class State extends Feature {
});
}
_syncColsVisibility(){console.log('init', this.state);
if(!this.persistColsVisibility){
return;
}
let state = this.state;
let tf = this.tf;
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);
}
}
});
}
/**
* Destroy State instance
*/
@ -285,6 +338,10 @@ 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._syncColsVisibility());
this.emitter.off(['column-shown', 'column-hidden'], (tf, feature,
colIndex, hiddenCols) => this.updateColsVisibility(hiddenCols));
if (this.enableHash) {
this.hash.destroy();

5
static/templates/columns-visibility.html
View file

@ -30,7 +30,8 @@ var tfConfig = {
paging: true,
state: {
types: ['cookie'],
filters: true
filters: true,
columns_visibility: true
},
alternate_rows: true,
rows_counter: true,
@ -44,7 +45,7 @@ var tfConfig = {
extensions:[
{
name: 'colsVisibility',
at_start: [3, 5],
//at_start: [3, 5],
text: 'Columns: ',
enable_tick_all: true
}, {