From b70ff261de1251aaf32d18e8a6c9813972a76fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Wed, 26 Jan 2022 13:19:38 +0300
Subject: [PATCH] Fixed #1932 - DataTable Dynamic Row defect

---
 src/components/datatable/TableFooter.vue | 19 ++++++++++++++++++-
 src/components/datatable/TableHeader.vue | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/components/datatable/TableFooter.vue b/src/components/datatable/TableFooter.vue
index 780a8f14d..d146558cb 100755
--- a/src/components/datatable/TableFooter.vue
+++ b/src/components/datatable/TableFooter.vue
@@ -6,7 +6,7 @@
             </template>
         </tr>
         <template v-else>
-            <tr v-for="(row,i) of columnGroup.children.default()" :key="i" role="row">
+            <tr v-for="(row,i) of getFooterRows()" :key="i" role="row">
                 <template v-for="(col,j) of getFooterColumns(row)" :key="columnProp(col,'columnKey')||columnProp(col,'field')||j">
                     <DTFooterCell :column="col" v-if="!columnProp(col,'hidden')"/>
                 </template>
@@ -35,6 +35,23 @@ export default {
         columnProp(col, prop) {
             return ObjectUtils.getVNodeProp(col, prop);
         },
+        getFooterRows() {
+            let rows = [];
+
+            let columnGroup = this.columnGroup;
+            if (columnGroup.children && columnGroup.children.default) {
+                for (let child of columnGroup.children.default()) {
+                    if (child.type.name === 'Row') {
+                        rows.push(child);
+                    }
+                    else if (child.children && child.children instanceof Array) {
+                        rows = child.children;
+                    }
+                }
+
+                return rows;
+            }
+        },
         getFooterColumns(row){
             let cols = [];
 
diff --git a/src/components/datatable/TableHeader.vue b/src/components/datatable/TableHeader.vue
index b8c1c45fe..b5c6a568f 100755
--- a/src/components/datatable/TableHeader.vue
+++ b/src/components/datatable/TableHeader.vue
@@ -32,7 +32,7 @@
             </tr>
         </template>
         <template v-else>
-            <tr v-for="(row,i) of columnGroup.children.default()" :key="i" role="row">
+            <tr v-for="(row,i) of getHeaderRows()" :key="i" role="row">
                 <template v-for="(col,j) of getHeaderColumns(row)" :key="columnProp(col, 'columnKey')||columnProp(col, 'field')||j">
                     <DTHeaderCell v-if="!columnProp(col, 'hidden') && (rowGroupMode !== 'subheader' || (groupRowsBy !== columnProp(col, 'field'))) && (typeof col.children !== 'string')" :column="col"
                     @column-click="$emit('column-click', $event)" @column-mousedown="$emit('column-mousedown', $event)"
@@ -132,6 +132,23 @@ export default {
         getFilterColumnHeaderStyle(column) {
             return [this.columnProp(column, 'filterHeaderStyle'), this.columnProp(column, 'style')];
         },
+        getHeaderRows() {
+            let rows = [];
+
+            let columnGroup = this.columnGroup;
+            if (columnGroup.children && columnGroup.children.default) {
+                for (let child of columnGroup.children.default()) {
+                    if (child.type.name === 'Row') {
+                        rows.push(child);
+                    }
+                    else if (child.children && child.children instanceof Array) {
+                        rows = child.children;
+                    }
+                }
+
+                return rows;
+            }
+        },
         getHeaderColumns(row){
             let cols = [];