From ea6d1e12aafd0dda1f36b3228c7f31569372bdba Mon Sep 17 00:00:00 2001
From: lqzh <9134671+lqzhgood@users.noreply.github.com>
Date: Mon, 22 Jan 2024 22:32:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9E=20fix(expandedRowClassName):?=
 =?UTF-8?q?=20#400?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/demo/expandedRowClassName.md             |  8 +++
 .../examples/expandedRowClassName.module.less |  4 ++
 docs/examples/expandedRowClassName.tsx        | 62 +++++++++++++++++++
 src/Body/BodyRow.tsx                          |  9 ++-
 4 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 docs/demo/expandedRowClassName.md
 create mode 100644 docs/examples/expandedRowClassName.module.less
 create mode 100644 docs/examples/expandedRowClassName.tsx

diff --git a/docs/demo/expandedRowClassName.md b/docs/demo/expandedRowClassName.md
new file mode 100644
index 000000000..c3f7833e0
--- /dev/null
+++ b/docs/demo/expandedRowClassName.md
@@ -0,0 +1,8 @@
+---
+title: expandedRowClassName
+nav:
+  title: Demo
+  path: /demo
+---
+
+<code src="../examples/expandedRowClassName.tsx"></code>
diff --git a/docs/examples/expandedRowClassName.module.less b/docs/examples/expandedRowClassName.module.less
new file mode 100644
index 000000000..1f2c8a205
--- /dev/null
+++ b/docs/examples/expandedRowClassName.module.less
@@ -0,0 +1,4 @@
+.tesExpandedRowClassName td {
+  background-color: red !important;
+  color: #fff;
+}
diff --git a/docs/examples/expandedRowClassName.tsx b/docs/examples/expandedRowClassName.tsx
new file mode 100644
index 000000000..0771414fc
--- /dev/null
+++ b/docs/examples/expandedRowClassName.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import Table from 'rc-table';
+
+import styles from './expandedRowClassName.module.less';
+
+const columns = [
+  {
+    title: 'Name',
+    dataIndex: 'name',
+    key: 'name',
+  },
+  {
+    title: 'Age',
+    dataIndex: 'age',
+    key: 'age',
+  },
+  {
+    title: 'Address',
+    dataIndex: 'address',
+    key: 'address',
+  },
+];
+
+const data = [
+  {
+    name: 'John',
+    age: '25',
+    address: '1 A Street',
+    children: [
+      { name: 'C-John', age: '31', address: '1 A Stree2t' },
+      {
+        name: 'C-Fred',
+        age: '532',
+        address: '2 B Str1eet',
+        children: [
+          { name: 'D-John', age: '31', address: '1 A Stree2t' },
+          { name: 'D-Fred', age: '532', address: '2 B Str1eet' },
+          { name: 'D-Anne', age: '43217', address: '3 C S3treet' },
+        ],
+      },
+      { name: 'C-Anne', age: '43217', address: '3 C S3treet' },
+    ],
+  },
+  { name: 'Fred', age: '38', address: '2 B Street' },
+  { name: 'Anne', age: '47', address: '3 C Street' },
+];
+
+const Demo = () => (
+  <div>
+    <h2>Table expandedRowClassName</h2>
+    <Table
+      rowKey={'name'}
+      columns={columns}
+      data={data}
+      expandable={{
+        expandedRowClassName: () => styles.tesExpandedRowClassName,
+      }}
+    />
+  </div>
+);
+
+export default Demo;
diff --git a/src/Body/BodyRow.tsx b/src/Body/BodyRow.tsx
index 1b6be8393..7d9290bbc 100644
--- a/src/Body/BodyRow.tsx
+++ b/src/Body/BodyRow.tsx
@@ -124,6 +124,11 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
     devRenderTimes(props);
   }
 
+  // 若没有 expandedRowRender 参数, 将使用 baseRowNode 渲染 Children
+  // 此时如果 level > 1 则说明是 expandedRow, 一样需要附加 computedExpandedRowClassName
+  const computedExpandedRowClassName =
+    expandedRowClassName && expandedRowClassName(record, index, indent);
+
   // ======================== Base tr row ========================
   const baseRowNode = (
     <RowComponent
@@ -134,6 +139,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
         `${prefixCls}-row`,
         `${prefixCls}-row-level-${indent}`,
         rowProps?.className,
+        indent >= 1 ? computedExpandedRowClassName : '',
       )}
       style={{
         ...style,
@@ -179,8 +185,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
   let expandRowNode: React.ReactElement;
   if (rowSupportExpand && (expandedRef.current || expanded)) {
     const expandContent = expandedRowRender(record, index, indent + 1, expanded);
-    const computedExpandedRowClassName =
-      expandedRowClassName && expandedRowClassName(record, index, indent);
+
     expandRowNode = (
       <ExpandedRow
         expanded={expanded}

From a513cd9ab4297ba83a9d023f4d9313a9cf1417f8 Mon Sep 17 00:00:00 2001
From: lqzh <9134671+lqzhgood@users.noreply.github.com>
Date: Mon, 22 Jan 2024 23:39:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A7=AA=20test(expandedRowClassName):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/ExpandRow.spec.jsx | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/ExpandRow.spec.jsx b/tests/ExpandRow.spec.jsx
index 3938ea1f5..d06746cd3 100644
--- a/tests/ExpandRow.spec.jsx
+++ b/tests/ExpandRow.spec.jsx
@@ -415,6 +415,24 @@ describe('Table.Expand', () => {
     expect(wrapper.find('tbody tr').at(1).hasClass('expand-row-test-class-name')).toBeTruthy();
   });
 
+  it('renders expend row class correctly using children without expandedRowRender', () => {
+    const expandedRowClassName = vi.fn().mockReturnValue('expand-row-test-class-name');
+
+    const _data = [{ ...sampleData[0], children: [sampleData[1]] }];
+
+    const wrapper = mount(
+      createTable({
+        data: _data,
+        expandable: {
+          expandedRowKeys: [0],
+          expandedRowClassName,
+        },
+      }),
+    );
+
+    expect(wrapper.find('tbody tr').at(1).hasClass('expand-row-test-class-name')).toBeTruthy();
+  });
+
   it('renders expend column title', () => {
     const wrapper = mount(
       createTable({