diff --git a/src/components/column/Column.vue b/src/components/column/Column.vue index b5df3a314..808a8922e 100644 --- a/src/components/column/Column.vue +++ b/src/components/column/Column.vue @@ -65,6 +65,14 @@ export default { expander: { type: Boolean, default: false + }, + colspan: { + type: Number, + default: null + }, + rowspan: { + type: Number, + default: null } }, render() { diff --git a/src/components/columngroup/ColumnGroup.vue b/src/components/columngroup/ColumnGroup.vue new file mode 100644 index 000000000..5a81bd6d7 --- /dev/null +++ b/src/components/columngroup/ColumnGroup.vue @@ -0,0 +1,30 @@ + + + \ No newline at end of file diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue index f7b2f48db..a2ce3eecb 100644 --- a/src/components/datatable/DataTable.vue +++ b/src/components/datatable/DataTable.vue @@ -22,8 +22,9 @@ - - + + - - - - -
+
{{col.header}} @@ -32,15 +33,19 @@
- - {{col.footer}} -