#655 for TreeTable

primefaces · Nov 25, 2020 · 835ad45 · 835ad45
1 parent 0bf8075
commit 835ad45
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue
@@ -575,7 +575,7 @@ export default {
                     }
 
                     //global
-                    if (this.hasGlobalFilter && !globalMatch) {
+                    if (this.hasGlobalFilter() && !globalMatch) {
                         let copyNodeForGlobal = {...copyNode};
                         let filterValue = this.filters['global'];
                         let filterConstraint = FilterUtils['contains'];
@@ -590,7 +590,7 @@ export default {
                 }
 
                 let matches = localMatch;
-                if (this.hasGlobalFilter) {
+                if (this.hasGlobalFilter()) {
                     matches = localMatch && globalMatch;
                 }
 
@@ -646,7 +646,7 @@ export default {
         },
         createLazyLoadEvent(event) {
             let filterMatchModes;
-            if (this.hasFilters) {
+            if (this.hasFilters()) {
                 filterMatchModes = {};
                 this.columns.forEach(col => {
                     if (col.props?.field) {
@@ -777,6 +777,12 @@ export default {
             }
 
             return false;
+        },
+        hasFilters() {
+            return this.filters && Object.keys(this.filters).length > 0 && this.filters.constructor === Object;
+        },
+        hasGlobalFilter() {
+            return this.filters && Object.prototype.hasOwnProperty.call(this.filters, 'global');
         }
     },
     computed: {
@@ -816,7 +822,7 @@ export default {
                             data = this.sortMultiple(data);
                     }
 
-                    if (this.hasFilters) {
+                    if (this.hasFilters()) {
                         data = this.filter(data);
                     }
 
@@ -857,12 +863,6 @@ export default {
 
             return hasFooter;
         },
-        hasFilters() {
-            return this.filters && Object.keys(this.filters).length > 0 && this.filters.constructor === Object;
-        },
-        hasGlobalFilter() {
-            return this.filters && Object.prototype.hasOwnProperty.call(this.filters, 'global');
-        },
         paginatorTop() {
             return this.paginator && (this.paginatorPosition !== 'bottom' || this.paginatorPosition === 'both');
         },