diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 2bbacba50..efa96f872 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -38,17 +38,17 @@
-
-
+
+
-
-
+
-
-
+
-
-
+
+
-
-
+
+
-
-
+
-
-
+
-
-
+
+
@@ -591,13 +591,13 @@ export default {
for(let j = 0; j < this.columns.length; j++) {
let col = this.columns[j];
- let columnField = col.filterField || col.field;
+ let columnField = col.props.filterField || col.props.field;
//local
if (Object.prototype.hasOwnProperty.call(this.filters, columnField)) {
let filterValue = this.filters[columnField];
let dataFieldValue = ObjectUtils.resolveFieldData(data[i], columnField);
- let filterConstraint = col.filterMatchMode === 'custom' ? col.filterFunction : FilterUtils[col.filterMatchMode];
+ let filterConstraint = col.props.filterMatchMode === 'custom' ? col.props.filterFunction : FilterUtils[col.props.filterMatchMode];
if (!filterConstraint(dataFieldValue, filterValue, this.filterLocale)) {
localMatch = false;
}
@@ -607,7 +607,7 @@ export default {
}
}
- if (!col.excludeGlobalFilter && this.hasGlobalFilter && !globalMatch) {
+ if (!col.props.excludeGlobalFilter && this.hasGlobalFilter && !globalMatch) {
globalMatch = FilterUtils.contains(ObjectUtils.resolveFieldData(data[i], columnField), this.filters['global'], this.filterLocale);
}
}
@@ -1673,7 +1673,7 @@ export default {
let frozenColumns = [];
for(let col of this.columns) {
- if(col.frozen) {
+ if(col.props.frozen) {
frozenColumns = frozenColumns||[];
frozenColumns.push(col);
}
@@ -1685,7 +1685,7 @@ export default {
let scrollableColumns = [];
for(let col of this.columns) {
- if(!col.frozen) {
+ if(!col.props.frozen) {
scrollableColumns = scrollableColumns||[];
scrollableColumns.push(col);
}
diff --git a/src/components/datatable/ScrollableView.vue b/src/components/datatable/ScrollableView.vue
index 271a5c3c1..0fe62e017 100755
--- a/src/components/datatable/ScrollableView.vue
+++ b/src/components/datatable/ScrollableView.vue
@@ -8,8 +8,8 @@
-
-
+
+
@@ -20,7 +20,7 @@
-
+
@@ -63,6 +63,14 @@ export default {
type: null,
default: null
},
+ headerColumnGroup: {
+ type: null,
+ default: null
+ },
+ footerColumnGroup: {
+ type: null,
+ default: null
+ },
scrollHeight: {
type: String,
default: null