vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Fixed filtering

pull/496/head
Cagatay Civici 2020-09-23 22:20:09 +03:00
parent bfc723d06e
commit 1e56e62f40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/datatable/DataTable.vue
View File

@ -597,7 +597,7 @@ export default {
if (Object.prototype.hasOwnProperty.call(this.filters, columnField)) { if (Object.prototype.hasOwnProperty.call(this.filters, columnField)) {
let filterValue = this.filters[columnField]; let filterValue = this.filters[columnField];
let dataFieldValue = ObjectUtils.resolveFieldData(data[i], columnField); let dataFieldValue = ObjectUtils.resolveFieldData(data[i], columnField);
let filterConstraint = col.props.filterMatchMode === 'custom' ? col.props.filterFunction : FilterUtils[col.props.filterMatchMode]; let filterConstraint = col.props.filterMatchMode === 'custom' ? col.props.filterFunction : FilterUtils[col.props.filterMatchMode||'startsWith'];
if (!filterConstraint(dataFieldValue, filterValue, this.filterLocale)) { if (!filterConstraint(dataFieldValue, filterValue, this.filterLocale)) {
localMatch = false; localMatch = false;
} }
@ -613,11 +613,11 @@ export default {
} }
let matches = localMatch; let matches = localMatch;
if(this.hasGlobalFilter) { if (this.hasGlobalFilter) {
matches = localMatch && globalMatch; matches = localMatch && globalMatch;
} }
if(matches) { if (matches) {
filteredValue.push(data[i]); filteredValue.push(data[i]);
} }
} }