From 69cdf22b4231894c376dccebd041796f158eb682 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 20 Sep 2016 13:16:58 +0800
Subject: [PATCH] Allow indicate expandIconColumnIndex in Table, close #3055

---
 components/table/Table.tsx      | 11 +++++++++--
 components/table/demo/expand.md |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/table/Table.tsx b/components/table/Table.tsx
index 40723bb55d..752be5fa4d 100644
--- a/components/table/Table.tsx
+++ b/components/table/Table.tsx
@@ -75,6 +75,7 @@ export interface TableProps {
   defaultExpandedRowKeys?: string[];
   expandedRowKeys?: string[];
   expandIconAsCell?: boolean;
+  expandIconColumnIndex?: number;
   onChange?: (pagination: PaginationProps | boolean, filters: string[], sorter: Object) => any;
   loading?: boolean;
   locale?: Object;
@@ -849,13 +850,19 @@ export default class Table extends React.Component<TableProps, any> {
       return newColumn;
     });
 
+    let expandIconColumnIndex = (columns[0] && columns[0].key === 'selection-column') ? 1 : 0;
+    if ('expandIconColumnIndex' in restProps) {
+      expandIconColumnIndex = restProps.expandIconColumnIndex;
+    }
+
     let table = (
-      <RcTable {...restProps}
+      <RcTable
+        {...restProps}
         prefixCls={prefixCls}
         data={data}
         columns={columns}
         className={classString}
-        expandIconColumnIndex={(columns[0] && columns[0].key === 'selection-column') ? 1 : 0}
+        expandIconColumnIndex={expandIconColumnIndex}
         expandIconAsCell={expandIconAsCell}
         emptyText={() => locale.emptyText}
       />
diff --git a/components/table/demo/expand.md b/components/table/demo/expand.md
index 98df74e145..6c535bd9e1 100644
--- a/components/table/demo/expand.md
+++ b/components/table/demo/expand.md
@@ -30,7 +30,8 @@ const data = [
 ];
 
 ReactDOM.render(
-  <Table columns={columns}
+  <Table
+    columns={columns}
     expandedRowRender={record => <p>{record.description}</p>}
     dataSource={data}
     className="table"