File tree Expand file tree Collapse file tree 4 files changed +2
-133
lines changed Expand file tree Collapse file tree 4 files changed +2
-133
lines changed Original file line number Diff line number Diff line change @@ -147,8 +147,8 @@ function Cell<RecordType extends DefaultRecordType>(
147
147
const componentProps = {
148
148
title,
149
149
...additionalProps ,
150
- colSpan : mergedColSpan ,
151
- rowSpan : mergedRowSpan ,
150
+ colSpan : mergedColSpan && mergedColSpan !== 1 ? mergedColSpan : null ,
151
+ rowSpan : mergedRowSpan && mergedRowSpan !== 1 ? mergedRowSpan : null ,
152
152
className : classNames (
153
153
cellPrefixCls ,
154
154
className ,
Original file line number Diff line number Diff line change @@ -23,29 +23,21 @@ exports[`Table.Expand renders fixed column correctly 1`] = `
23
23
<tr >
24
24
<th
25
25
class = " rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left"
26
- colspan = " 1"
27
- rowspan = " 1"
28
26
style = " position: sticky; left: 0px;"
29
27
/>
30
28
<th
31
29
class = " rc-table-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
32
- colspan = " 1"
33
- rowspan = " 1"
34
30
style = " position: sticky; left: 0px;"
35
31
>
36
32
Name
37
33
</th >
38
34
<th
39
35
class = " rc-table-cell"
40
- colspan = " 1"
41
- rowspan = " 1"
42
36
>
43
37
Age
44
38
</th >
45
39
<th
46
40
class = " rc-table-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
47
- colspan = " 1"
48
- rowspan = " 1"
49
41
style = " position: sticky; right: 0px;"
50
42
>
51
43
Gender
@@ -169,15 +161,11 @@ exports[`Table.Expand renders tree row correctly 1`] = `
169
161
<tr >
170
162
<th
171
163
class = " rc-table-cell"
172
- colspan = " 1"
173
- rowspan = " 1"
174
164
>
175
165
Name
176
166
</th >
177
167
<th
178
168
class = " rc-table-cell"
179
- colspan = " 1"
180
- rowspan = " 1"
181
169
>
182
170
Age
183
171
</th >
You can’t perform that action at this time.
0 commit comments