deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-20 23:36:39 +02:00
Code Issues Releases Wiki Activity

continued sort persistence

Browse source
This commit is contained in:
Max Guglielmi 2016-04-12 18:39:20 +02:00
parent 974c9c95e9
commit 139eaf998e
13 changed files with 10497 additions and 52 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.10 - Starter</title>
<title>tablefilter v0.2.11 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.10</h1>
<h1>tablefilter v0.2.11</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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.10 by Max Guglielmi
* build date: 2016-04-10T08:39:32.757Z
* tablefilter v0.2.11 by Max Guglielmi
* build date: 2016-04-12T13:40:06.860Z
* 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}

8211
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

6
src/extensions/sort/adapterSortabletable.js
View file

@ -96,10 +96,12 @@ export default class AdapterSortableTable{
}
if(adpt.onAfterSort){
adpt.onAfterSort.call(null, tf, adpt.stt.sortColumn);
adpt.onAfterSort.call(null, tf, adpt.stt.sortColumn,
adpt.stt.descending);
}
adpt.emitter.emit('column-sorted', tf, adpt.stt.sortColumn);
adpt.emitter.emit('column-sorted', tf, adpt.stt.sortColumn,
adpt.stt.descending);
};
this.initialized = true;

53
src/modules/state.js
View file

@ -40,7 +40,7 @@ export class State extends Feature {
this.hash = null;
this.pageNb = null;
this.pageLength = null;
this.sortIndex = null;
this.sort = null;
this.state = {};
this.prfxCol = 'col_';
@ -60,9 +60,9 @@ export class State extends Feature {
this.emitter.on(['after-page-change', 'after-clearing-filters'],
(tf, pageNb) => this.updatePage(pageNb));
this.emitter.on(['after-page-length-change'],
(tf, index) => this.updatePageLength(index));
(tf, pageLength) => this.updatePageLength(pageLength));
this.emitter.on(['column-sorted'],
(tf, index) => this.updateSort(index));
(tf, index, descending) => this.updateSort(index, descending));
if (this.enableHash) {
this.hash = new Hash(this);
@ -120,7 +120,18 @@ export class State extends Feature {
}
if(this.persistSort){
let key = `${this.prfxCol}${this.sortIndex}`;
if(!Types.isNull(this.sort)) {
// Remove any sorted column
Object.keys(this.state).forEach((key) => {
if (key.indexOf(this.prfxCol) !== -1 &&
this.state[key]) {
this.state[key].sort = undefined;
}
});
let key = `${this.prfxCol}${this.sort.column}`;
this.state[key] = this.state[key] || {};
this.state[key].sort = { descending: this.sort.descending };
}
}
this.emitter.emit('state-changed', tf, this.state);
@ -146,8 +157,11 @@ export class State extends Feature {
this.update();
}
updateSort(index){
this.sortIndex = index;
updateSort(index, descending){
this.sort = {
column: index,
descending: descending
};
this.update();
}
@ -167,15 +181,26 @@ export class State extends Feature {
let state = this.state;
let tf = this.tf;
if (this.persistFilters) {
Object.keys(state).forEach((key) => {
if (key.indexOf(this.prfxCol) !== -1) {
let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
// if (this.persistFilters) {
Object.keys(state).forEach((key) => {
if (key.indexOf(this.prfxCol) !== -1) {
let colIdx = parseInt(key.replace(this.prfxCol, ''), 10);
if (this.persistFilters) {
let val = state[key].flt;
tf.setFilterValue(colIdx, val);
}
});
if(this.persistSort){
if(state[key].hasOwnProperty('sort')){
}
let val = state[key].sort;
let sort = tf.extension('sort');
sort.sortByColumnIndex(colIdx, val.descending);
}
}
});
if (this.persistFilters) {
tf.filter();
}
@ -188,6 +213,10 @@ export class State extends Feature {
let pageLength = state[this.pageLengthKey];
this.emitter.emit('change-page-results', this.tf, pageLength);
}
if(this.persistSort){
}
}
/**
@ -223,7 +252,7 @@ export class State extends Feature {
this.emitter.off(['after-page-length-change'],
(tf, index) => this.updatePageLength(index));
this.emitter.off(['column-sorted'],
(tf, index) => this.updateSort(index));
(tf, index, descending) => this.updateSort(index, descending));
if (this.enableHash) {
this.hash.destroy();

14
src/tablefilter.js
View file

@ -779,7 +779,7 @@ export class TableFilter {
//filter is appended in custom element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(btn);
} else{
} else {
container.appendChild(btn);
}
@ -1408,8 +1408,8 @@ export class TableFilter {
// already filtered rows display re-init
row[k].style.display = '';
let cell = row[k].cells,
nchilds = cell.length;
let cells = row[k].cells,
nchilds = cells.length;
// checks if row has exact cell #
if(nchilds !== this.nbCells){
@ -1432,7 +1432,7 @@ export class TableFilter {
continue;
}
let cellData = Str.matchCase(this.getCellData(cell[j]),
let cellData = Str.matchCase(this.getCellData(cells[j]),
this.caseSensitive);
//multiple search parameter operator ||
@ -1458,7 +1458,7 @@ export class TableFilter {
for(let w=0, len=s.length; w<len; w++){
cS = Str.trim(s[w]);
occur = hasArg.call(this, cS, cellData, j);
highlight.call(this, cS, occur, cell[j]);
highlight.call(this, cS, occur, cells[j]);
if((hasMultiOrSA && occur) ||
(hasMultiAndSA && !occur)){
break;
@ -1473,7 +1473,7 @@ export class TableFilter {
//single search parameter
else {
occurence[j] = hasArg.call(this, Str.trim(sA), cellData, j);
highlight.call(this, sA, occurence[j], cell[j]);
highlight.call(this, sA, occurence[j], cells[j]);
}//else single param
if(!occurence[j]){
@ -1483,7 +1483,7 @@ export class TableFilter {
singleFltRowValid = true;
}
this.emitter.emit('cell-processed', this, j, cell[j]);
this.emitter.emit('cell-processed', this, j, cells[j]);
}//for j
if(this.singleSearchFlt && singleFltRowValid){

8
static/templates/grouped-headers.html
View file

@ -47,7 +47,13 @@ var tfConfig = {
],
filters_row_index: 3,
headers_row_index: 2,
remember_grid_values: true,
state: {
types: ['local_storage'],
filters: true,
page_number: true,
page_length: true,
sort: true
},
highlight_keywords: true,
alternate_rows: true,
rows_counter: true,