@@ -114,9 +114,14 @@ export default {
},
context: {
index: this.index,
+ focused: this.checkboxFocused,
selectable: this.$parentInstance.rowHover || this.$parentInstance.rowSelectionMode,
selected: this.$parent.selected,
- frozen: this.columnProp('frozen')
+ frozen: this.columnProp('frozen'),
+ scrollable: this.$parentInstance.scrollable,
+ scrollDirection: this.$parentInstance.scrollDirection,
+ showGridlines: this.$parentInstance.showGridlines,
+ size: this.$parentInstance?.size
}
};
@@ -126,7 +131,7 @@ export default {
return this.column.props && this.column.props.pt ? this.column.props.pt : undefined; //@todo
},
getColumnCheckboxPT(key) {
- return this.ptmo(this.getColumnProp(), key, {
+ const columnMetaData = {
props: this.column.props,
parent: {
props: this.$props,
@@ -137,7 +142,9 @@ export default {
focused: this.checkboxFocused,
partialChecked: this.partialChecked
}
- });
+ };
+
+ return mergeProps(this.ptm(`column.${key}`, { column: columnMetaData }), this.ptm(`column.${key}`, columnMetaData), this.ptmo(this.getColumnProp(), key, columnMetaData));
},
updateStickyPosition() {
if (this.columnProp('frozen')) {
diff --git a/components/lib/treetable/FooterCell.vue b/components/lib/treetable/FooterCell.vue
index 4d5bed7e7..4810b6b58 100644
--- a/components/lib/treetable/FooterCell.vue
+++ b/components/lib/treetable/FooterCell.vue
@@ -52,7 +52,8 @@ export default {
},
context: {
index: this.index,
- frozen: this.columnProp('frozen')
+ frozen: this.columnProp('frozen'),
+ size: this.$parentInstance?.size
}
};
diff --git a/components/lib/treetable/HeaderCell.vue b/components/lib/treetable/HeaderCell.vue
index 50c7d53d2..4e67660ec 100644
--- a/components/lib/treetable/HeaderCell.vue
+++ b/components/lib/treetable/HeaderCell.vue
@@ -95,8 +95,12 @@ export default {
context: {
index: this.index,
sorted: this.isColumnSorted(),
- frozen: this.columnProp('frozen'),
- resizable: this.resizableColumns
+ frozen: this.$parentInstance.scrollable && this.columnProp('frozen'),
+ resizable: this.resizableColumns,
+ scrollable: this.$parentInstance.scrollable,
+ scrollDirection: this.$parentInstance.scrollDirection,
+ showGridlines: this.$parentInstance.showGridlines,
+ size: this.$parentInstance?.size
}
};
diff --git a/components/lib/treetable/TreeTableRow.vue b/components/lib/treetable/TreeTableRow.vue
index 55bed4dbd..41a9ce0ee 100755
--- a/components/lib/treetable/TreeTableRow.vue
+++ b/components/lib/treetable/TreeTableRow.vue
@@ -418,7 +418,8 @@ export default {
return {
context: {
selectable: this.$parentInstance.rowHover || this.$parentInstance.rowSelectionMode,
- selected: this.selected
+ selected: this.selected,
+ scrollable: this.$parentInstance.scrollable
}
};
}