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

Merge pull request #426 from rathiayush/master 

fix for global filter in treetable
pull/435/head
Cagatay Civici 2020-08-05 16:37:15 +03:00 committed by GitHub
parent 370dd15f9a 9f43747837
commit 6da0f9820d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/treetable/TreeTable.vue
View File

@ -580,9 +580,9 @@ export default {
//global //global
if (this.hasGlobalFilter && !globalMatch) { if (this.hasGlobalFilter && !globalMatch) {
let copyNodeForGlobal = {...copyNode}; let copyNodeForGlobal = {...copyNode};
let globalFilterValue = this.props.globalFilter; let filterValue = this.filters['global'];
let globalFilterConstraint = FilterUtils['contains']; let filterConstraint = FilterUtils['contains'];
let globalFilterParamsWithoutNode = {filterField, globalFilterValue, globalFilterConstraint, strict}; let globalFilterParamsWithoutNode = {filterField, filterValue, filterConstraint, strict};
if ((strict && (this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode))) || if ((strict && (this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode))) ||
(!strict && (this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode)))) { (!strict && (this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode)))) {