From 55af8e86b10dc1a174aecc3167323f90f22c10ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 19 Sep 2019 14:55:13 +0800
Subject: [PATCH] Table add prop: spanMethod

---
 src/components/table/table-body.vue | 32 ++++++++++++++++++++++++++++-
 src/components/table/table.vue      |  4 ++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index e2f7ab0e..3fbb8cd7 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, colIndex) in columns" :class="alignCls(column, row)" v-bind="getSpan(row, column, index, colIndex)" v-if="showWithSpan(row, column, index, colIndex)">
                         <table-cell
                             :fixed="fixed"
                             :prefix-cls="prefixCls"
@@ -104,6 +104,36 @@
             },
             dblclickCurrentRow (_index) {
                 this.$parent.dblclickCurrentRow(_index);
+            },
+            getSpan (row, column, rowIndex, columnIndex) {
+                const fn = this.$parent.spanMethod;
+                if (typeof fn === 'function') {
+                    const result = fn({
+                        row,
+                        column,
+                        rowIndex,
+                        columnIndex
+                    });
+                    let rowspan = 1;
+                    let colspan = 1;
+                    if (Array.isArray(result)) {
+                        rowspan = result[0];
+                        colspan = result[1];
+                    } else if (typeof result === 'object') {
+                        rowspan = result.rowspan;
+                        colspan = result.colspan;
+                    }
+                    return {
+                        rowspan,
+                        colspan
+                    };
+                } else {
+                    return {};
+                }
+            },
+            showWithSpan (row, column, rowIndex, columnIndex) {
+                const result = this.getSpan(row, column, rowIndex, columnIndex);
+                return !(('rowspan' in result && result.rowspan === 0) || ('colspan' in result && result.colspan === 0));
             }
         }
     };
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 5cd7c8d9..f7c1ec2b 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -209,6 +209,10 @@
             rowKey: {
                 type: Boolean,
                 default: false
+            },
+            // 4.0.0
+            spanMethod: {
+                type: Function
             }
         },
         data () {