vhad/react-bootstrap-table2
1
0
Fork 0
mirror of https://github.com/gosticks/react-bootstrap-table2.git synced 2026-06-28 13:10:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #1060

Browse Source
This commit is contained in:
AllenFang
2019-08-18 17:04:17 +08:00
parent 110744f4cb
commit eb204f6526
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/react-bootstrap-table2-filter/src/filter.js vendored
View File

@@ -234,6 +234,7 @@ export const filters = (data, columns, _) => (currFilters) => {
let result = data;
let filterFn;
Object.keys(currFilters).forEach((dataField) => {
let currentResult;
const filterObj = currFilters[dataField];
filterFn = factory(filterObj.filterType);
let filterValue;
@@ -248,9 +249,12 @@ export const filters = (data, columns, _) => (currFilters) => {
}
}
if (customFilter) {
result = customFilter(filterObj.filterVal, result);
} else {
currentResult = customFilter(filterObj.filterVal, result);
}
if (typeof currentResult === 'undefined') {
result = filterFn(result, dataField, filterObj, filterValue);
} else {
result = currentResult;
}
});
return result;