feat: support rowspan expanded

docs/demo/expandedRowSpan.md

@@ -0,0 +1,8 @@
+---
+title: expandedRowSpan
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/expandedRowSpan.tsx"></code>

docs/examples/expandedRowSpan.tsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import Table from 'rc-table';
+import '../../assets/index.less';
+import type { ColumnsType } from '@/interface';
+
+const columns: ColumnsType = [
+  {
+    title: '手机号',
+    dataIndex: 'a',
+    colSpan: 2,
+    width: 100,
+    onCell: (_, index) => {
+      const props: React.TdHTMLAttributes<HTMLTableCellElement> = {};
+      if (index === 1) {
+        props.rowSpan = 4;
+      } else if (index === 2) {
+        props.rowSpan = 0;
+      } else if (index === 3) {
+        props.rowSpan = 0;
+      } else if (index === 4) {
+        props.rowSpan = 0;
+      }
+
+      return props;
+    },
+  },
+  { title: '电话', dataIndex: 'b', colSpan: 0, width: 100 },
+  Table.EXPAND_COLUMN,
+  { title: 'Name', dataIndex: 'c', width: 100 },
+  { title: 'Address', dataIndex: 'd', width: 200 },
+];
+
+const data = [
+  { a: '12313132132', b: '0571-43243256', c: '小二', d: '文零西路', e: 'Male', key: 'z' },
+  { a: '13812340987', b: '0571-12345678', c: '张三', d: '文一西路', e: 'Male', key: 'a' },
+  { a: '13812340987', b: '0571-12345678', c: '张夫人', d: '文一西路', e: 'Female', key: 'b' },
+  { a: '13812340987', b: '0571-099877', c: '李四', d: '文二西路', e: 'Male', key: 'c' },
+  { a: '13812340987', b: '0571-099877', c: '李四', d: '文二西路', e: 'Male', key: 'd' },
+  { a: '1381200008888', b: '0571-099877', c: '王五', d: '文二西路', e: 'Male', key: 'e' },
+];
+
+const Demo = () => (
+  <div>
+    <h2>expanded & rowSpan</h2>
+    <Table<Record<string, any>>
+      rowKey="key"
+      columns={columns}
+      data={data}
+      expandable={{ expandedRowRender: record => <p style={{ margin: 0 }}>{record.key}</p> }}
+      className="table"
+    />
+  </div>
+);
+
+export default Demo;

src/Body/BodyRow.tsx

@@ -19,6 +19,7 @@
   scopeCellComponent: CustomizeComponent;
   indent?: number;
   rowKey: React.Key;
+  rowKeys: React.Key[];
 }
 
 // ==================================================================================
@@ -30,6 +31,7 @@
   colIndex: number,
   indent: number,
   index: number,
+  rowKeys: React.Key[],
 ) {
   const {
     record,
@@ -43,6 +45,8 @@
     expanded,
     hasNestChildren,
     onTriggerExpand,
+    expandable,
+    expandedKeys,
   } = rowInfo;
 
   const key = columnsKey[colIndex];
@@ -71,6 +75,21 @@
   let additionalCellProps: React.TdHTMLAttributes<HTMLElement>;
   if (column.onCell) {
     additionalCellProps = column.onCell(record, index);
+    const { rowSpan } = additionalCellProps;
+
+    // For expandable row with rowSpan,
+    // We should increase the rowSpan if the row is expanded
+    if (expandable && rowSpan > 1) {
+      let currentRowSpan = rowSpan;
+
+      for (let i = index; i < rowSpan; i += 1) {
+        const rowKey = rowKeys[i];
+        if (expandedKeys.has(rowKey)) {
+          currentRowSpan += 1;
+        }
+      }
+      additionalCellProps.rowSpan = currentRowSpan;
+    }
   }
 
   return {
@@ -102,8 +121,10 @@
     rowComponent: RowComponent,
     cellComponent,
     scopeCellComponent,
+    rowKeys,
   } = props;
   const rowInfo = useRowInfo(record, rowKey, index, indent);
+
   const {
     prefixCls,
     flattenColumns,
@@ -153,6 +174,7 @@
           colIndex,
           indent,
           index,
+          rowKeys,
         );
 
         return (

src/Body/index.tsx

@@ -42,8 +42,14 @@ function Body<RecordType>(props: BodyProps<RecordType>) {
     'emptyNode',
   ]);
 
-  const flattenData: { record: RecordType; indent: number; index: number }[] =
-    useFlattenRecords<RecordType>(data, childrenColumnName, expandedKeys, getRowKey);
+  const flattenData = useFlattenRecords<RecordType>(
+    data,
+    childrenColumnName,
+    expandedKeys,
+    getRowKey,
+  );
+
+  const rowKeys = React.useMemo(() => flattenData.map(item => item.rowKey), [flattenData]);
 
   // =================== Performance ====================
   const perfRef = React.useRef<PerfRecord>({
@@ -59,14 +65,13 @@ function Body<RecordType>(props: BodyProps<RecordType>) {
   let rows: React.ReactNode;
   if (data.length) {
     rows = flattenData.map((item, idx) => {
-      const { record, indent, index: renderIndex } = item;
-
-      const key = getRowKey(record, idx);
+      const { record, indent, index: renderIndex, rowKey } = item;
 
       return (
         <BodyRow
-          key={key}
-          rowKey={key}
+          key={rowKey}
+          rowKey={rowKey}
+          rowKeys={rowKeys}
           record={record}
           index={idx}
           renderIndex={renderIndex}

src/VirtualTable/VirtualCell.tsx

@@ -62,6 +62,7 @@ function VirtualCell<RecordType = any>(props: VirtualCellProps<RecordType>) {
     colIndex,
     indent,
     index,
+    [],
   );
 
   const { style: cellStyle, colSpan = 1, rowSpan = 1 } = additionalCellProps;

src/hooks/useFlattenRecords.ts

@@ -15,6 +15,7 @@ function fillRecords<T>(
     record,
     indent,
     index,
+    rowKey: getRowKey(record, index),
   });
 
   const key = getRowKey(record);
@@ -41,6 +42,7 @@ export interface FlattenData<RecordType> {
   record: RecordType;
   indent: number;
   index: number;
+  rowKey: Key;
 }
 
 /**
@@ -80,6 +82,7 @@ export default function useFlattenRecords<T>(
         record: item,
         indent: 0,
         index,
+        rowKey: getRowKey(item, index),
       };
     });
   }, [data, childrenColumnName, expandedKeys, getRowKey]);