wangjia/jiu
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 130 Wiki Activity

feat(client): 录单表单优化 + 可搜索下拉支持新建 + 日期选择器组件

Browse Source 
新增 DatePickerField 日期选择器与 date_util；可搜索下拉 SearchableOptionField
支持内联新建选项；入库/出库录单表单、商品页、财务页、app_shell 导航相应调整。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-20 07:05:22 +08:00
parent e892ab45b2
commit a76724b385
12 changed files with 2868 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/lib/widgets/searchable_option_field.dart
+108 -11
View File
@@ -13,8 +13,9 @@ class OptionItem {
late final String _initials;
OptionItem({required this.id, required this.name, this.code}) {
_fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '').toLowerCase();
_initials = PinyinHelper.getShortPinyin(name).toLowerCase();
_fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '')
.toLowerCase();
_initials = PinyinHelper.getShortPinyin(name).toLowerCase();
}
bool matches(String kw) {
@@ -36,6 +37,10 @@ class SearchableOptionField extends StatelessWidget {
final bool isRequired;
final bool isDense;
/// 可选：搜索无匹配时「新增到基础数据」。回调收到当前关键字（用户可在确认框里改），
/// 创建成功返回新选项 id（自动选中），失败/取消返回 null。为空则不显示新增入口。
final Future<int?> Function(String keyword)? onCreate;
const SearchableOptionField({
super.key,
required this.options,
@@ -45,6 +50,7 @@ class SearchableOptionField extends StatelessWidget {
required this.onChanged,
this.isRequired = false,
this.isDense = true,
this.onCreate,
});
String get _displayText {
@@ -59,6 +65,7 @@ class SearchableOptionField extends StatelessWidget {
title: dialogTitle,
options: options,
selectedId: selectedId,
onCreate: onCreate,
),
);
// result == -1 means "clear selection"
@@ -86,9 +93,11 @@ class SearchableOptionField extends StatelessWidget {
suffixIcon: selected
? GestureDetector(
onTap: () => onChanged(null),
child: const Icon(Icons.close, size: 14, color: AppTheme.textSecondary),
child: const Icon(Icons.close,
size: 14, color: AppTheme.textSecondary),
)
: const Icon(Icons.arrow_drop_down, size: 16, color: AppTheme.textSecondary),
: const Icon(Icons.arrow_drop_down,
size: 16, color: AppTheme.textSecondary),
),
isEmpty: !selected,
child: Text(
@@ -110,7 +119,13 @@ class _SearchDialog extends StatefulWidget {
final String title;
final List<OptionItem> options;
final int? selectedId;
const _SearchDialog({required this.title, required this.options, this.selectedId});
final Future<int?> Function(String keyword)? onCreate;
const _SearchDialog({
required this.title,
required this.options,
this.selectedId,
this.onCreate,
});
@override
State<_SearchDialog> createState() => _SearchDialogState();
@@ -119,6 +134,7 @@ class _SearchDialog extends StatefulWidget {
class _SearchDialogState extends State<_SearchDialog> {
final _ctrl = TextEditingController();
String _keyword = '';
bool _creating = false;
@override
void dispose() {
@@ -126,11 +142,68 @@ class _SearchDialogState extends State<_SearchDialog> {
super.dispose();
}
/// 「新增到基础数据」流程：确认（名称可改）→ onCreate → 成功则带新 id 关闭搜索框。
Future<void> _createFlow() async {
final kw = _keyword.trim();
if (widget.onCreate == null || kw.isEmpty) return;
final nameCtrl = TextEditingController(text: kw);
final confirmed = await showAppDialog<bool>(
context: context,
builder: (_) => AlertDialog(
title: const Text('新增到基础数据', style: TextStyle(fontSize: 16)),
content: SizedBox(
width: context.dialogWidth(320),
child: TextField(
controller: nameCtrl,
autofocus: true,
decoration: const InputDecoration(labelText: '名称', isDense: true),
),
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: const Text('取消'),
),
TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: const Text('确认新增'),
),
],
),
);
if (confirmed != true) return;
final name = nameCtrl.text.trim();
if (name.isEmpty) return;
setState(() => _creating = true);
try {
final newId = await widget.onCreate!(name);
if (!mounted) return;
if (newId != null) {
Navigator.of(context).pop(newId); // 回填并自动选中
} else {
setState(() => _creating = false);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('新增失败，请重试')),
);
}
} catch (e) {
if (!mounted) return;
setState(() => _creating = false);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('新增失败：$e')),
);
}
}
@override
Widget build(BuildContext context) {
final filtered = _keyword.isEmpty
? widget.options
: widget.options.where((o) => o.matches(_keyword)).toList();
final kw = _keyword.trim();
final hasExact =
widget.options.any((o) => o.name.toLowerCase() == kw.toLowerCase());
final canCreate = widget.onCreate != null && kw.isNotEmpty && !hasExact;
return AlertDialog(
title: Text(widget.title, style: const TextStyle(fontSize: 16)),
@@ -153,8 +226,12 @@ class _SearchDialogState extends State<_SearchDialog> {
const SizedBox(height: 8),
Expanded(
child: filtered.isEmpty
? const Center(
child: Text('无匹配结果', style: TextStyle(color: AppTheme.textSecondary)))
? Center(
child: Text(
canCreate ? '无匹配结果，可新增到基础数据' : '无匹配结果',
style: const TextStyle(color: AppTheme.textSecondary),
),
)
: ListView.builder(
itemCount: filtered.length,
itemBuilder: (_, i) {
@@ -162,17 +239,36 @@ class _SearchDialogState extends State<_SearchDialog> {
final isSelected = opt.id == widget.selectedId;
return ListTile(
dense: true,
title: Text(opt.name, style: const TextStyle(fontSize: 13)),
title: Text(opt.name,
style: const TextStyle(fontSize: 13)),
subtitle: opt.code != null && opt.code!.isNotEmpty
? Text(opt.code!, style: const TextStyle(fontSize: 11))
? Text(opt.code!,
style: const TextStyle(fontSize: 11))
: null,
selected: isSelected,
selectedTileColor: AppTheme.primary.withValues(alpha: 0.08),
selectedTileColor:
AppTheme.primary.withValues(alpha: 0.08),
onTap: () => Navigator.of(context).pop(opt.id),
);
},
),
),
if (canCreate)
Align(
alignment: Alignment.centerLeft,
child: TextButton.icon(
onPressed: _creating ? null : _createFlow,
icon: _creating
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.add, size: 16),
label: Text('新增「$kw」到基础数据',
style: const TextStyle(fontSize: 12)),
),
),
],
),
),
@@ -180,7 +276,8 @@ class _SearchDialogState extends State<_SearchDialog> {
if (widget.selectedId != null)
TextButton(
onPressed: () => Navigator.of(context).pop(-1),
child: const Text('清除选择', style: TextStyle(color: AppTheme.textSecondary)),
child: const Text('清除选择',
style: TextStyle(color: AppTheme.textSecondary)),
),
TextButton(
onPressed: () => Navigator.of(context).pop(null),