mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-10 18:36:43 +02:00
Fixed search inconsistency with numeric column types
This commit is contained in:
Max Guglielmi
parent
e75e6897fd
commit
9a694ba263
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* 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
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* 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
4
dist/tablefilter/style/tablefilter.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* 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}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* 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}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.18 by Max Guglielmi
|
||||
* build date: 2016-05-04T11:57:09.772Z
|
||||
* tablefilter v0.2.19 by Max Guglielmi
|
||||
* build date: 2016-05-07T03:25:36.873Z
|
||||
* 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
8211
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
2300
dist/tablefilter/tf-1.js
vendored
2300
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.2.18",
|
||||
"version": "0.2.19",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
"babel-eslint": "6.0.4",
|
||||
"babel-loader": "^6.0.1",
|
||||
"babel-preset-es2015": "^6.5.0",
|
||||
"babel-plugin-transform-es2015-classes": "^6.7.7",
|
||||
"babel-plugin-transform-es2015-classes": "^6.8.0",
|
||||
"clean-webpack-plugin": "^0.1.9",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
import Str from './string';
|
||||
|
||||
export default {
|
||||
removeNbFormat(data, format){
|
||||
if(!data){
|
||||
removeNbFormat(data, format) {
|
||||
if (!data) {
|
||||
return;
|
||||
}
|
||||
if(!format){
|
||||
if (!format) {
|
||||
format = 'us';
|
||||
}
|
||||
let n = data;
|
||||
if(Str.lower(format) === 'us'){
|
||||
n =+ n.replace(/[^\d\.-]/g,'');
|
||||
if (Str.lower(format) === 'us') {
|
||||
n = + n.replace(/[^\d\.-]/g, '');
|
||||
} else {
|
||||
n =+ n.replace(/[^\d\,-]/g,'').replace(',','.');
|
||||
n = + n.replace(/[^\d\,-]/g, '').replace(',', '.');
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1162,8 +1162,9 @@ export class TableFilter {
|
|||
// search args re-init
|
||||
let searchArgs = this.getFiltersValue();
|
||||
|
||||
var numCellData, nbFormat;
|
||||
var re_le = new RegExp(this.leOperator),
|
||||
let numCellData;
|
||||
let nbFormat;
|
||||
let re_le = new RegExp(this.leOperator),
|
||||
re_ge = new RegExp(this.geOperator),
|
||||
re_l = new RegExp(this.lwOperator),
|
||||
re_g = new RegExp(this.grOperator),
|
||||
|
|
@ -1199,7 +1200,6 @@ export class TableFilter {
|
|||
|
||||
//looks for search argument in current row
|
||||
function hasArg(sA, cellData, j) {
|
||||
/*jshint validthis:true */
|
||||
sA = Str.matchCase(sA, this.caseSensitive);
|
||||
|
||||
let occurence,
|
||||
|
|
@ -1293,8 +1293,7 @@ export class TableFilter {
|
|||
else {
|
||||
//first numbers need to be formated
|
||||
if (this.hasColNbFormat && this.colNbFormat[j]) {
|
||||
numCellData = removeNbFormat(
|
||||
cellData, this.colNbFormat[j]);
|
||||
numCellData = removeNbFormat(cellData, this.colNbFormat[j]);
|
||||
nbFormat = this.colNbFormat[j];
|
||||
} else {
|
||||
if (this.thousandsSeparator === ',' &&
|
||||
|
|
@ -1374,10 +1373,22 @@ export class TableFilter {
|
|||
let srchArg = sA.replace(re_re, '');
|
||||
let rgx = new RegExp(srchArg);
|
||||
occurence = rgx.test(cellData);
|
||||
} catch (e) { occurence = false; }
|
||||
} catch (ex) {
|
||||
occurence = false;
|
||||
}
|
||||
} else {
|
||||
occurence = Str.contains(sA, cellData, this.isExactMatch(j),
|
||||
this.caseSensitive);
|
||||
// If numeric type data, perform a strict equality test and
|
||||
// fallback to unformatted number string comparison
|
||||
if(numCellData) {
|
||||
sA = removeNbFormat(sA, nbFormat);
|
||||
occurence = numCellData === sA ||
|
||||
Str.contains(sA.toString(), numCellData.toString(),
|
||||
this.isExactMatch(j), this.caseSensitive);
|
||||
} else {
|
||||
// Finally test search term is contained in cell data
|
||||
occurence = Str.contains(sA, cellData,
|
||||
this.isExactMatch(j), this.caseSensitive);
|
||||
}
|
||||
}
|
||||
|
||||
}//else
|
||||
|
|
|
|||
32
src/types.js
32
src/types.js
|
|
@ -10,14 +10,14 @@ export default {
|
|||
* @param {String or Object} v
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isObj(v){
|
||||
isObj(v) {
|
||||
let isO = false;
|
||||
if(typeof v === 'string'){
|
||||
if(window[v] && typeof window[v] === 'object'){
|
||||
if (typeof v === 'string') {
|
||||
if (window[v] && typeof window[v] === 'object') {
|
||||
isO = true;
|
||||
}
|
||||
} else {
|
||||
if(v && typeof v === 'object'){
|
||||
if (v && typeof v === 'object') {
|
||||
isO = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ export default {
|
|||
* @param {Function} fn
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isFn(fn){
|
||||
isFn(fn) {
|
||||
return (fn && fn.constructor == Function);
|
||||
},
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ export default {
|
|||
* @param {Array} obj
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isArray(obj){
|
||||
isArray(obj) {
|
||||
return (obj && obj.constructor == Array);
|
||||
},
|
||||
|
||||
|
|
@ -47,16 +47,26 @@ export default {
|
|||
* @param {String} val Value
|
||||
* @returns {Boolean}
|
||||
*/
|
||||
isString(val){
|
||||
isString(val) {
|
||||
return Object.prototype.toString.call(val) === '[object String]';
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Check argument is a number
|
||||
* @param {Number} val
|
||||
* @returns {Boolean}
|
||||
*/
|
||||
isNumber(val) {
|
||||
return Object.prototype.toString.call(val) === '[object Number]';
|
||||
},
|
||||
|
||||
/**
|
||||
* Determine if argument is undefined
|
||||
* @param {Any} o
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isUndef(o){
|
||||
isUndef(o) {
|
||||
return o === UNDEFINED;
|
||||
},
|
||||
|
||||
|
|
@ -65,7 +75,7 @@ export default {
|
|||
* @param {Any} o
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isNull(o){
|
||||
isNull(o) {
|
||||
return o === null;
|
||||
},
|
||||
|
||||
|
|
@ -74,7 +84,7 @@ export default {
|
|||
* @param {Any} o
|
||||
* @return {Boolean}
|
||||
*/
|
||||
isEmpty(o){
|
||||
return this.isUndef(o) || this.isNull(o) || o.length===0;
|
||||
isEmpty(o) {
|
||||
return this.isUndef(o) || this.isNull(o) || o.length === 0;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue