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

Simplified WTFs in dropdown and checklist

Browse source
This commit is contained in:
Max Guglielmi 2016-11-15 16:49:19 +11:00
parent 782073fa14
commit fd9c257e52
12 changed files with 168 additions and 100 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.4.9 - Starter</title>
<title>tablefilter v0.4.10 - Starter</title>
</head>
<body>
<h1>tablefilter v0.4.9</h1>
<h1>tablefilter v0.4.10</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.10 by Max Guglielmi
* build date: 2016-11-14T02:09:00.495Z
* build date: 2016-11-15T02:32:16.602Z
* 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}

116
dist/tablefilter/tablefilter.js vendored
View file

@ -2706,7 +2706,7 @@ return /******/ (function(modules) { // webpackBootstrap
else if (fltColType === _const.CHECKLIST) {
var _values = [];
if (this.loadFltOnDemand && !this.initialized) {
this.emitter.emit('build-checklist-filter', this, index, this.isExternalFlt);
this.emitter.emit('build-checklist-filter', this, index, this.linkedFilters);
}
if ((0, _types.isArray)(query)) {
_values = query;
@ -2922,7 +2922,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
if (slcA3.indexOf(slcIndex[i]) !== -1) {
this.emitter.emit('build-checklist-filter', this, slcIndex[i]);
this.emitter.emit('build-checklist-filter', this, slcIndex[i], true);
} else {
this.emitter.emit('build-select-filter', this, slcIndex[i], true);
}
@ -5991,7 +5991,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* Build drop-down filter UI
* @param {Number} colIndex Column index
* @param {Boolean} isLinked Enable linked refresh behaviour
* @param {Boolean} isLinked Enable linked filters behaviour
*/
@ -6047,27 +6047,51 @@ return /******/ (function(modules) { // webpackBootstrap
for (var j = 0; j < nchilds; j++) {
// WTF: cyclomatic complexity hell
// TODO: simplify hell below
if (colIndex === j && (!isLinked || isLinked && tf.disableExcludedOptions) || colIndex === j && isLinked && (rows[k].style.display === '' && !tf.paging || tf.paging && (!tf.validRowsIndex || tf.validRowsIndex && tf.validRowsIndex.indexOf(k) !== -1) && (activeIdx === undefined || activeIdx === colIndex || activeIdx !== colIndex && tf.validRowsIndex.indexOf(k) !== -1))) {
var cellData = tf.getCellData(cell[j]),
// if ((colIndex === j &&
// (!isLinked ||
// (isLinked && tf.disableExcludedOptions))) ||
// (colIndex === j && isLinked &&
// ((rows[k].style.display === '' && !tf.paging) ||
// (tf.paging && (!tf.validRowsIndex ||
// (tf.validRowsIndex &&
// tf.validRowsIndex.indexOf(k) !== -1)) &&
// ((activeIdx === undefined ||
// activeIdx === colIndex) ||
// (activeIdx !== colIndex &&
// tf.validRowsIndex.indexOf(k) !== -1)))))
// ) {
if (colIndex !== j) {
continue;
}
// if (isLinked && tf.getRowDisplay(rows[k]) !== '' &&
// !tf.disableExcludedOptions) {
// continue;
// }
//Vary Peter's patch
cellString = (0, _string.matchCase)(cellData, tf.caseSensitive);
if (isLinked && !tf.disableExcludedOptions && !tf.paging && tf.getRowDisplay(rows[k]) !== '' || tf.paging && activeIdx && tf.getValidRows().indexOf(k) === -1) {
continue;
}
// checks if celldata is already in array
if (!(0, _array.has)(this.opts, cellString, tf.caseSensitive)) {
this.opts.push(cellData);
var cellData = tf.getCellData(cell[j]),
//Vary Peter's patch
cellString = (0, _string.matchCase)(cellData, tf.caseSensitive);
// checks if celldata is already in array
if (!(0, _array.has)(this.opts, cellString, tf.caseSensitive)) {
this.opts.push(cellData);
}
if (isLinked && tf.disableExcludedOptions) {
var filteredCol = filteredDataCol[j];
if (!filteredCol) {
filteredCol = tf.getFilteredDataCol(j);
}
if (isLinked && tf.disableExcludedOptions) {
var filteredCol = filteredDataCol[j];
if (!filteredCol) {
filteredCol = tf.getFilteredDataCol(j);
}
if (!(0, _array.has)(filteredCol, cellString, tf.caseSensitive) && !(0, _array.has)(excludedOpts, cellString, tf.caseSensitive)) {
excludedOpts.push(cellData);
}
if (!(0, _array.has)(filteredCol, cellString, tf.caseSensitive) && !(0, _array.has)(excludedOpts, cellString, tf.caseSensitive)) {
excludedOpts.push(cellData);
}
} //if colIndex==j
}
// }//if colIndex==j
} //for j
} //for k
@ -6559,8 +6583,8 @@ return /******/ (function(modules) { // webpackBootstrap
divCont.appendChild((0, _dom.createText)(this.activateText));
}
this.emitter.on(['build-checklist-filter'], function (tf, colIndex) {
return _this3.build(colIndex);
this.emitter.on(['build-checklist-filter'], function (tf, colIndex, isLinked) {
return _this3.build(colIndex, isLinked);
});
this.emitter.on(['select-checklist-options'], function (tf, colIndex, values) {
@ -6576,10 +6600,13 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* Build checklist UI
* @param {Number} colIndex Column index
* @param {Boolean} isLinked Enable linked filters behaviour
*/
CheckList.prototype.build = function build(colIndex) {
var isLinked = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
var tf = this.tf;
colIndex = parseInt(colIndex, 10);
@ -6597,14 +6624,14 @@ return /******/ (function(modules) { // webpackBootstrap
var caseSensitive = tf.caseSensitive;
this.isCustom = tf.isCustomOptions(colIndex);
// let activeIdx;
// let activeFilterId = tf.getActiveFilterId();
// if (tf.linkedFilters && activeFilterId) {
// activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
// }
var activeIdx = void 0;
var activeFilterId = tf.getActiveFilterId();
if (isLinked && activeFilterId) {
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
}
var filteredDataCol = [];
if (tf.linkedFilters && tf.disableExcludedOptions) {
if (isLinked && tf.disableExcludedOptions) {
this.excludedOpts = [];
}
@ -6628,24 +6655,35 @@ return /******/ (function(modules) { // webpackBootstrap
// this loop retrieves cell data
for (var j = 0; j < ncells; j++) {
// WTF: cyclomatic complexity hell :)
// if ((colIndex === j && (!tf.linkedFilters ||
// (tf.linkedFilters && tf.disableExcludedOptions))) ||
// (colIndex === j && tf.linkedFilters &&
// if ((colIndex === j && (!isLinked ||
// (isLinked && tf.disableExcludedOptions))) ||
// (colIndex === j && isLinked &&
// ((rows[k].style.display === '' && !tf.paging) ||
// (tf.paging && ((!activeIdx ||
// activeIdx === colIndex) ||
// (activeIdx !== colIndex &&
// tf.validRowsIndex.indexOf(k) !== -1))))))
// {
// console.log(k, colIndex === j, tf.getValidRows());
// if (colIndex === j /*&& tf.getValidRows().indexOf(k) !== -1*/
// ||
// (colIndex === j && tf.linkedFilters &&
// tf.getRowDisplay(rows[k]) === '')) {
if (colIndex !== j) {
continue;
}
if (tf.linkedFilters && tf.getRowDisplay(rows[k]) !== '' && !tf.disableExcludedOptions) {
// if (isLinked && tf.getRowDisplay(rows[k]) !== '' &&
// !tf.disableExcludedOptions) {
// continue;
// }
// if (isLinked && tf.paging && /*activeIdx === colIndex &&*/
// tf.getValidRows().indexOf(k) === -1) {
// continue;
// }
// if (tf.getRowDisplay(rows[k]) !== '' &&
// tf.getValidRows().indexOf(k) === -1) {
// continue;
// }
if (isLinked && !tf.disableExcludedOptions && !tf.paging && tf.getRowDisplay(rows[k]) !== '' || tf.paging && activeIdx && tf.getValidRows().indexOf(k) === -1) {
continue;
}
@ -6964,8 +7002,8 @@ return /******/ (function(modules) { // webpackBootstrap
CheckList.prototype.destroy = function destroy() {
var _this6 = this;
this.emitter.off(['build-checklist-filter'], function (tf, colIndex, isExternal) {
return _this6.build(colIndex, isExternal);
this.emitter.off(['build-checklist-filter'], function (tf, colIndex, isLinked) {
return _this6.build(colIndex, isLinked);
});
this.emitter.off(['select-checklist-options'], function (tf, colIndex, values) {
return _this6.selectOptions(colIndex, values);

53
src/modules/checkList.js
View file

@ -178,7 +178,7 @@ export class CheckList extends Feature {
this.emitter.on(
['build-checklist-filter'],
(tf, colIndex) => this.build(colIndex)
(tf, colIndex, isLinked) => this.build(colIndex, isLinked)
);
this.emitter.on(
@ -195,8 +195,9 @@ export class CheckList extends Feature {
/**
* Build checklist UI
* @param {Number} colIndex Column index
* @param {Boolean} isLinked Enable linked filters behaviour
*/
build(colIndex) {
build(colIndex, isLinked = false) {
let tf = this.tf;
colIndex = parseInt(colIndex, 10);
@ -216,14 +217,14 @@ export class CheckList extends Feature {
let caseSensitive = tf.caseSensitive;
this.isCustom = tf.isCustomOptions(colIndex);
// let activeIdx;
// let activeFilterId = tf.getActiveFilterId();
// if (tf.linkedFilters && activeFilterId) {
// activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
// }
let activeIdx;
let activeFilterId = tf.getActiveFilterId();
if (isLinked && activeFilterId) {
activeIdx = tf.getColumnIndexFromFilterId(activeFilterId);
}
let filteredDataCol = [];
if (tf.linkedFilters && tf.disableExcludedOptions) {
if (isLinked && tf.disableExcludedOptions) {
this.excludedOpts = [];
}
@ -247,29 +248,41 @@ export class CheckList extends Feature {
// this loop retrieves cell data
for (let j = 0; j < ncells; j++) {
// WTF: cyclomatic complexity hell :)
// if ((colIndex === j && (!tf.linkedFilters ||
// (tf.linkedFilters && tf.disableExcludedOptions))) ||
// (colIndex === j && tf.linkedFilters &&
// if ((colIndex === j && (!isLinked ||
// (isLinked && tf.disableExcludedOptions))) ||
// (colIndex === j && isLinked &&
// ((rows[k].style.display === '' && !tf.paging) ||
// (tf.paging && ((!activeIdx ||
// activeIdx === colIndex) ||
// (activeIdx !== colIndex &&
// tf.validRowsIndex.indexOf(k) !== -1))))))
// {
// console.log(k, colIndex === j, tf.getValidRows());
// if (colIndex === j /*&& tf.getValidRows().indexOf(k) !== -1*/
// ||
// (colIndex === j && tf.linkedFilters &&
// tf.getRowDisplay(rows[k]) === '')) {
if (colIndex !== j) {
continue;
}
if (tf.linkedFilters && tf.getRowDisplay(rows[k]) !== '' &&
!tf.disableExcludedOptions) {
// if (isLinked && tf.getRowDisplay(rows[k]) !== '' &&
// !tf.disableExcludedOptions) {
// continue;
// }
// if (isLinked && tf.paging && /*activeIdx === colIndex &&*/
// tf.getValidRows().indexOf(k) === -1) {
// continue;
// }
// if (tf.getRowDisplay(rows[k]) !== '' &&
// tf.getValidRows().indexOf(k) === -1) {
// continue;
// }
if (isLinked && !tf.disableExcludedOptions &&
(!tf.paging && tf.getRowDisplay(rows[k]) !== '') ||
(tf.paging && activeIdx &&
tf.getValidRows().indexOf(k) === -1)) {
continue;
}
let cellData = tf.getCellData(cells[j]);
//Vary Peter's patch
let cellString = matchCase(cellData, caseSensitive);
@ -575,7 +588,7 @@ export class CheckList extends Feature {
destroy() {
this.emitter.off(
['build-checklist-filter'],
(tf, colIndex, isExternal) => this.build(colIndex, isExternal)
(tf, colIndex, isLinked) => this.build(colIndex, isLinked)
);
this.emitter.off(
['select-checklist-options'],

76
src/modules/dropdown.js
View file

@ -155,7 +155,7 @@ export class Dropdown extends Feature {
/**
* Build drop-down filter UI
* @param {Number} colIndex Column index
* @param {Boolean} isLinked Enable linked refresh behaviour
* @param {Boolean} isLinked Enable linked filters behaviour
*/
build(colIndex, isLinked = false) {
let tf = this.tf;
@ -207,38 +207,54 @@ export class Dropdown extends Feature {
for (let j = 0; j < nchilds; j++) {
// WTF: cyclomatic complexity hell
// TODO: simplify hell below
if ((colIndex === j &&
(!isLinked ||
(isLinked && tf.disableExcludedOptions))) ||
(colIndex === j && isLinked &&
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && (!tf.validRowsIndex ||
(tf.validRowsIndex &&
tf.validRowsIndex.indexOf(k) !== -1)) &&
((activeIdx === undefined ||
activeIdx === colIndex) ||
(activeIdx !== colIndex &&
tf.validRowsIndex.indexOf(k) !== -1)))))) {
let cellData = tf.getCellData(cell[j]),
//Vary Peter's patch
cellString = matchCase(cellData, tf.caseSensitive);
// if ((colIndex === j &&
// (!isLinked ||
// (isLinked && tf.disableExcludedOptions))) ||
// (colIndex === j && isLinked &&
// ((rows[k].style.display === '' && !tf.paging) ||
// (tf.paging && (!tf.validRowsIndex ||
// (tf.validRowsIndex &&
// tf.validRowsIndex.indexOf(k) !== -1)) &&
// ((activeIdx === undefined ||
// activeIdx === colIndex) ||
// (activeIdx !== colIndex &&
// tf.validRowsIndex.indexOf(k) !== -1)))))
// ) {
if (colIndex !== j) {
continue;
}
// if (isLinked && tf.getRowDisplay(rows[k]) !== '' &&
// !tf.disableExcludedOptions) {
// continue;
// }
// checks if celldata is already in array
if (!has(this.opts, cellString, tf.caseSensitive)) {
this.opts.push(cellData);
}
if (isLinked && !tf.disableExcludedOptions &&
(!tf.paging && tf.getRowDisplay(rows[k]) !== '') ||
(tf.paging && activeIdx &&
tf.getValidRows().indexOf(k) === -1)) {
continue;
}
if (isLinked && tf.disableExcludedOptions) {
let filteredCol = filteredDataCol[j];
if (!filteredCol) {
filteredCol = tf.getFilteredDataCol(j);
}
if (!has(filteredCol, cellString, tf.caseSensitive) &&
!has(excludedOpts, cellString, tf.caseSensitive)) {
excludedOpts.push(cellData);
}
let cellData = tf.getCellData(cell[j]),
//Vary Peter's patch
cellString = matchCase(cellData, tf.caseSensitive);
// checks if celldata is already in array
if (!has(this.opts, cellString, tf.caseSensitive)) {
this.opts.push(cellData);
}
if (isLinked && tf.disableExcludedOptions) {
let filteredCol = filteredDataCol[j];
if (!filteredCol) {
filteredCol = tf.getFilteredDataCol(j);
}
}//if colIndex==j
if (!has(filteredCol, cellString, tf.caseSensitive) &&
!has(excludedOpts, cellString, tf.caseSensitive)) {
excludedOpts.push(cellData);
}
}
// }//if colIndex==j
}//for j
}//for k

4
src/tablefilter.js
View file

@ -2506,7 +2506,7 @@ export class TableFilter {
let values = [];
if (this.loadFltOnDemand && !this.initialized) {
this.emitter.emit('build-checklist-filter', this, index,
this.isExternalFlt);
this.linkedFilters);
}
if (isArray(query)) {
values = query;
@ -2704,7 +2704,7 @@ export class TableFilter {
if (slcA3.indexOf(slcIndex[i]) !== -1) {
this.emitter.emit('build-checklist-filter', this,
slcIndex[i]);
slcIndex[i], true);
} else {
this.emitter.emit('build-select-filter', this, slcIndex[i],
true);

3
static/templates/linked-filters.html
View file

@ -21,6 +21,7 @@
var filtersConfig = {
base_path: '../dist/tablefilter/',
linked_filters: true,
paging: true,
col_1: 'multiple',
col_2: 'checklist',
btn_reset: true,
@ -32,7 +33,7 @@ var filtersConfig = {
name: 'sort',
types: [
'number', 'string', 'string',
'US', 'none', 'string'
'formatted-number', 'none', 'string'
]
}]
};