deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-04-25 11:40:47 +02:00
Code Issues Releases Wiki Activity

exclude columns from Single filter filtering

Browse source
This commit is contained in:
koalyptus 2017-12-17 22:02:56 +11:00
parent 95c8206eb7
commit 42fb561866
22 changed files with 149 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.eslintrc
View file

@ -13,8 +13,8 @@
"array-bracket-spacing": 2,
"keyword-spacing": ["error", { "after": true, "before": true }],
"max-depth": [2, 7],
"max-statements": [2, 143],
"complexity": [2, 32],
"max-statements": [2, 130],
"complexity": [2, 33],
"no-unused-vars": 2,
"no-eval": 2,
"no-underscore-dangle": 0,

4
dist/starter.html vendored
View file

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

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* 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:inherit;}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-type: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.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* 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.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}.activeCell{background-color:rgba(0,0,0,0.075)}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* 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.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* 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.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.857Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.440Z
* MIT License
*/
table.TF{padding:0;color:inherit;border-right:1px solid transparent;border-top:1px solid transparent;border-left:1px solid transparent;border-bottom:0;}table.TF th{margin:0;color:inherit;background-color:transparent;border-color:transparent;border-width:1px;border-style:solid;}table.TF th:last-child{border-right:1px solid transparent}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid transparent;border-left:0;border-top:0;border-right:0}.fltrow{background-color:transparent;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px;border-bottom:1px solid transparent !important;}.fltrow th:last-child,.fltrow td:last-child{border-right:1px solid transparent}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4}input.flt{width:99% !important}.inf{background-color:transparent;border:1px solid transparent;height:$min-height;color:inherit}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:#f7f7f7 url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#f7f7f7 url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#f7f7f7 url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#f7f7f7 url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.activeHeader{background:#f7f7f7 !important;border:1px solid transparent;color:inherit !important}div.grd_Cont{-webkit-box-shadow:0 0 0 0 rgba(50,50,50,0.75);-moz-box-shadow:0 0 0 0 rgba(50,50,50,0.75);box-shadow:0 0 0 0 rgba(50,50,50,0.75);background-color:transparent;border:1px solid transparent;padding:0 !important;}div.grd_Cont .even{background-color:transparent}div.grd_Cont .odd{background-color:#f7f7f7}div.grd_headTblCont{background-color:transparent;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:transparent;border-bottom:1px solid transparent;border-right:1px solid transparent !important;border-left:1px solid transparent;border-top:1px solid transparent}div.grd_tblCont table td{border-bottom:1px solid transparent;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:transparent;color:inherit;border-top:1px solid transparent;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#f7f7f7;border:1px solid #f7f7f7;border-radius:5px;color:#000;text-shadow:none}.even{background-color:transparent}.odd{background-color:#f7f7f7}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ccc !important;color:inherit}.ezSelectedRow{background-color:#ccc !important;color:inherit}.ezActiveCell{background-color:transparent;color:inherit;font-weight:bold}.ezETSelectedCell{background-color:transparent;font-weight:bold;color:inherit}

6
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/tablefilter/tablefilter.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/tablefilter/tf-0-789aa3c9851693c1f448.js vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.6.9 by Max Guglielmi
* build date: 2017-12-10T10:17:24.825Z
* tablefilter v0.6.10 by Max Guglielmi
* build date: 2017-12-17T10:52:45.424Z
* MIT License
*/

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.6.9",
"version": "0.6.10",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {

2
src/modules/checkList.js
View file

@ -142,7 +142,7 @@ export class CheckList extends BaseDropdown {
init(colIndex, isExternal, container) {
let tf = this.tf;
let externalFltTgtId = isExternal ?
tf.externalFltTgtIds[colIndex] : null;
tf.externalFltIds[colIndex] : null;
let divCont = createElm('div',
['id', `${this.prfx}${colIndex}_${tf.id}`],

2
src/modules/dropdown.js
View file

@ -92,7 +92,7 @@ export class Dropdown extends BaseDropdown {
let tf = this.tf;
let col = tf.getFilterType(colIndex);
let externalFltTgtId = isExternal ?
tf.externalFltTgtIds[colIndex] : null;
tf.externalFltIds[colIndex] : null;
let slc = createElm(SELECT,
['id', tf.buildFilterId(colIndex)],

4
src/modules/gridLayout.js
View file

@ -364,12 +364,12 @@ export class GridLayout extends Feature {
let tf = this.tf;
let filtersRow = createElm('tr');
if (this.filters && tf.fltGrid) {
tf.externalFltTgtIds = [];
tf.externalFltIds = [];
tf.eachCol((j) => {
let fltTdId = `${tf.prfxFlt + j + this.prfxGridFltTd + tf.id}`;
let cl = createElm(tf.fltCellTag, ['id', fltTdId]);
filtersRow.appendChild(cl);
tf.externalFltTgtIds[j] = fltTdId;
tf.externalFltIds[j] = fltTdId;
});
}
return filtersRow;

6
src/modules/popupFilter.js
View file

@ -197,7 +197,7 @@ export class PopupFilter extends Feature {
let tf = this.tf;
// Enable external filters
tf.externalFltTgtIds = [''];
tf.externalFltIds = [''];
// Override filters row index supplied by configuration
tf.filtersRowIndex = 0;
@ -285,7 +285,7 @@ export class PopupFilter extends Feature {
let placeholder = createElm('div', ['class', this.placeholderCssClass]);
let cont = div ||
createElm('div', ['id', contId], ['class', this.containerCssClass]);
tf.externalFltTgtIds[colIndex] = cont.id;
tf.externalFltIds[colIndex] = cont.id;
placeholder.appendChild(cont);
let header = tf.getHeaderElement(colIndex);
@ -441,7 +441,7 @@ export class PopupFilter extends Feature {
this.fltIcons = [];
// TODO: expose an API to handle external filter IDs
this.tf.externalFltTgtIds = [];
this.tf.externalFltIds = [];
// unsubscribe to events
this.emitter.off(['before-filtering'], () => this.setIconsState());

102
src/tablefilter.js
View file

@ -383,7 +383,7 @@ export class TableFilter {
* List of containers IDs where external filters will be generated
* @type {Array}
*/
this.externalFltTgtIds = defaultsArr(f.external_flt_grid_ids, []);
this.externalFltIds = defaultsArr(f.external_flt_ids, []);
/**
* Callback fired after filters are generated
@ -392,10 +392,22 @@ export class TableFilter {
this.onFiltersLoaded = defaultsFn(f.on_filters_loaded, EMPTY_FN);
/**
* Enable/disable single filter filtering all columns
* @type {Boolean}
* Enable/disable single filter mode
* @type {Boolean|Object}
*/
this.singleSearchFlt = Boolean(f.single_filter);
this.singleFlt = isObj(f.single_filter) ||
Boolean(f.single_filter);
/**
* Specify columns to be excluded from single filter search, by default
* searching in all columns:
* single_filter: {
* exclude_cols: [2, 7]
* }
*/
this.singleFltExcludeCols = isObj(f.single_filter) &&
isArray(f.single_filter.exclude_cols) ?
f.single_filter.exclude_cols : [];
/**
* Callback fired after a row is validated during filtering
@ -442,7 +454,7 @@ export class TableFilter {
/**
* Indicate whether pop-up filters UI is enabled
* @type {Boolean}
* @type {Boolean|Object}
*/
this.popupFilters = isObj(f.popup_filters) || Boolean(f.popup_filters);
@ -948,16 +960,16 @@ export class TableFilter {
this.nbCells = this.getCellsNb(this.refRow);
this.nbFilterableRows = this.getRowsNb();
let n = this.singleSearchFlt ? 1 : this.nbCells;
let n = this.singleFlt ? 1 : this.nbCells;
// Generate filters
//build filters
for (let i = 0; i < n; i++) {
this.emitter.emit('before-filter-init', this, i);
let fltCell = createElm(this.fltCellTag),
col = this.getFilterType(i);
if (this.singleSearchFlt) {
if (this.singleFlt) {
fltCell.colSpan = this.nbCells;
}
if (!this.gridLayout) {
@ -967,7 +979,7 @@ export class TableFilter {
this.fltSmallCssClass : this.fltCssClass;
//only 1 input for single search
if (this.singleSearchFlt) {
if (this.singleFlt) {
col = INPUT;
inpclass = this.singleFltCssClass;
}
@ -989,7 +1001,7 @@ export class TableFilter {
if (i === n - 1 && this.displayBtn) {
this._buildSubmitButton(
this.isExternalFlt() ?
elm(this.externalFltTgtIds[i]) :
elm(this.externalFltIds[i]) :
fltCell
);
}
@ -1176,7 +1188,7 @@ export class TableFilter {
_buildInputFilter(colIndex, cssClass, container) {
let col = this.getFilterType(colIndex);
let externalFltTgtId = this.isExternalFlt() ?
this.externalFltTgtIds[colIndex] : null;
this.externalFltIds[colIndex] : null;
let inpType = col === INPUT ? 'text' : 'hidden';
let inp = createElm(INPUT,
['id', this.buildFilterId(colIndex)],
@ -1464,7 +1476,7 @@ export class TableFilter {
if (!this.isExternalFlt()) {
return;
}
let ids = this.externalFltTgtIds;
let ids = this.externalFltIds;
ids.forEach((id) => {
let externalFlt = elm(id);
if (externalFlt) {
@ -1526,9 +1538,12 @@ export class TableFilter {
if (!this.fltGrid || !this.initialized) {
return;
}
let emitter = this.emitter;
//fire onbefore callback
this.onBeforeFilter(this);
this.emitter.emit('before-filtering', this);
emitter.emit('before-filtering', this);
let hiddenRows = 0;
@ -1546,14 +1561,14 @@ export class TableFilter {
let nbCells = cells.length;
let occurence = [],
isRowValid = true,
isMatch = true,
//only for single filter search
singleFltRowValid = false;
isSingleFltMatch = false;
// this loop retrieves cell data
for (let j = 0; j < nbCells; j++) {
//searched keyword
let sA = searchArgs[this.singleSearchFlt ? 0 : j];
let sA = searchArgs[this.singleFlt ? 0 : j];
if (sA === '') {
continue;
@ -1573,9 +1588,9 @@ export class TableFilter {
//detect operators or array query
if (isArray(sA) || hasMultiOrSA || hasMultiAndSA) {
let cS,
s,
occur = false;
let cS, s;
let found = false;
if (isArray(sA)) {
s = sA;
} else {
@ -1584,53 +1599,56 @@ export class TableFilter {
// isolate search term and check occurence in cell data
for (let w = 0, len = s.length; w < len; w++) {
cS = trim(s[w]);
occur = this._match(cS, cellValue, j);
found = this._match(cS, cellValue, j);
if (occur) {
this.emitter.emit('highlight-keyword', this,
if (found) {
emitter.emit('highlight-keyword', this,
cells[j], cS);
}
if ((hasMultiOrSA && occur) ||
(hasMultiAndSA && !occur)) {
if ((hasMultiOrSA && found) ||
(hasMultiAndSA && !found)) {
break;
}
if (isArray(sA) && occur) {
if (isArray(sA) && found) {
break;
}
}
occurence[j] = occur;
occurence[j] = found;
}
//single search parameter
else {
occurence[j] = this._match(trim(sA), cellValue, j);
if (occurence[j]) {
this.emitter.emit('highlight-keyword', this,
cells[j], sA);
emitter.emit('highlight-keyword', this, cells[j],
sA);
}
}
if (!occurence[j]) {
isRowValid = false;
}
if (this.singleSearchFlt && occurence[j]) {
singleFltRowValid = true;
isMatch = false;
}
this.emitter.emit('cell-processed', this, j, cells[j]);
if (this.singleFlt &&
this.singleFltExcludeCols.indexOf(j) === -1 &&
occurence[j]) {
isSingleFltMatch = true;
}
emitter.emit('cell-processed', this, j, cells[j]);
}//for j
if (this.singleSearchFlt && singleFltRowValid) {
isRowValid = true;
if (isSingleFltMatch) {
isMatch = true;
}
this.validateRow(k, isRowValid);
if (!isRowValid) {
this.validateRow(k, isMatch);
if (!isMatch) {
hiddenRows++;
}
this.emitter.emit('row-processed', this, k,
this.validRowsIndex.length, isRowValid);
emitter.emit('row-processed', this, k,
this.validRowsIndex.length, isMatch);
},
// continue condition
(row) => row.cells.length !== this.nbCells
@ -1641,7 +1659,7 @@ export class TableFilter {
//fire onafterfilter callback
this.onAfterFilter(this);
this.emitter.emit('after-filtering', this, searchArgs);
emitter.emit('after-filtering', this, searchArgs);
}
/**
@ -1855,7 +1873,7 @@ export class TableFilter {
// fallback to unformatted number string comparison
if (numData &&
this.hasType(colIdx, [NUMBER, FORMATTED_NUMBER]) &&
!this.singleSearchFlt) {
!this.singleFlt) {
// parseNb can return 0 for strings which are not
// formatted numbers, in that case return the original
// string. TODO: handle this in parseNb
@ -2595,7 +2613,7 @@ export class TableFilter {
* @private
*/
isExternalFlt() {
return this.externalFltTgtIds.length > 0;
return this.externalFltIds.length > 0;
}
/**

2
static/templates/external-filters.html
View file

@ -107,7 +107,7 @@ var tfConfig = {
/* external filters */
// external_flt_grid: true,
external_flt_grid_ids: [
external_flt_ids: [
'slcCountry',
'slcCode',
'slcYear',

12
test/test-external-filters.js
View file

@ -7,7 +7,7 @@ var tf = new TableFilter('demo', {
col_3: 'multiple',
col_4: 'checklist',
/* external filters */
external_flt_grid_ids: [
external_flt_ids: [
'extFrom',
'extDestination',
'extRoadDistance',
@ -21,7 +21,7 @@ module('Sanity checks');
test('External filters', function() {
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
deepEqual(tf.externalFltTgtIds.length, 5,
deepEqual(tf.externalFltIds.length, 5,
'External filters ids length');
deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');
@ -81,7 +81,7 @@ test('Sanity checks', function() {
col_3: 'multiple',
col_4: 'checklist',
/* external filters */
external_flt_grid_ids: [
external_flt_ids: [
'extFrom',
'extDestination',
'extRoadDistance',
@ -94,7 +94,7 @@ test('Sanity checks', function() {
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
deepEqual(tf.externalFltTgtIds.length, 5,
deepEqual(tf.externalFltIds.length, 5,
'External filters ids length');
deepEqual(tf.getFiltersRowIndex(), 1, 'Filters row index');
deepEqual(tf.getHeadersRowIndex(), 0, 'Headers row index');
@ -152,7 +152,7 @@ test('Sanity checks', function() {
col_3: 'multiple',
col_4: 'checklist',
/* external filters */
external_flt_grid_ids: [
external_flt_ids: [
'extFrom',
'extDestination',
'extRoadDistance',
@ -165,7 +165,7 @@ test('Sanity checks', function() {
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
deepEqual(tf.isExternalFlt(), true, 'Has external filters');
deepEqual(tf.externalFltTgtIds.length, 5,
deepEqual(tf.externalFltIds.length, 5,
'External filters ids length');
deepEqual(tf.getFiltersRowIndex(), 0, 'Filters row index');
deepEqual(tf.getHeadersRowIndex(), 1, 'Headers row index');

4
test/test-popup-filter.js
View file

@ -347,7 +347,7 @@ test('Configuration settings overrides', function() {
// assert
deepEqual(tf.filtersRowIndex, 1, 'Filters row index config setting value');
deepEqual(
tf.externalFltTgtIds,
tf.externalFltIds,
[],
'External filters container ids config setting value'
);
@ -360,7 +360,7 @@ test('Configuration settings overrides', function() {
// assert
deepEqual(tf.filtersRowIndex, 0, 'Filters row index override');
deepEqual(
tf.externalFltTgtIds,
tf.externalFltIds,
[
'popup_demo_0',
'popup_demo_1',

50
test/test-single-filter.js
View file

@ -20,6 +20,44 @@ test('Filter', function() {
tf.clearFilters();
});
module('Exclude columns');
test('Exclude from filtering expected columns', function() {
// setup
tf.destroy();
tf = null;
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
single_filter: {
exclude_cols: [1, 4]
}
});
tf.init();
// act
tf.setFilterValue(0, 'Canberra'); // value in column 1
tf.filter();
// assert
deepEqual(tf.getValidRows().length, 0, 'Filtered rows number');
// act
tf.clearFilters();
tf.setFilterValue(0, '20.25'); // value in column 4
tf.filter();
// assert
deepEqual(tf.getValidRows().length, 0, 'Filtered rows number');
// act
tf.clearFilters();
tf.setFilterValue(0, '3.1'); // value in column 1
tf.filter();
// assert
deepEqual(tf.getValidRows().length, 1, 'Filtered rows number');
});
module('External single filter');
test('Sanity checks', function() {
tf.destroy();
@ -27,11 +65,13 @@ test('Sanity checks', function() {
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
single_filter: true,
external_flt_grid_ids: ['single-search']
external_flt_ids: ['single-search']
});
tf.init();
deepEqual(tf instanceof TableFilter, true, 'TableFilter instanciated');
notEqual(document.querySelector('#single-search').firstChild, null,
'Filter created in external container');
deepEqual(tf.getFiltersId().length, 1, 'Number of filter');
deepEqual(tf.getFiltersId(), ['flt0_demo'], 'Filter ID');
deepEqual(typeof tf.getFilterElement(0), 'object', 'Filter element');
@ -67,5 +107,11 @@ test('Filter', function() {
tf.setFilterValue(0, 'Sydney');
tf.filter();
deepEqual(tf.getValidRows().length, 4, 'Filtered rows number');
tf.clearFilters();
});
module('Tear-down');
test('can destroy TableFilter DOM elements', function() {
tf.clearFilters();
tf.destroy();
deepEqual(tf.isInitialized(), false, 'Filters removed');
});