Skip to content

Commit

Permalink
Merge pull request #2302 from tugcekucukoglu/nuxt
Browse files Browse the repository at this point in the history
Fixed #2163 - v2 DataTable ColGroup in footer/header: Cannot read pro…
  • Loading branch information
tugcekucukoglu authored Mar 11, 2022
2 parents 696bf74 + bddda23 commit adf692c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/components/datatable/TableFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
row.child.$scopedSlots.default().forEach(child => {
if (child.child && child.child.children && child.child.children instanceof Array)
cols = [...cols, ...child.child.children];
else if (child.componentOptions.tag === 'Column')
else if (child.componentOptions && child.componentOptions.tag === 'Column')
cols.push(child);
});
Expand Down
4 changes: 2 additions & 2 deletions src/components/datatable/TableHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ export default {
let cols = [];
if (row.child && row.child.$scopedSlots.default) {
row.child.$scopedSlots.default().forEach(child => {
row.child.$scopedSlots.default().forEach(child => {console.log(child)
if (child.child && child.child.children && child.child.children instanceof Array)
cols = [...cols, ...child.child.children];
else if (child.componentOptions.tag === 'Column')
else if (child.componentOptions && child.componentOptions.tag === 'Column')
cols.push(child);
});
Expand Down

0 comments on commit adf692c

Please sign in to comment.