From ccfe47149ce68d22d576a1c3c7d0a7ad782c1cd5 Mon Sep 17 00:00:00 2001
From: other <other@mewmew.cn>
Date: Tue, 17 Aug 2021 09:53:43 +0800
Subject: [PATCH] 更新

---
 .gitignore                          |  1 +
 src/components/table/table-body.vue | 10 ++++++++--
 src/components/table/table.vue      |  7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ff855a..a32a26a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.diff
 *.patch
 *.bak
+.history
 .DS_Store
 node_modules/
 .project
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index e2f7ab0..4c6cbd3 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" :class="alignCls(column, row)">
+                    <td v-for="column in columns" :rowspan="rowExpander(row, column)" :class="alignCls(column, row)">
                         <table-cell
                             :fixed="fixed"
                             :prefix-cls="prefixCls"
@@ -30,7 +30,7 @@
                     </td>
                 </table-tr>
                 <tr v-if="rowExpanded(row._index)" :class="{[prefixCls + '-expanded-hidden']: fixed}">
-                    <td :colspan="columns.length" :class="prefixCls + '-expanded-cell'">
+                    <td :colspan="columns.length"  :class="prefixCls + '-expanded-cell'">
                         <Expand :key="rowKey ? row._rowKey : index" :row="row" :render="expandRender" :index="row._index"></Expand>
                     </td>
                 </tr>
@@ -67,6 +67,12 @@
             rowKey: {
                 type: Boolean,
                 default: false
+            },
+            rowExpander: {
+                type: Function,
+                default: function(){
+                    return 1;
+                }
             }
         },
         computed: {
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 81c4a29..ce17b48 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -88,6 +88,7 @@
                         :data="rebuildData"
                         :row-key="rowKey"
                         :columns-width="columnsWidth"
+                        :row-expander="rowExpander"
                         :obj-data="objData"></table-body>
                 </div>
             </div>
@@ -208,6 +209,12 @@
             rowKey: {
                 type: Boolean,
                 default: false
+            },
+            rowExpander: {
+                type: Function,
+                default: function(){
+                    return 1;
+                }
             }
         },
         data () {
--
libgit2 0.21.4