From 0e8bb0c195bbee63f908cfe7f2f634ff70a19beb Mon Sep 17 00:00:00 2001
From: other <other@mewmew.cn>
Date: Tue, 17 Aug 2021 14:17:44 +0800
Subject: [PATCH] 更新

---
 src/components/table/table-body.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index 4c6cbd3..78a1ae0 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -14,7 +14,7 @@
                     @mouseleave.native.stop="handleMouseOut(row._index)"
                     @click.native="clickCurrentRow(row._index)"
                     @dblclick.native.stop="dblclickCurrentRow(row._index)">
-                    <td v-for="column in columns" :rowspan="rowExpander(row, column)" :class="alignCls(column, row)">
+                    <td v-for="(column,colIndex) in columns" v-if="rowExpanderResult[index][colIndex]" :rowspan="rowExpanderResult[index][colIndex]" :class="alignCls(column, row)">
                         <table-cell
                             :fixed="fixed"
                             :prefix-cls="prefixCls"
@@ -87,6 +87,19 @@
                     }
                 }
                 return render;
+            },
+            rowExpanderResult() {
+                const result = [];
+                for (let i = 0; i < this.data.length; i++) {
+                    const row = this.data[i];
+                    const span = [];
+                    for (let j = 0; j < this.columns.length; j++) {
+                        const column = this.columns[j];
+                        span.push(this.rowExpander(row,column));
+                    }
+                    result.push(span);
+                }
+                return result;
             }
         },
         methods: {
--
libgit2 0.21.4