parent
acb9a5e888
commit
0b5407965c
|
@ -748,9 +748,7 @@ export default {
|
||||||
|
|
||||||
filterEvent.filteredValue = filteredValue;
|
filterEvent.filteredValue = filteredValue;
|
||||||
this.$emit('filter', filterEvent);
|
this.$emit('filter', filterEvent);
|
||||||
this.$nextTick(() => {
|
this.$emit('value-change', filteredValue);
|
||||||
this.$emit('value-change', this.processedData);
|
|
||||||
});
|
|
||||||
|
|
||||||
return filteredValue;
|
return filteredValue;
|
||||||
},
|
},
|
||||||
|
@ -2019,14 +2017,14 @@ export default {
|
||||||
|
|
||||||
if (!this.lazy && !this.virtualScrollerOptions?.lazy) {
|
if (!this.lazy && !this.virtualScrollerOptions?.lazy) {
|
||||||
if (data && data.length) {
|
if (data && data.length) {
|
||||||
if (this.hasFilters) {
|
|
||||||
data = this.filter(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.sorted) {
|
if (this.sorted) {
|
||||||
if (this.sortMode === 'single') data = this.sortSingle(data);
|
if (this.sortMode === 'single') data = this.sortSingle(data);
|
||||||
else if (this.sortMode === 'multiple') data = this.sortMultiple(data);
|
else if (this.sortMode === 'multiple') data = this.sortMultiple(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.hasFilters) {
|
||||||
|
data = this.filter(data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue