From 60aaf1401a5c7d320f256d382fe3ecf6c700b9f5 Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Fri, 30 Jul 2021 16:48:22 +0800
Subject: [PATCH 1/2] feat(table): support expandIcon slot

---
 components/table/Table.jsx | 6 ++++--
 components/table/index.jsx | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/table/Table.jsx b/components/table/Table.jsx
index e0a00d2f81..845fbd4a95 100755
--- a/components/table/Table.jsx
+++ b/components/table/Table.jsx
@@ -1146,7 +1146,9 @@ export default {
       getPopupContainer: contextGetPopupContainer,
       transformCellText,
     }) {
-      const { showHeader, locale, getPopupContainer, ...restProps } = getOptionProps(this);
+      const { showHeader, locale, getPopupContainer, expandIcon, ...restProps } = getOptionProps(
+        this,
+      );
       const data = this.getCurrentPageData();
       const expandIconAsCell = this.expandedRowRender && this.expandIconAsCell !== false;
 
@@ -1190,7 +1192,7 @@ export default {
       const vcTableProps = {
         key: 'table',
         props: {
-          expandIcon: this.renderExpandIcon(prefixCls),
+          expandIcon: expandIcon || this.renderExpandIcon(prefixCls),
           ...restProps,
           customRow: (record, index) => this.onRow(prefixCls, record, index),
           components: this.sComponents,
diff --git a/components/table/index.jsx b/components/table/index.jsx
index b547933960..f30056b538 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -112,6 +112,7 @@ const Table = {
       title: slotTitle,
       footer: slotFooter,
       expandedRowRender = props.expandedRowRender,
+      expandIcon = props.expandIcon,
     } = $scopedSlots;
     title = title || slotTitle;
     footer = footer || slotFooter;
@@ -122,6 +123,7 @@ const Table = {
         title,
         footer,
         expandedRowRender,
+        expandIcon,
       },
       on: getListeners(this),
     };

From 878857bab1cb4c07373e743a64c3005370011f66 Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Mon, 2 Aug 2021 09:40:47 +0800
Subject: [PATCH 2/2] fix(table): preferred use expandIcon prop

---
 components/table/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/table/index.jsx b/components/table/index.jsx
index f30056b538..1441b06900 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -112,7 +112,7 @@ const Table = {
       title: slotTitle,
       footer: slotFooter,
       expandedRowRender = props.expandedRowRender,
-      expandIcon = props.expandIcon,
+      expandIcon,
     } = $scopedSlots;
     title = title || slotTitle;
     footer = footer || slotFooter;
@@ -123,7 +123,7 @@ const Table = {
         title,
         footer,
         expandedRowRender,
-        expandIcon,
+        expandIcon: this.$props.expandIcon || expandIcon,
       },
       on: getListeners(this),
     };