Skip to content

Commit a32b740

Browse files
committed
fix: 修复Table组件字段折行的问题
1 parent dbe3d58 commit a32b740

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.changeset/cyan-maps-cross.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@td-design/lego': patch
3+
---
4+
5+
fix: 修复Table组件字段折行的问题

packages/lego/src/cylinder-bar/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default forwardRef<ReactEcharts, CylinderBarProps>(
5454
(
5555
{
5656
xAxisData,
57-
seriesData,
57+
seriesData = [{ unit: '' }, { unit: '' }],
5858
style,
5959
/** 控制是否自动轮播 */
6060
autoLoop,
@@ -119,7 +119,7 @@ export default forwardRef<ReactEcharts, CylinderBarProps>(
119119
...baseChartConfig.xAxis,
120120
},
121121
yAxis,
122-
series: createCylinderBarSeries(data, colors, yAxisCount),
122+
series: createCylinderBarSeries(data as BarSeriesData[], colors, yAxisCount),
123123
},
124124
config
125125
);

packages/lego/src/table/index.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737

3838
.text {
3939
text-align: center;
40+
overflow: hidden;
41+
text-overflow: ellipsis;
42+
white-space: nowrap;
4043
}
4144
}
4245
}

packages/lego/src/table/index.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export type Column<T = any> = {
1919
flex?: number;
2020
/** 文字对齐方式 */
2121
textAlign?: TextAlign;
22-
render?: (data: T) => ReactElement;
22+
render?: (data: T, index: number) => ReactElement;
2323
};
2424

2525
export type CustomTableProps<T> = {
@@ -91,7 +91,7 @@ function Table<T extends Record<string, any>>({
9191
style={{
9292
...theme.typography[inModal ? 'p0' : 'p2'],
9393
lineHeight: inModal ? '25px' : '19px',
94-
textAlign: item.textAlign,
94+
textAlign: 'center',
9595
...cellStyle({
9696
width: item.width || `${100 / columns?.length}%`,
9797
flex: item.flex,
@@ -134,7 +134,7 @@ function Table<T extends Record<string, any>>({
134134
lineHeight: inModal ? '25px' : '19px',
135135
}}
136136
>
137-
{columns.map(term => {
137+
{columns.map((term, idx) => {
138138
return (
139139
<div
140140
key={term.id}
@@ -144,11 +144,10 @@ function Table<T extends Record<string, any>>({
144144
width: term.width || `${100 / columns?.length}%`,
145145
flex: term.flex,
146146
}),
147-
alignItems: 'center',
148-
textAlign: term.textAlign,
147+
textAlign: term.textAlign || 'center',
149148
}}
150149
>
151-
{term.render ? term.render(item) : item?.[term.dataIndex]}
150+
{term.render ? term.render(item, index) : item?.[term.dataIndex]}
152151
</div>
153152
);
154153
})}

0 commit comments

Comments
 (0)