mirror of
https://github.com/primefaces/primevue.git
synced 2025-05-11 01:42:34 +00:00
Merge branch 'master' into v4
This commit is contained in:
commit
d61c9f5e61
40 changed files with 2703 additions and 120 deletions
|
@ -488,12 +488,12 @@ export default {
|
|||
|
||||
for (let j = 0; j < this.columns.length; j++) {
|
||||
let col = this.columns[j];
|
||||
let filterField = this.columnProp(col, 'field');
|
||||
let filterField = this.columnProp(col, 'filterField') || this.columnProp(col, 'field');
|
||||
|
||||
//local
|
||||
if (Object.prototype.hasOwnProperty.call(this.filters, this.columnProp(col, 'field'))) {
|
||||
if (Object.prototype.hasOwnProperty.call(this.filters, filterField)) {
|
||||
let filterMatchMode = this.columnProp(col, 'filterMatchMode') || 'startsWith';
|
||||
let filterValue = this.filters[this.columnProp(col, 'field')];
|
||||
let filterValue = this.filters[filterField];
|
||||
let filterConstraint = FilterService.filters[filterMatchMode];
|
||||
let paramsWithoutNode = { filterField, filterValue, filterConstraint, strict };
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue