#655 for TreeTable
parent
0bf807591e
commit
835ad45065
|
@ -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');
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue