Skip to content

Commit 609521f

Browse files
committed
解决冲突
1 parent f169369 commit 609521f

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

tdesign-component/lib/src/components/cell/td_cell.dart

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ class _TDCellState extends State<TDCell> {
146146
: style.clickBackgroundColor;
147147
final border = (widget.showBottomBorder ?? false)
148148
? Border(
149-
bottom: BorderSide(
150-
width: 0.5,
151-
color: style.borderedColor ?? theme.componentStrokeColor,
152-
),
153-
)
149+
bottom: BorderSide(
150+
width: 0.5,
151+
color: style.borderedColor ?? theme.componentStrokeColor,
152+
),
153+
)
154154
: null;
155155

156156
return GestureDetector(
@@ -175,24 +175,23 @@ class _TDCellState extends State<TDCell> {
175175
crossAxisAlignment: crossAxisAlignment,
176176
children: [
177177
..._buildImage(),
178-
Row(
179-
mainAxisSize: MainAxisSize.min,
180-
crossAxisAlignment: crossAxisAlignment,
181-
children: [
182-
if (widget.leftIcon != null ||
183-
widget.leftIconWidget != null) ...[
184-
widget.leftIconWidget ??
185-
Icon(widget.leftIcon,
186-
size: 24, color: style.leftIconColor),
187-
SizedBox(width: theme.spacer12),
188-
],
189-
Column(
190-
crossAxisAlignment: CrossAxisAlignment.start,
191-
// spacing: theme.spacer4,
192-
children: [
193-
IntrinsicWidth(
194-
child: Container(
195-
child: Row(
178+
Expanded(
179+
child: Row(
180+
crossAxisAlignment: crossAxisAlignment,
181+
children: [
182+
if (widget.leftIcon != null ||
183+
widget.leftIconWidget != null) ...[
184+
widget.leftIconWidget ??
185+
Icon(widget.leftIcon,
186+
size: 24, color: style.leftIconColor),
187+
SizedBox(width: theme.spacer12),
188+
],
189+
Expanded(
190+
child: Column(
191+
crossAxisAlignment: CrossAxisAlignment.start,
192+
// spacing: theme.spacer4,
193+
children: [
194+
Row(
196195
children: [
197196
if (widget.titleWidget != null)
198197
Flexible(child: widget.titleWidget!)

0 commit comments

Comments
 (0)