Skip to content

Commit

Permalink
Merge pull request #426 from rathiayush/master
Browse files Browse the repository at this point in the history
fix for global filter in treetable
  • Loading branch information
cagataycivici authored Aug 5, 2020
2 parents 370dd15 + 9f43747 commit 6da0f98
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/components/treetable/TreeTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -580,9 +580,9 @@ export default {
//global
if (this.hasGlobalFilter && !globalMatch) {
let copyNodeForGlobal = {...copyNode};
let globalFilterValue = this.props.globalFilter;
let globalFilterConstraint = FilterUtils['contains'];
let globalFilterParamsWithoutNode = {filterField, globalFilterValue, globalFilterConstraint, strict};
let filterValue = this.filters['global'];
let filterConstraint = FilterUtils['contains'];
let globalFilterParamsWithoutNode = {filterField, filterValue, filterConstraint, strict};
if ((strict && (this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode))) ||
(!strict && (this.isFilterMatched(copyNodeForGlobal, globalFilterParamsWithoutNode) || this.findFilteredNodes(copyNodeForGlobal, globalFilterParamsWithoutNode)))) {
Expand Down

0 comments on commit 6da0f98

Please sign in to comment.