feat(ui): full‑width ShadTable across app; fix rent dialog width; correct equipment pagination
- ShadTable: ensure full-width via LayoutBuilder+ConstrainedBox minWidth - BaseListScreen: default data area padding = 0 for table edge-to-edge - Vendor/Model/User/Company/Inventory/Zipcode: set columnSpanExtent per column and add final filler column to absorb remaining width; pin date/status/actions widths; ensure date text is single-line - Equipment: unify card/border style; define fixed column widths + filler; increase checkbox column to 56px to avoid overflow - Rent list: migrate to ShadTable.list with fixed widths + filler column - Rent form dialog: prevent infinite width by bounding ShadProgress with SizedBox and remove Expanded from option rows; add safe selectedOptionBuilder - Admin list: fix const with non-const argument in table column extents - Services/Controller: remove hardcoded perPage=10; use BaseListController perPage; trust server meta (total/totalPages) in equipment pagination - widgets/shad_table: ConstrainedBox(minWidth=viewport) so table stretches Run: flutter analyze → 0 errors (warnings remain).
This commit is contained in:
JiWoong Sul
307
lib/screens/vendor/components/vendor_table.dart
vendored
307
lib/screens/vendor/components/vendor_table.dart
vendored
@@ -31,109 +31,216 @@ class VendorTable extends StatelessWidget {
|
||||
children: [
|
||||
Expanded(
|
||||
child: ShadCard(
|
||||
child: SingleChildScrollView(
|
||||
child: DataTable(
|
||||
horizontalMargin: 16,
|
||||
columnSpacing: 24,
|
||||
columns: const [
|
||||
DataColumn(label: Text('No')),
|
||||
DataColumn(label: Text('벤더명')),
|
||||
DataColumn(label: Text('등록일')),
|
||||
DataColumn(label: Text('상태')),
|
||||
DataColumn(label: Text('작업')),
|
||||
],
|
||||
rows: vendors.asMap().entries.map((entry) {
|
||||
final index = entry.key;
|
||||
final vendor = entry.value;
|
||||
final rowNumber = (currentPage - 1) * AppConstants.vendorPageSize + index + 1;
|
||||
|
||||
return DataRow(
|
||||
cells: [
|
||||
DataCell(
|
||||
Text(
|
||||
rowNumber.toString(),
|
||||
style: const TextStyle(
|
||||
fontWeight: FontWeight.w400,
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
DataCell(
|
||||
Text(
|
||||
vendor.name,
|
||||
style: const TextStyle(fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
DataCell(
|
||||
Text(
|
||||
vendor.createdAt != null
|
||||
? vendor.createdAt!.toLocal().toString().split(' ')[0]
|
||||
: '-',
|
||||
),
|
||||
),
|
||||
DataCell(
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: vendor.isActive
|
||||
? Colors.green.withValues(alpha: 0.1)
|
||||
: Colors.grey.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Text(
|
||||
vendor.isActive ? '활성' : '비활성',
|
||||
style: TextStyle(
|
||||
color: vendor.isActive
|
||||
? Colors.green.shade700
|
||||
: Colors.grey.shade700,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
// 최소폭 추정: No(64) + 벤더명(240) + 등록일(140) + 상태(120) + 작업(200) + 여백(24)
|
||||
const double actionsW = 256.0; // 아이콘 2개 + 내부 패딩 여유(단일 행 유지)
|
||||
const double minW = 64 + 240 + 140 + 120 + actionsW + 24;
|
||||
final double extra = constraints.maxWidth - minW;
|
||||
final double tableW = extra >= 0 ? constraints.maxWidth : minW;
|
||||
const double nameBase = 240.0;
|
||||
final double nameW = nameBase; // 넓은 화면에서도 벤더명은 고정 폭, 남는 폭은 빈 컬럼이 흡수
|
||||
|
||||
// 스크롤이 필요 없으면 전체 폭 사용
|
||||
if (constraints.maxWidth >= minW) {
|
||||
return SizedBox(
|
||||
width: constraints.maxWidth,
|
||||
child: ShadTable.list(
|
||||
columnSpanExtent: (index) {
|
||||
switch (index) {
|
||||
case 0:
|
||||
return const FixedTableSpanExtent(64);
|
||||
case 1:
|
||||
return const FixedTableSpanExtent(nameBase);
|
||||
case 2:
|
||||
return const FixedTableSpanExtent(120);
|
||||
case 3:
|
||||
return const FixedTableSpanExtent(100);
|
||||
case 4:
|
||||
return const FixedTableSpanExtent(actionsW);
|
||||
case 5:
|
||||
return const RemainingTableSpanExtent();
|
||||
default:
|
||||
return const FixedTableSpanExtent(100);
|
||||
}
|
||||
},
|
||||
header: [
|
||||
const ShadTableCell.header(child: Text('No')),
|
||||
ShadTableCell.header(child: SizedBox(width: nameW, child: const Text('벤더명'))),
|
||||
const ShadTableCell.header(child: Text('등록일')),
|
||||
const ShadTableCell.header(child: Text('상태')),
|
||||
ShadTableCell.header(child: SizedBox(width: actionsW, child: const Text('작업'))),
|
||||
const ShadTableCell.header(child: SizedBox.shrink()),
|
||||
],
|
||||
children: vendors.asMap().entries.map((entry) {
|
||||
final index = entry.key;
|
||||
final vendor = entry.value;
|
||||
final rowNumber = (currentPage - 1) * AppConstants.vendorPageSize + index + 1;
|
||||
return [
|
||||
ShadTableCell(child: Text(rowNumber.toString(), style: const TextStyle(color: Colors.grey))),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: nameW,
|
||||
child: Text(vendor.name, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.w500)),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
DataCell(
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (vendor.id != null) ...[
|
||||
if (vendor.isActive) ...[
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onEdit(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(Icons.edit, size: 16),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: 120,
|
||||
child: Text(
|
||||
vendor.createdAt != null ? vendor.createdAt!.toLocal().toString().split(' ')[0] : '-',
|
||||
maxLines: 1,
|
||||
softWrap: false,
|
||||
overflow: TextOverflow.clip,
|
||||
),
|
||||
),
|
||||
),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: 100,
|
||||
child: ShadBadge(
|
||||
backgroundColor: vendor.isActive ? const Color(0xFF22C55E).withValues(alpha: 0.1) : Colors.grey.withValues(alpha: 0.1),
|
||||
foregroundColor: vendor.isActive ? const Color(0xFF16A34A) : Colors.grey.shade700,
|
||||
child: Text(vendor.isActive ? '활성' : '비활성'),
|
||||
),
|
||||
),
|
||||
),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: actionsW,
|
||||
child: FittedBox(
|
||||
alignment: Alignment.centerLeft,
|
||||
fit: BoxFit.scaleDown,
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (vendor.id != null) ...[
|
||||
if (vendor.isActive) ...[
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onEdit(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(Icons.edit, size: 16),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onDelete(vendor.id!, vendor.name),
|
||||
size: ShadButtonSize.sm,
|
||||
child: Icon(Icons.delete, size: 16, color: theme.colorScheme.destructive),
|
||||
),
|
||||
] else
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onRestore(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(Icons.restore, size: 16, color: Color(0xFF10B981)),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onDelete(vendor.id!, vendor.name),
|
||||
size: ShadButtonSize.sm,
|
||||
child: Icon(
|
||||
Icons.delete,
|
||||
size: 16,
|
||||
color: theme.colorScheme.destructive,
|
||||
),
|
||||
),
|
||||
] else
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onRestore(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(
|
||||
Icons.restore,
|
||||
size: 16,
|
||||
color: Color(0xFF10B981),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
const ShadTableCell(child: SizedBox.shrink()),
|
||||
];
|
||||
}).toList(),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
}
|
||||
// 스크롤 필요한 경우만 수평 스크롤 허용
|
||||
return SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
child: SizedBox(
|
||||
width: tableW,
|
||||
child: ShadTable.list(
|
||||
columnSpanExtent: (index) {
|
||||
switch (index) {
|
||||
case 0:
|
||||
return const FixedTableSpanExtent(64);
|
||||
case 1:
|
||||
return const FixedTableSpanExtent(nameBase);
|
||||
case 2:
|
||||
return const FixedTableSpanExtent(120);
|
||||
case 3:
|
||||
return const FixedTableSpanExtent(100);
|
||||
case 4:
|
||||
return const FixedTableSpanExtent(actionsW);
|
||||
default:
|
||||
return const FixedTableSpanExtent(100);
|
||||
}
|
||||
},
|
||||
header: [
|
||||
const ShadTableCell.header(child: Text('No')),
|
||||
ShadTableCell.header(child: SizedBox(width: nameW, child: const Text('벤더명'))),
|
||||
ShadTableCell.header(child: SizedBox(width: 120, child: const Text('등록일'))),
|
||||
ShadTableCell.header(child: SizedBox(width: 100, child: const Text('상태'))),
|
||||
ShadTableCell.header(child: SizedBox(width: actionsW, child: const Text('작업'))),
|
||||
],
|
||||
children: vendors.asMap().entries.map((entry) {
|
||||
final index = entry.key;
|
||||
final vendor = entry.value;
|
||||
final rowNumber = (currentPage - 1) * AppConstants.vendorPageSize + index + 1;
|
||||
return [
|
||||
ShadTableCell(child: Text(rowNumber.toString(), style: const TextStyle(color: Colors.grey))),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: nameW,
|
||||
child: Text(vendor.name, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.w500)),
|
||||
),
|
||||
),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: 120,
|
||||
child: Text(
|
||||
vendor.createdAt != null ? vendor.createdAt!.toLocal().toString().split(' ')[0] : '-',
|
||||
maxLines: 1,
|
||||
softWrap: false,
|
||||
overflow: TextOverflow.clip,
|
||||
),
|
||||
),
|
||||
),
|
||||
ShadTableCell(
|
||||
child: ShadBadge(
|
||||
backgroundColor: vendor.isActive ? const Color(0xFF22C55E).withValues(alpha: 0.1) : Colors.grey.withValues(alpha: 0.1),
|
||||
foregroundColor: vendor.isActive ? const Color(0xFF16A34A) : Colors.grey.shade700,
|
||||
child: Text(vendor.isActive ? '활성' : '비활성'),
|
||||
),
|
||||
),
|
||||
ShadTableCell(
|
||||
child: SizedBox(
|
||||
width: actionsW,
|
||||
child: Wrap(
|
||||
alignment: WrapAlignment.start,
|
||||
spacing: 4,
|
||||
runSpacing: 4,
|
||||
children: [
|
||||
if (vendor.id != null) ...[
|
||||
if (vendor.isActive) ...[
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onEdit(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(Icons.edit, size: 16),
|
||||
),
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onDelete(vendor.id!, vendor.name),
|
||||
size: ShadButtonSize.sm,
|
||||
child: Icon(Icons.delete, size: 16, color: theme.colorScheme.destructive),
|
||||
),
|
||||
] else
|
||||
ShadButton.ghost(
|
||||
onPressed: () => onRestore(vendor.id!),
|
||||
size: ShadButtonSize.sm,
|
||||
child: const Icon(Icons.restore, size: 16, color: Color(0xFF10B981)),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
];
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -212,4 +319,4 @@ class VendorTable extends StatelessWidget {
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user