no overwrite expandIconColumnIndex if set (#21315)

ant-design · Feb 10, 2020 · 06de637 · 06de637
1 parent cf4808b
commit 06de637
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -336,8 +336,8 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
   mergedExpandable.expandIcon =
     mergedExpandable.expandIcon || expandIcon || renderExpandIcon(tableLocale!);
 
-  // Adjust expand icon index
-  if (expandType === 'nest') {
+  // Adjust expand icon index, no overwrite expandIconColumnIndex if set.
+  if (expandType === 'nest' && !('expandIconColumnIndex' in mergedExpandable)) {
     mergedExpandable.expandIconColumnIndex = rowSelection ? 1 : 0;
   }