From d7e7ec96521e368eec159c42d93507cc981961c5 Mon Sep 17 00:00:00 2001
From: cagataycivici <cagatay.civici@gmail.com>
Date: Wed, 5 Aug 2020 16:20:11 +0300
Subject: [PATCH] Fixed #424 - Duplicate keys in TreeTable

---
 src/components/treetable/TreeTableRow.vue       | 2 +-
 src/components/treetable/TreeTableRowLoader.vue | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/treetable/TreeTableRow.vue b/src/components/treetable/TreeTableRow.vue
index f1c06dfc5..0b67d69be 100755
--- a/src/components/treetable/TreeTableRow.vue
+++ b/src/components/treetable/TreeTableRow.vue
@@ -1,6 +1,6 @@
 <template>
     <tr :class="containerClass" @click="onClick" @keydown="onKeyDown" @touchend="onTouchEnd" :style="node.style" tabindex="0">
-        <td v-for="(col,i) of columns" :key="node.key + '_' + col.columnKey||col.field||i" :style="col.bodyStyle" :class="col.bodyClass">
+        <td v-for="(col,i) of columns" :key="col.columnKey||col.field||i" :style="col.bodyStyle" :class="col.bodyClass">
             <button type="button" class="p-treetable-toggler p-link" @click="toggle" v-if="col.expander" :style="togglerStyle" tabindex="-1" v-ripple>
                 <i :class="togglerIcon"></i>
             </button>
diff --git a/src/components/treetable/TreeTableRowLoader.vue b/src/components/treetable/TreeTableRowLoader.vue
index 6ac2e6cb7..3db8be9db 100755
--- a/src/components/treetable/TreeTableRowLoader.vue
+++ b/src/components/treetable/TreeTableRowLoader.vue
@@ -31,6 +31,7 @@ const TreeTableRowLoader = {
     },
     render(createElement, context) {
         const root = createElement(TreeTableRow, {
+            key: context.props.node.key,
             props: context.props,
             on: {
                 'node-toggle': context.listeners['node-toggle'],
@@ -51,6 +52,7 @@ const TreeTableRowLoader = {
                 childNodeProps.level = context.props.level + 1;
 
                 let childNodeElement = createElement(TreeTableRowLoader, {
+                    key: childNode.key,
                     props: childNodeProps,
                     on: {
                         'node-toggle': context.listeners['node-toggle'],