diff --git a/.superpowers/prototype/atoms.css b/.superpowers/prototype/atoms.css index e42dc27..9e7fde6 100644 --- a/.superpowers/prototype/atoms.css +++ b/.superpowers/prototype/atoms.css @@ -13,6 +13,9 @@ svg{fill:none; stroke:currentColor;} .btn.primary{background:var(--primary); color:var(--on-primary);} .btn.primary:hover{background:var(--primary-dark);} .btn.danger{background:var(--danger); color:#fff;} +/* 浅蓝软变体：突出但不抢主操作（详细搜索等次强调入口）；经典蓝主题 = 浅蓝底蓝字，其余主题自适应 */ +.btn.soft{background:var(--brand50); border-color:var(--brand400); color:var(--primary);} +.btn.soft:hover{border-color:var(--primary); background:var(--info-soft);} .btn.sm{height:32px; padding:0 12px; font-size:var(--fs-sm);} .btn.lg{height:44px; padding:0 22px; font-size:14px;} diff --git a/.superpowers/prototype/index.html b/.superpowers/prototype/index.html index 77fbdcc..b8cea0c 100644 --- a/.superpowers/prototype/index.html +++ b/.superpowers/prototype/index.html @@ -313,8 +313,9 @@

公用组件 Components

来自 atoms.css 的原子，桌面与移动共用（按钮 / 输入 / 徽章 / 分段 / 菜单 / 弹窗等）。随主题换色。移动专属原子见下一节。

-

按钮

.btn .primary/.ghost/.danger/.sm
+

按钮

.btn .primary/.soft/.ghost/.danger/.sm
新增入库
+
详细搜索
导出
列设置
删除

输入 / 搜索

.input .searchbox .ctrl
diff --git a/.superpowers/prototype/screens/shell.js b/.superpowers/prototype/screens/shell.js index a4c49a0..afc97f1 100644 --- a/.superpowers/prototype/screens/shell.js +++ b/.superpowers/prototype/screens/shell.js @@ -53,6 +53,54 @@ menuEl.style.top = (below + h > window.innerHeight && above > 6 ? above : below) + 'px'; } + // 可搜索菜单：视觉承袭 .combo-pop（顶部 .cp-search 显式搜索框 + 边打边过滤 + 结果统计）， + // 供列表工具栏「供应商 / 客户」等长名录筛选复用（复用 atoms.css .combo-pop 族，零新增样式）。 + // items: [{ v, label, sel, small? }]；opts: { placeholder, minW, cls }。 + function openSearchMenu(t, items, onPick, opts) { + closeMenus(); + opts = opts || {}; + const esc = s => String(s).replace(/[&<>"]/g, c => ({ '&': '&', '<': '<', '>': '>', '"': '"' }[c])); + const highlight = (name, kw) => { + const q = kw.trim(); if (!q) return esc(name); + const i = String(name).toLowerCase().indexOf(q.toLowerCase()); + if (i < 0) return esc(name); + return esc(name.slice(0, i)) + '' + esc(name.slice(i, i + q.length)) + '' + esc(name.slice(i + q.length)); + }; + const r = t.getBoundingClientRect(); + const w = Math.max(r.width, opts.minW || 220); + menuEl = document.createElement('div'); + menuEl.className = 'combo-pop' + (opts.cls ? ' ' + opts.cls : ''); + menuEl.style.left = Math.max(8, Math.min(r.left, window.innerWidth - w - 8)) + 'px'; + menuEl.style.width = w + 'px'; + menuEl.innerHTML = + '
' + + `
` + + '
'; + const listEl = menuEl.querySelector('.cp-list'); + const footEl = menuEl.querySelector('.cp-foot'); + function draw(kw) { + const q = kw.trim().toLowerCase(); + const hits = items.filter(it => !q || String(it.label).toLowerCase().includes(q)); + listEl.innerHTML = hits.length + ? hits.map(it => { + const small = it.small ? `${esc(it.small)}` : ''; + const ck = it.sel ? '' : ''; + return `
${highlight(it.label, kw)}${small}${ck}
`; + }).join('') + : '
无匹配结果
'; + footEl.innerHTML = q ? `匹配 ${hits.length} 条 · 共 ${items.length} 条` : `共 ${items.length} 条`; + listEl.querySelectorAll('.cp-item').forEach(el => el.onclick = e => { e.stopPropagation(); onPick(el.dataset.v); }); + } + draw(''); + document.body.appendChild(menuEl); + const h = menuEl.offsetHeight; + const below = r.bottom + 6, above = r.top - h - 6; + menuEl.style.top = (below + h > window.innerHeight && above > 6 ? above : below) + 'px'; + const input = menuEl.querySelector('.cps-input'); + input.oninput = () => draw(input.value); + setTimeout(() => input.focus(), 0); + } + // ---- toast（若页面无 #toast 自动注入） ---- let toastT; function toast(m) { @@ -101,6 +149,7 @@ // 暴露给页面脚本复用 window.openMenu = openMenu; + window.openSearchMenu = openSearchMenu; window.closeMenus = closeMenus; window.toast = window.toast || toast; window.setTheme = setTheme; diff --git a/.superpowers/prototype/screens/stock-in-list.html b/.superpowers/prototype/screens/stock-in-list.html index da8f9de..3ece4bf 100644 --- a/.superpowers/prototype/screens/stock-in-list.html +++ b/.superpowers/prototype/screens/stock-in-list.html @@ -28,8 +28,11 @@ /* ---- 状态徽章（新增变体，待提升至 atoms.css） ---- */ .badge.b-草稿{background:var(--info-soft); color:var(--muted);} .badge.b-待审核{background:var(--warn-bg); color:var(--warn);} - .badge.b-已通过{background:var(--success-bg); color:var(--success);} - .badge.b-已驳回{background:var(--danger-bg); color:var(--danger);} + .badge.b-已审核{background:var(--success-bg); color:var(--success);} + .badge.b-已拒绝{background:var(--danger-bg); color:var(--danger);} + /* 退单状态（叠加在已审核单上，对齐后端 return_state: partial/full） */ + .badge.b-部分退单{background:var(--warn-bg); color:var(--warn);} + .badge.b-已退单{background:var(--danger-bg); color:var(--danger);} /* 设计期返回悬浮球（右下角，非侵入） */ .ds-fab{position:fixed; right:22px; bottom:22px; width:44px; height:44px; border-radius:50%; background:var(--surface); color:var(--muted); border:1px solid var(--border); display:flex; align-items:center; justify-content:center; box-shadow:var(--sh-2); z-index:var(--z-fab); opacity:.6; transition:opacity .18s,color .18s,border-color .18s,transform .18s,box-shadow .18s; text-decoration:none;} .ds-fab:hover{opacity:1; color:var(--primary); border-color:var(--primary); box-shadow:var(--sh-3); transform:translateY(-2px);} @@ -62,6 +65,7 @@
仓库
状态
入库时间
+
详细搜索
重置
@@ -74,6 +78,14 @@

入库单详情

+
+

退单

+
+
+
+
+
全部退单
未选择退单明细
取消
提交退单
+

确认进价

@@ -82,28 +94,58 @@
取消
确认并补差额
+ +
+

详细搜索

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
重置
取消
确认
+
diff --git a/client/.gitignore b/client/.gitignore index 4f4c726..8f535c7 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -35,6 +35,7 @@ migrate_working_dir/ # Golden test diff artifacts (transient, regenerated on failure) test/golden/failures/ +test/failures/ # Symbolication related app.*.symbols diff --git a/client/assets/fonts/JetBrainsMono-Bold.ttf b/client/assets/fonts/JetBrainsMono-Bold.ttf new file mode 100644 index 0000000..cd1bee0 Binary files /dev/null and b/client/assets/fonts/JetBrainsMono-Bold.ttf differ diff --git a/client/assets/fonts/JetBrainsMono-Regular.ttf b/client/assets/fonts/JetBrainsMono-Regular.ttf new file mode 100644 index 0000000..711830e Binary files /dev/null and b/client/assets/fonts/JetBrainsMono-Regular.ttf differ diff --git a/client/lib/core/api/api_client.dart b/client/lib/core/api/api_client.dart index 844ed46..9c8f35f 100644 --- a/client/lib/core/api/api_client.dart +++ b/client/lib/core/api/api_client.dart @@ -157,8 +157,10 @@ class ApiClient { return handler.next(e); } - if (e.response?.statusCode == 401 && (_refreshToken ?? '').isNotEmpty) { - debugPrint('[ApiClient] got 401 on ${e.requestOptions.path}, trying refresh...'); + if (e.response?.statusCode == 401 && + (_refreshToken ?? '').isNotEmpty) { + debugPrint( + '[ApiClient] got 401 on ${e.requestOptions.path}, trying refresh...'); final newToken = await _refreshAccessToken(); if (newToken == null) { return handler.next(e); @@ -172,7 +174,8 @@ class ApiClient { return handler.next(retryErr is DioException ? retryErr : e); } } else if (e.response?.statusCode == 401) { - debugPrint('[ApiClient] got 401 on ${e.requestOptions.path}, no refresh token'); + debugPrint( + '[ApiClient] got 401 on ${e.requestOptions.path}, no refresh token'); } return handler.next(e); }, diff --git a/client/lib/core/auth/auth_state.dart b/client/lib/core/auth/auth_state.dart index 927efc6..f829726 100644 --- a/client/lib/core/auth/auth_state.dart +++ b/client/lib/core/auth/auth_state.dart @@ -101,7 +101,8 @@ class AuthNotifier extends StateNotifier { } Future login(AuthUser user) async { - debugPrint('[Auth] login() called, username=${user.username} shopId=${user.shopId}'); + debugPrint( + '[Auth] login() called, username=${user.username} shopId=${user.shopId}'); final gen = ++_sessionGen; await _runStorage(() async { if (gen != _sessionGen) return; // 期间又发生 login/logout → 放弃这次写盘 diff --git a/client/lib/core/config/license_copy.dart b/client/lib/core/config/license_copy.dart index 1d6f90d..7aa958a 100644 --- a/client/lib/core/config/license_copy.dart +++ b/client/lib/core/config/license_copy.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../../models/license.dart'; @@ -113,11 +114,14 @@ class LicenseCopy { static Color bannerColor(String phase) { switch (phase) { case 'locked': - return const Color(0xFFD14343); + return const Color( + 0xFFD14343); // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） case 'readonly': - return const Color(0xFFB71C1C); // 深红，强调即将彻底锁定 + return const Color( + 0xFFB71C1C); // 深红，强调即将彻底锁定 // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） case 'grace': - return const Color(0xFFE65100); // 深橙 + return const Color( + 0xFFE65100); // 深橙 // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） default: return Colors.transparent; } @@ -127,12 +131,15 @@ class LicenseCopy { static Color phaseColor(String phase) { switch (phase) { case 'grace': - return const Color(0xFFE08E00); + return const Color( + 0xFFE08E00); // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） case 'readonly': case 'locked': - return const Color(0xFFD14343); + return const Color( + 0xFFD14343); // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） default: - return const Color(0xFF2E8B57); + return const Color( + 0xFF2E8B57); // ds-ignore: 授权紧迫度专用深色，主题无关（承白字，历史分叉已集中） } } @@ -140,12 +147,12 @@ class LicenseCopy { static IconData phaseIcon(String phase) { switch (phase) { case 'grace': - return Icons.warning_amber_rounded; + return LucideIcons.triangleAlert; case 'readonly': case 'locked': - return Icons.error_outline; + return LucideIcons.circleAlert; default: - return Icons.verified_user_outlined; + return LucideIcons.shieldCheck; } } diff --git a/client/lib/core/errors/error_reporter.dart b/client/lib/core/errors/error_reporter.dart index 8ee022f..b4450fa 100644 --- a/client/lib/core/errors/error_reporter.dart +++ b/client/lib/core/errors/error_reporter.dart @@ -109,7 +109,9 @@ class ErrorReporter { String? stack; if (stackTrace != null) { final raw = stackTrace.toString(); - stack = raw.length > _maxStackLength ? raw.substring(0, _maxStackLength) : raw; + stack = raw.length > _maxStackLength + ? raw.substring(0, _maxStackLength) + : raw; } await _client.post('/public/errors', data: { diff --git a/client/lib/core/platform/single_instance.dart b/client/lib/core/platform/single_instance.dart index 6c0af12..50dad93 100644 --- a/client/lib/core/platform/single_instance.dart +++ b/client/lib/core/platform/single_instance.dart @@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart'; // Keep the server socket alive for the lifetime of the process. // The OS releases the port automatically when the process exits. +// ignore: unused_element — 只写不读是刻意的：持有引用防 GC 关闭端口锁 ServerSocket? _server; // Port unique to this app; chosen from the private range 49152–65535. diff --git a/client/lib/core/router/app_router.dart b/client/lib/core/router/app_router.dart index cbba110..57501ea 100644 --- a/client/lib/core/router/app_router.dart +++ b/client/lib/core/router/app_router.dart @@ -17,6 +17,7 @@ import '../../screens/products/product_detail_screen.dart'; import '../../screens/public/public_product_screen.dart'; import '../../screens/public/public_shop_products_screen.dart'; import '../../screens/settings/settings_screen.dart'; +import '../../screens/settings/users_screen.dart'; import '../../screens/about/about_screen.dart'; import '../../screens/devices/device_management_screen.dart'; import '../auth/auth_state.dart'; @@ -163,7 +164,10 @@ final appRouterProvider = Provider((ref) { StatefulShellBranch(routes: [ GoRoute( path: '/products', - pageBuilder: (_, __) => _noTransition(const ProductsScreen())), + // ?tab=intro → 商品介绍 tab（对齐原型 products.html?tab=intro） + pageBuilder: (_, state) => _noTransition(ProductsScreen( + initialTab: + state.uri.queryParameters['tab'] == 'intro' ? 1 : 0))), GoRoute( path: '/products/:id', pageBuilder: (_, state) => _noTransition(ProductDetailScreen( @@ -176,7 +180,7 @@ final appRouterProvider = Provider((ref) { pageBuilder: (_, __) => _noTransition(const DeviceManagementScreen())), ]), - // 7 系统设置 + // 7 系统设置（面板：门店信息/用户管理/编号规则/授权兑换券/偏好设置） StatefulShellBranch(routes: [ GoRoute( path: '/settings', @@ -185,13 +189,16 @@ final appRouterProvider = Provider((ref) { 'shop': 0, 'users': 1, 'number': 2, - 'system': 3, - 'license': 4, - 'import': 5, + 'license': 3, + 'pref': 4, }; final tab = tabIndex[state.uri.queryParameters['tab']] ?? 0; return _noTransition(SettingsScreen(initialTab: tab)); }), + // 用户管理独立页（照原型 users.html） + GoRoute( + path: '/settings/users', + pageBuilder: (_, __) => _noTransition(const UsersScreen())), ]), // 8 关于我们 StatefulShellBranch(routes: [ diff --git a/client/lib/core/storage/login_history.dart b/client/lib/core/storage/login_history.dart index 34b069a..1ba2c81 100644 --- a/client/lib/core/storage/login_history.dart +++ b/client/lib/core/storage/login_history.dart @@ -7,6 +7,18 @@ class LoginHistoryStorage { static const int _maxItems = 5; static const String _hotelKey = 'login_history_hotels'; static const String _usernameKey = 'login_history_usernames'; + static const String _rememberKey = 'login_remember'; + + /// 「记住我」偏好（登录页复选框，默认开）。关闭时登录成功不记录账号历史。 + static Future getRemember() async { + final prefs = await SharedPreferences.getInstance(); + return prefs.getBool(_rememberKey) ?? true; + } + + static Future setRemember(bool value) async { + final prefs = await SharedPreferences.getInstance(); + await prefs.setBool(_rememberKey, value); + } static Future> getHotelCodes() async { final prefs = await SharedPreferences.getInstance(); diff --git a/client/lib/core/theme/app_fonts.dart b/client/lib/core/theme/app_fonts.dart new file mode 100644 index 0000000..f6553c1 --- /dev/null +++ b/client/lib/core/theme/app_fonts.dart @@ -0,0 +1,19 @@ +/// 字体真相源。 +/// +/// 等宽字体镜像原型 tokens.css `--font-mono` 首选 **JetBrains Mono**， +/// 以资产打包（pubspec `JetBrainsMono` 400/700）——原型截图、golden 测试、 +/// 三端真机渲染完全同源。历史教训：曾写 CSS 泛型名 `'monospace'`，Flutter +/// **不解析**并静默回退（真机无衬线、golden 里 tofu 方块），勿走回头路。 +/// CJK 字形不在 JetBrains Mono 内，回退链兜底系统等宽/默认字体。 +class AppFonts { + const AppFonts._(); + + static const String mono = 'JetBrainsMono'; + static const List monoFallback = [ + 'Menlo', + 'SF Mono', + 'Consolas', + 'Roboto Mono', + 'monospace', + ]; +} diff --git a/client/lib/core/theme/app_tokens.dart b/client/lib/core/theme/app_tokens.dart index c758bb7..d1e13f7 100644 --- a/client/lib/core/theme/app_tokens.dart +++ b/client/lib/core/theme/app_tokens.dart @@ -2,61 +2,193 @@ import 'package:flutter/material.dart'; @immutable class AppTokens extends ThemeExtension { - final Color page, bg, surface, border, borderSubtle, text, heading, title, muted, faint; + final Color page, + bg, + surface, + border, + borderSubtle, + text, + heading, + title, + muted, + faint; final Color primary, primaryDark, onPrimary, brand400, brand50, accent; - final Color success, danger, warn, infoSoft, okSoft, accentSoft, successBg, dangerBg, warnBg; + final Color success, + danger, + warn, + infoSoft, + okSoft, + accentSoft, + successBg, + dangerBg, + warnBg; final Color thBg, rowHover, shadow; - final Color topBg, topFg, topFaint, topBorder, topControl, topMarkBg, topMarkFg; - final Color sideBg, sideFg, sideMuted, sideActiveBg, sideActiveFg, sideBorder, sideHover; + final Color topBg, + topFg, + topFaint, + topBorder, + topControl, + topMarkBg, + topMarkFg; + final Color sideBg, + sideFg, + sideMuted, + sideActiveBg, + sideActiveFg, + sideBorder, + sideHover; final Color menuUserBg, menuUserFg, menuUserHover; + final Color toastBg; // 原型 --toast-bg（基础 :root 共用，主题不变） final bool isDark; const AppTokens({ - required this.page, required this.bg, required this.surface, required this.border, - required this.borderSubtle, required this.text, required this.heading, required this.title, - required this.muted, required this.faint, required this.primary, required this.primaryDark, - required this.onPrimary, required this.brand400, required this.brand50, required this.accent, - required this.success, required this.danger, required this.warn, required this.infoSoft, - required this.okSoft, required this.accentSoft, required this.successBg, required this.dangerBg, - required this.warnBg, required this.thBg, required this.rowHover, required this.shadow, - required this.topBg, required this.topFg, required this.topFaint, required this.topBorder, - required this.topControl, required this.topMarkBg, required this.topMarkFg, required this.sideBg, - required this.sideFg, required this.sideMuted, required this.sideActiveBg, required this.sideActiveFg, - required this.sideBorder, required this.sideHover, required this.menuUserBg, required this.menuUserFg, - required this.menuUserHover, required this.isDark, + required this.page, + required this.bg, + required this.surface, + required this.border, + required this.borderSubtle, + required this.text, + required this.heading, + required this.title, + required this.muted, + required this.faint, + required this.primary, + required this.primaryDark, + required this.onPrimary, + required this.brand400, + required this.brand50, + required this.accent, + required this.success, + required this.danger, + required this.warn, + required this.infoSoft, + required this.okSoft, + required this.accentSoft, + required this.successBg, + required this.dangerBg, + required this.warnBg, + required this.thBg, + required this.rowHover, + required this.shadow, + required this.topBg, + required this.topFg, + required this.topFaint, + required this.topBorder, + required this.topControl, + required this.topMarkBg, + required this.topMarkFg, + required this.sideBg, + required this.sideFg, + required this.sideMuted, + required this.sideActiveBg, + required this.sideActiveFg, + required this.sideBorder, + required this.sideHover, + required this.menuUserBg, + required this.menuUserFg, + required this.menuUserHover, + required this.toastBg, + required this.isDark, }); @override AppTokens copyWith({ - Color? page, Color? bg, Color? surface, Color? border, Color? borderSubtle, Color? text, - Color? heading, Color? title, Color? muted, Color? faint, Color? primary, Color? primaryDark, - Color? onPrimary, Color? brand400, Color? brand50, Color? accent, Color? success, Color? danger, - Color? warn, Color? infoSoft, Color? okSoft, Color? accentSoft, Color? successBg, Color? dangerBg, - Color? warnBg, Color? thBg, Color? rowHover, Color? shadow, Color? topBg, Color? topFg, - Color? topFaint, Color? topBorder, Color? topControl, Color? topMarkBg, Color? topMarkFg, - Color? sideBg, Color? sideFg, Color? sideMuted, Color? sideActiveBg, Color? sideActiveFg, - Color? sideBorder, Color? sideHover, Color? menuUserBg, Color? menuUserFg, Color? menuUserHover, + Color? page, + Color? bg, + Color? surface, + Color? border, + Color? borderSubtle, + Color? text, + Color? heading, + Color? title, + Color? muted, + Color? faint, + Color? primary, + Color? primaryDark, + Color? onPrimary, + Color? brand400, + Color? brand50, + Color? accent, + Color? success, + Color? danger, + Color? warn, + Color? infoSoft, + Color? okSoft, + Color? accentSoft, + Color? successBg, + Color? dangerBg, + Color? warnBg, + Color? thBg, + Color? rowHover, + Color? shadow, + Color? topBg, + Color? topFg, + Color? topFaint, + Color? topBorder, + Color? topControl, + Color? topMarkBg, + Color? topMarkFg, + Color? sideBg, + Color? sideFg, + Color? sideMuted, + Color? sideActiveBg, + Color? sideActiveFg, + Color? sideBorder, + Color? sideHover, + Color? menuUserBg, + Color? menuUserFg, + Color? menuUserHover, + Color? toastBg, bool? isDark, }) { return AppTokens( - page: page ?? this.page, bg: bg ?? this.bg, surface: surface ?? this.surface, - border: border ?? this.border, borderSubtle: borderSubtle ?? this.borderSubtle, - text: text ?? this.text, heading: heading ?? this.heading, title: title ?? this.title, - muted: muted ?? this.muted, faint: faint ?? this.faint, primary: primary ?? this.primary, - primaryDark: primaryDark ?? this.primaryDark, onPrimary: onPrimary ?? this.onPrimary, - brand400: brand400 ?? this.brand400, brand50: brand50 ?? this.brand50, accent: accent ?? this.accent, - success: success ?? this.success, danger: danger ?? this.danger, warn: warn ?? this.warn, - infoSoft: infoSoft ?? this.infoSoft, okSoft: okSoft ?? this.okSoft, accentSoft: accentSoft ?? this.accentSoft, - successBg: successBg ?? this.successBg, dangerBg: dangerBg ?? this.dangerBg, warnBg: warnBg ?? this.warnBg, - thBg: thBg ?? this.thBg, rowHover: rowHover ?? this.rowHover, shadow: shadow ?? this.shadow, - topBg: topBg ?? this.topBg, topFg: topFg ?? this.topFg, topFaint: topFaint ?? this.topFaint, - topBorder: topBorder ?? this.topBorder, topControl: topControl ?? this.topControl, - topMarkBg: topMarkBg ?? this.topMarkBg, topMarkFg: topMarkFg ?? this.topMarkFg, - sideBg: sideBg ?? this.sideBg, sideFg: sideFg ?? this.sideFg, sideMuted: sideMuted ?? this.sideMuted, - sideActiveBg: sideActiveBg ?? this.sideActiveBg, sideActiveFg: sideActiveFg ?? this.sideActiveFg, - sideBorder: sideBorder ?? this.sideBorder, sideHover: sideHover ?? this.sideHover, - menuUserBg: menuUserBg ?? this.menuUserBg, menuUserFg: menuUserFg ?? this.menuUserFg, - menuUserHover: menuUserHover ?? this.menuUserHover, isDark: isDark ?? this.isDark, + page: page ?? this.page, + bg: bg ?? this.bg, + surface: surface ?? this.surface, + border: border ?? this.border, + borderSubtle: borderSubtle ?? this.borderSubtle, + text: text ?? this.text, + heading: heading ?? this.heading, + title: title ?? this.title, + muted: muted ?? this.muted, + faint: faint ?? this.faint, + primary: primary ?? this.primary, + primaryDark: primaryDark ?? this.primaryDark, + onPrimary: onPrimary ?? this.onPrimary, + brand400: brand400 ?? this.brand400, + brand50: brand50 ?? this.brand50, + accent: accent ?? this.accent, + success: success ?? this.success, + danger: danger ?? this.danger, + warn: warn ?? this.warn, + infoSoft: infoSoft ?? this.infoSoft, + okSoft: okSoft ?? this.okSoft, + accentSoft: accentSoft ?? this.accentSoft, + successBg: successBg ?? this.successBg, + dangerBg: dangerBg ?? this.dangerBg, + warnBg: warnBg ?? this.warnBg, + thBg: thBg ?? this.thBg, + rowHover: rowHover ?? this.rowHover, + shadow: shadow ?? this.shadow, + topBg: topBg ?? this.topBg, + topFg: topFg ?? this.topFg, + topFaint: topFaint ?? this.topFaint, + topBorder: topBorder ?? this.topBorder, + topControl: topControl ?? this.topControl, + topMarkBg: topMarkBg ?? this.topMarkBg, + topMarkFg: topMarkFg ?? this.topMarkFg, + sideBg: sideBg ?? this.sideBg, + sideFg: sideFg ?? this.sideFg, + sideMuted: sideMuted ?? this.sideMuted, + sideActiveBg: sideActiveBg ?? this.sideActiveBg, + sideActiveFg: sideActiveFg ?? this.sideActiveFg, + sideBorder: sideBorder ?? this.sideBorder, + sideHover: sideHover ?? this.sideHover, + menuUserBg: menuUserBg ?? this.menuUserBg, + menuUserFg: menuUserFg ?? this.menuUserFg, + menuUserHover: menuUserHover ?? this.menuUserHover, + toastBg: toastBg ?? this.toastBg, + isDark: isDark ?? this.isDark, ); } @@ -65,24 +197,53 @@ class AppTokens extends ThemeExtension { if (other is! AppTokens) return this; Color c(Color a, Color b) => Color.lerp(a, b, t)!; return AppTokens( - page: c(page, other.page), bg: c(bg, other.bg), surface: c(surface, other.surface), - border: c(border, other.border), borderSubtle: c(borderSubtle, other.borderSubtle), - text: c(text, other.text), heading: c(heading, other.heading), title: c(title, other.title), - muted: c(muted, other.muted), faint: c(faint, other.faint), primary: c(primary, other.primary), - primaryDark: c(primaryDark, other.primaryDark), onPrimary: c(onPrimary, other.onPrimary), - brand400: c(brand400, other.brand400), brand50: c(brand50, other.brand50), accent: c(accent, other.accent), - success: c(success, other.success), danger: c(danger, other.danger), warn: c(warn, other.warn), - infoSoft: c(infoSoft, other.infoSoft), okSoft: c(okSoft, other.okSoft), accentSoft: c(accentSoft, other.accentSoft), - successBg: c(successBg, other.successBg), dangerBg: c(dangerBg, other.dangerBg), warnBg: c(warnBg, other.warnBg), - thBg: c(thBg, other.thBg), rowHover: c(rowHover, other.rowHover), shadow: c(shadow, other.shadow), - topBg: c(topBg, other.topBg), topFg: c(topFg, other.topFg), topFaint: c(topFaint, other.topFaint), - topBorder: c(topBorder, other.topBorder), topControl: c(topControl, other.topControl), - topMarkBg: c(topMarkBg, other.topMarkBg), topMarkFg: c(topMarkFg, other.topMarkFg), - sideBg: c(sideBg, other.sideBg), sideFg: c(sideFg, other.sideFg), sideMuted: c(sideMuted, other.sideMuted), - sideActiveBg: c(sideActiveBg, other.sideActiveBg), sideActiveFg: c(sideActiveFg, other.sideActiveFg), - sideBorder: c(sideBorder, other.sideBorder), sideHover: c(sideHover, other.sideHover), - menuUserBg: c(menuUserBg, other.menuUserBg), menuUserFg: c(menuUserFg, other.menuUserFg), - menuUserHover: c(menuUserHover, other.menuUserHover), isDark: t < 0.5 ? isDark : other.isDark, + page: c(page, other.page), + bg: c(bg, other.bg), + surface: c(surface, other.surface), + border: c(border, other.border), + borderSubtle: c(borderSubtle, other.borderSubtle), + text: c(text, other.text), + heading: c(heading, other.heading), + title: c(title, other.title), + muted: c(muted, other.muted), + faint: c(faint, other.faint), + primary: c(primary, other.primary), + primaryDark: c(primaryDark, other.primaryDark), + onPrimary: c(onPrimary, other.onPrimary), + brand400: c(brand400, other.brand400), + brand50: c(brand50, other.brand50), + accent: c(accent, other.accent), + success: c(success, other.success), + danger: c(danger, other.danger), + warn: c(warn, other.warn), + infoSoft: c(infoSoft, other.infoSoft), + okSoft: c(okSoft, other.okSoft), + accentSoft: c(accentSoft, other.accentSoft), + successBg: c(successBg, other.successBg), + dangerBg: c(dangerBg, other.dangerBg), + warnBg: c(warnBg, other.warnBg), + thBg: c(thBg, other.thBg), + rowHover: c(rowHover, other.rowHover), + shadow: c(shadow, other.shadow), + topBg: c(topBg, other.topBg), + topFg: c(topFg, other.topFg), + topFaint: c(topFaint, other.topFaint), + topBorder: c(topBorder, other.topBorder), + topControl: c(topControl, other.topControl), + topMarkBg: c(topMarkBg, other.topMarkBg), + topMarkFg: c(topMarkFg, other.topMarkFg), + sideBg: c(sideBg, other.sideBg), + sideFg: c(sideFg, other.sideFg), + sideMuted: c(sideMuted, other.sideMuted), + sideActiveBg: c(sideActiveBg, other.sideActiveBg), + sideActiveFg: c(sideActiveFg, other.sideActiveFg), + sideBorder: c(sideBorder, other.sideBorder), + sideHover: c(sideHover, other.sideHover), + menuUserBg: c(menuUserBg, other.menuUserBg), + menuUserFg: c(menuUserFg, other.menuUserFg), + menuUserHover: c(menuUserHover, other.menuUserHover), + toastBg: c(toastBg, other.toastBg), + isDark: t < 0.5 ? isDark : other.isDark, ); } } diff --git a/client/lib/core/theme/app_tokens.g.dart b/client/lib/core/theme/app_tokens.g.dart index eaffd7c..57e6bcb 100644 --- a/client/lib/core/theme/app_tokens.g.dart +++ b/client/lib/core/theme/app_tokens.g.dart @@ -49,6 +49,7 @@ const AppTokens kTokensA = AppTokens( menuUserBg: Color(0xFF3C79C0), menuUserFg: Color(0xFFFFFFFF), menuUserHover: Color(0xFF4D88CC), + toastBg: Color(0xFF1F2330), isDark: false, ); @@ -98,6 +99,7 @@ const AppTokens kTokensB = AppTokens( menuUserBg: Color(0xFF3A3120), menuUserFg: Color(0xFFF0E7D6), menuUserHover: Color(0xFF473B27), + toastBg: Color(0xFF1F2330), isDark: true, ); @@ -147,13 +149,17 @@ const AppTokens kTokensC = AppTokens( menuUserBg: Color(0xFF7E2B3B), menuUserFg: Color(0xFFF7E9D6), menuUserHover: Color(0xFF8E3344), + toastBg: Color(0xFF1F2330), isDark: false, ); AppTokens appTokensOf(String key) { switch (key) { - case 'b': return kTokensB; - case 'c': return kTokensC; - default: return kTokensA; + case 'b': + return kTokensB; + case 'c': + return kTokensC; + default: + return kTokensA; } } diff --git a/client/lib/core/theme/themes.dart b/client/lib/core/theme/themes.dart index 2baa8c8..69ebf90 100644 --- a/client/lib/core/theme/themes.dart +++ b/client/lib/core/theme/themes.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'app_dims.g.dart'; import 'app_tokens.g.dart'; ThemeData buildTheme(String key) { @@ -18,6 +19,88 @@ ThemeData buildTheme(String key) { brightness: brightness, colorScheme: scheme, scaffoldBackgroundColor: t.bg, + // 桌面端默认 adaptivePlatformDensity=compact 会把输入框/按钮压矮 8px， + // 与原型 px 规格（.input h38 等）和 golden（测试环境=standard）不一致—— + // 真机曾因此输入框只有 ~30 高。锁 standard，三端渲染与原型同几何。 + visualDensity: VisualDensity.standard, + // ── 对话框/输入框/按钮的 Material 默认样式钉到 ds 真相源 ── + // 原型 .modal：surface / border / r-xl / 标题 fs-h2 heading + dialogTheme: DialogThemeData( + backgroundColor: t.surface, + surfaceTintColor: Colors.transparent, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppDims.rXl), + side: BorderSide(color: t.border), + ), + titleTextStyle: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading), + contentTextStyle: TextStyle(fontSize: AppDims.fsBody, color: t.text), + ), + // 原型 .input：h38 盒式（surface/1px border/r-md/pad 0 11），聚焦主色边。 + // 全局兜底——未显式给 decoration 边框的 TextField/DropdownButtonFormField + // 一律盒式，禁止 Material 默认下划线再出现。 + inputDecorationTheme: InputDecorationTheme( + isDense: true, + filled: true, + fillColor: t.surface, + hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), + labelStyle: TextStyle(fontSize: AppDims.fsSm, color: t.muted), + contentPadding: const EdgeInsets.symmetric(horizontal: 11, vertical: 9), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.border), + ), + disabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.border), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.primary), + ), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.border), + ), + ), + // 原型 .btn.primary：primary 底 / onPrimary 字 / h38 / r-md / w600 / 无阴影 + elevatedButtonTheme: ElevatedButtonThemeData( + style: ElevatedButton.styleFrom( + backgroundColor: t.primary, + foregroundColor: t.onPrimary, + elevation: 0, + minimumSize: const Size(0, 38), + padding: const EdgeInsets.symmetric(horizontal: 16), + textStyle: const TextStyle( + fontSize: AppDims.fsBody, fontWeight: FontWeight.w600), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppDims.rMd)), + ), + ), + filledButtonTheme: FilledButtonThemeData( + style: FilledButton.styleFrom( + backgroundColor: t.primary, + foregroundColor: t.onPrimary, + minimumSize: const Size(0, 38), + padding: const EdgeInsets.symmetric(horizontal: 16), + textStyle: const TextStyle( + fontSize: AppDims.fsBody, fontWeight: FontWeight.w600), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppDims.rMd)), + ), + ), + // TextButton 兼作行内链接，不加边框；只统一字号字重与圆角 + textButtonTheme: TextButtonThemeData( + style: TextButton.styleFrom( + minimumSize: const Size(0, 38), + textStyle: const TextStyle( + fontSize: AppDims.fsBody, fontWeight: FontWeight.w600), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppDims.rMd)), + ), + ), // 字体走系统默认（macOS/iOS=PingFang SC，与原型 --font 一致）；不强制 Noto。 // Noto 仅 golden 测试加载（CI 无中文字体），见 test/support/golden_harness.dart。 extensions: >[t], diff --git a/client/lib/core/update/app_updater.dart b/client/lib/core/update/app_updater.dart index 7aabc98..e3d7127 100644 --- a/client/lib/core/update/app_updater.dart +++ b/client/lib/core/update/app_updater.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import '../../providers/update_provider.dart'; -import 'app_updater_io.dart' - if (dart.library.js_interop) 'app_updater_web.dart' as impl; +import '../../widgets/ds/ds_atoms.dart'; +import 'app_updater_io.dart' if (dart.library.js_interop) 'app_updater_web.dart' + as impl; /// 应用内更新统一入口。 /// - Web：刷新页面。 @@ -65,17 +66,11 @@ Future _runWithProgress( title: const Text('更新失败'), content: Text('$e\n\n可改用浏览器下载更新。'), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () { - Navigator.pop(ctx); - launchUpdateUrl(info.downloadUrls); - }, - child: const Text('浏览器下载'), - ), + DsButton('取消', onPressed: () => Navigator.pop(ctx)), + DsButton('浏览器下载', variant: DsBtnVariant.primary, onPressed: () { + Navigator.pop(ctx); + launchUpdateUrl(info.downloadUrls); + }), ], ), ); diff --git a/client/lib/core/update/app_updater_io.dart b/client/lib/core/update/app_updater_io.dart index c1f4d66..e882b27 100644 --- a/client/lib/core/update/app_updater_io.dart +++ b/client/lib/core/update/app_updater_io.dart @@ -47,7 +47,8 @@ Future downloadAndInstall( await Process.run('/bin/rm', ['-rf', extractDir]); await Directory(extractDir).create(recursive: true); // ditto 正确处理 .app 包（保留权限/符号链接）。 - final unzip = await Process.run('/usr/bin/ditto', ['-x', '-k', zip, extractDir]); + final unzip = + await Process.run('/usr/bin/ditto', ['-x', '-k', zip, extractDir]); if (unzip.exitCode != 0) { throw Exception('解压失败：${unzip.stderr}'); } diff --git a/client/lib/core/utils/clock.dart b/client/lib/core/utils/clock.dart new file mode 100644 index 0000000..8b70c4a --- /dev/null +++ b/client/lib/core/utils/clock.dart @@ -0,0 +1,5 @@ +/// 可注入的应用时钟：业务展示层的「当前时间」统一走 [appNow]， +/// golden 测试可覆写 [appClock] 冻结时间，保证 相对日期（今天/昨天/剩余天数）确定化。 +DateTime Function() appClock = () => DateTime.now(); + +DateTime appNow() => appClock(); diff --git a/client/lib/core/utils/export_util_web.dart b/client/lib/core/utils/export_util_web.dart index 47504da..7166350 100644 --- a/client/lib/core/utils/export_util_web.dart +++ b/client/lib/core/utils/export_util_web.dart @@ -30,7 +30,8 @@ void exportExcel({ final blob = web.Blob( [uint8Array].toJS, web.BlobPropertyBag( - type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'), + type: + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'), ); final url = web.URL.createObjectURL(blob); final anchor = web.document.createElement('a') as web.HTMLAnchorElement diff --git a/client/lib/core/utils/print_util.dart b/client/lib/core/utils/print_util.dart index 0be4f00..83ffc4a 100644 --- a/client/lib/core/utils/print_util.dart +++ b/client/lib/core/utils/print_util.dart @@ -6,6 +6,8 @@ import '../errors/error_reporter.dart'; import 'label_data.dart'; export 'label_data.dart'; import 'order_print_meta.dart'; +import '../theme/context_tokens.dart'; +import '../../widgets/ds/ds_toast.dart'; export 'order_print_meta.dart'; import 'print_util_stub.dart' if (dart.library.js_interop) 'print_util_web.dart'; @@ -56,7 +58,8 @@ Future printStockOutOrder(StockOutOrder order, OrderPrintMeta meta) => printStockOutOrderImpl(order, meta); /// 生成入库单 PDF 字节（桌面端真实排版，供打印预览光栅化用）；Web 端不支持。 -Future buildStockInOrderPdf(StockInOrder order, OrderPrintMeta meta) => +Future buildStockInOrderPdf( + StockInOrder order, OrderPrintMeta meta) => buildStockInOrderPdfImpl(order, meta); /// 生成出库单 PDF 字节（桌面端真实排版，供打印预览光栅化用）；Web 端不支持。 @@ -72,9 +75,7 @@ Future safePrint(BuildContext context, Future Function() fn) async { } catch (e, st) { reportError(e, st); if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('打印失败：$e'), backgroundColor: Colors.red), - ); + showDsToast(context, '打印失败：$e', bg: context.tokens.danger); } } } diff --git a/client/lib/core/utils/print_util_stub.dart b/client/lib/core/utils/print_util_stub.dart index 4ccd877..2d8d7c7 100644 --- a/client/lib/core/utils/print_util_stub.dart +++ b/client/lib/core/utils/print_util_stub.dart @@ -47,10 +47,10 @@ String _fileTs() { } // ── 设计色彩 token ────────────────────────────────────────────────────────── -const _navy = PdfColor(0.122, 0.165, 0.227); // #1F2A3A header/chip -const _cream = PdfColor(0.957, 0.925, 0.847); // #F4ECD8 footer/reversed text -const _footnote = PdfColor(0.353, 0.306, 0.208); // #5A4E35 footer text -const _ink = PdfColor(0.067, 0.067, 0.067); // #111 body text +const _navy = PdfColor(0.122, 0.165, 0.227); // #1F2A3A header/chip +const _cream = PdfColor(0.957, 0.925, 0.847); // #F4ECD8 footer/reversed text +const _footnote = PdfColor(0.353, 0.306, 0.208); // #5A4E35 footer text +const _ink = PdfColor(0.067, 0.067, 0.067); // #111 body text // ── 热敏标签 TSPL 裸发（桌面端：dart:ui 画扁平标签位图 → BITMAP → lp -o raw）──────── // 得力 DL-888B 等热敏机走系统打印(CUPS 通用驱动)会多走纸/空白，必须发原生 TSPL。 @@ -156,8 +156,9 @@ bool _winRawPrint(String printerName, Uint8List data) { } /// 在 canvas 上画一行文字（黑色，单行不换行，CJK 走系统字体回退） -void _drawText(ui.Canvas canvas, String s, double x, double y, double size, - double maxW, {bool bold = false, bool center = false}) { +void _drawText( + ui.Canvas canvas, String s, double x, double y, double size, double maxW, + {bool bold = false, bool center = false}) { if (s.isEmpty) return; final pb = ui.ParagraphBuilder(ui.ParagraphStyle( fontSize: size, @@ -166,7 +167,8 @@ void _drawText(ui.Canvas canvas, String s, double x, double y, double size, maxLines: 1, ellipsis: '', )) - ..pushStyle(ui.TextStyle(color: const ui.Color(0xFF000000))) + ..pushStyle( + ui.TextStyle(color: const ui.Color(0xFF000000))) // ds-ignore: 打印画布纸面固定色 ..addText(s); final p = pb.build()..layout(ui.ParagraphConstraints(width: maxW)); canvas.drawParagraph(p, ui.Offset(x, y)); @@ -178,7 +180,8 @@ double _measureWidth(String s, double size, bool bold) { fontSize: size, fontWeight: bold ? ui.FontWeight.bold : ui.FontWeight.normal, maxLines: 1, - ))..addText(s); + )) + ..addText(s); final p = pb.build()..layout(const ui.ParagraphConstraints(width: 100000)); return p.maxIntrinsicWidth; } @@ -205,14 +208,14 @@ Future _renderLabelBitmap({ required Uint8List qrBytes, }) async { const w = 320, h = 160; // 40×20mm @203dpi（逻辑尺寸） - const scale = 2; // 2× 超采样，内部以 640×320 绘制 + const scale = 2; // 2× 超采样，内部以 640×320 绘制 const sw = w * scale, sh = h * scale; final recorder = ui.PictureRecorder(); - final canvas = ui.Canvas( - recorder, ui.Rect.fromLTWH(0, 0, sw.toDouble(), sh.toDouble())); + final canvas = + ui.Canvas(recorder, ui.Rect.fromLTWH(0, 0, sw.toDouble(), sh.toDouble())); canvas.scale(scale.toDouble(), scale.toDouble()); // 坐标系放大，后续坐标不变 canvas.drawRect(ui.Rect.fromLTWH(0, 0, w.toDouble(), h.toDouble()), - ui.Paint()..color = const ui.Color(0xFFFFFFFF)); + ui.Paint()..color = const ui.Color(0xFFFFFFFF)); // ds-ignore: 打印画布纸面固定色 // 右侧二维码（解码后端 PNG 直接画上） const qrS = 124.0; @@ -237,27 +240,29 @@ Future _renderLabelBitmap({ const textMaxW = qrLeft - lx - 6; // 164 // 字号固定：只有商品名按宽度自适应，其余行均固定，杜绝自动放大 - const double kShopSize = 17.0; // 酒行名，粗体 + const double kShopSize = 17.0; // 酒行名，粗体 const double kSmallSize = 13.0; // 编号 / 度数 / 日期，统一小字 // 商品名：仅按宽度适配，上限 26px，下限 14px - final double nameSize = _fitFont(name, textMaxW, 1000, true, 26.0).clamp(14.0, 26.0); + final double nameSize = + _fitFont(name, textMaxW, 1000, true, 26.0).clamp(14.0, 26.0); final codeText = code.isNotEmpty ? '编号：$code' : ''; final rows = <(String, double, bool)>[ - if (shop.isNotEmpty) (shop, kShopSize, false), // 店名细体，突出商品名 - if (name.isNotEmpty) (name, nameSize, true), // 商品名粗体 + if (shop.isNotEmpty) (shop, kShopSize, false), // 店名细体，突出商品名 + if (name.isNotEmpty) (name, nameSize, true), // 商品名粗体 if (codeText.isNotEmpty) (codeText, kSmallSize, false), - if (degSpec.isNotEmpty) (degSpec, kSmallSize, false), - if (date.isNotEmpty) (date, kSmallSize, false), + if (degSpec.isNotEmpty) (degSpec, kSmallSize, false), + if (date.isNotEmpty) (date, kSmallSize, false), ]; // 文字区域：整体略低于二维码顶部，底部延伸至扫码溯源文字下方 const double kTextTop = 16.0; // 比二维码顶部(8)低一些，整体下移 const double kTextBot = 150.0; // 延伸至底部，减少留白 - const double kLineH = 1.35; // 行高倍数（字号 × 行高 = 该行占用高度） + const double kLineH = 1.35; // 行高倍数（字号 × 行高 = 该行占用高度） final double totalTextH = rows.fold(0.0, (s, r) => s + r.$2 * kLineH); final int n = rows.length; - final double rawGap = n > 0 ? (kTextBot - kTextTop - totalTextH) / (n + 1) : 4.0; + final double rawGap = + n > 0 ? (kTextBot - kTextTop - totalTextH) / (n + 1) : 4.0; final double gap = rawGap < 1.5 ? 1.5 : rawGap; double yy = kTextTop + gap; @@ -277,11 +282,13 @@ Uint8List _encodeGbk(String text) { if (Platform.isWindows) { final wideStr = text.toNativeUtf16(); try { - final needed = WideCharToMultiByte(936, 0, wideStr, -1, nullptr, 0, nullptr, nullptr); + final needed = WideCharToMultiByte( + 936, 0, wideStr, -1, nullptr, 0, nullptr, nullptr); if (needed <= 1) return Uint8List(0); final buf = calloc(needed); try { - WideCharToMultiByte(936, 0, wideStr, -1, buf.cast(), needed, nullptr, nullptr); + WideCharToMultiByte( + 936, 0, wideStr, -1, buf.cast(), needed, nullptr, nullptr); return Uint8List.fromList(buf.asTypedList(needed - 1)); // 不含 null 终止符 } finally { calloc.free(buf); @@ -337,7 +344,8 @@ Future _printFlatLabelThermal({ const qrWBytes = (qrW + 7) >> 3; // 16 bytes/row // 将后端 256×256 QR PNG 缩放到 124×124 并转 1-bit - final codec = await ui.instantiateImageCodec(qrBytes, targetWidth: qrW, targetHeight: qrH); + final codec = await ui.instantiateImageCodec(qrBytes, + targetWidth: qrW, targetHeight: qrH); final qrImg = (await codec.getNextFrame()).image; final qrBd = await qrImg.toByteData(format: ui.ImageByteFormat.rawRgba); final qrRgba = qrBd!.buffer.asUint8List(); @@ -370,24 +378,24 @@ Future _printFlatLabelThermal({ // 左侧文字（x=4, 宽度至 x=186） // TSS24.BF2: 24×24 点阵; TSS16.BF2: 16×16 点阵 - const kFontL = 'TSS16.BF2'; // 小号（编号/度数/日期） + const kFontL = 'TSS16.BF2'; // 小号（编号/度数/日期） const kFontXL = 'TSS24.BF2'; // 大号（商品名，≤7字时使用） final nameFont = name.runes.length <= 7 ? kFontXL : kFontL; - final nameH = nameFont == kFontXL ? 24 : 16; + final nameH = nameFont == kFontXL ? 24 : 16; final codeText = code.isNotEmpty ? '编号：$code' : ''; // (文本, 字体, 字符高度点数) final rows = <(String, String, int)>[]; - if (shop.isNotEmpty) rows.add((shop, kFontL, 16)); - if (name.isNotEmpty) rows.add((name, nameFont, nameH)); - if (codeText.isNotEmpty) rows.add((codeText, kFontL, 16)); - if (degSpec.isNotEmpty) rows.add((degSpec, kFontL, 16)); - if (date.isNotEmpty) rows.add((date, kFontL, 16)); + if (shop.isNotEmpty) rows.add((shop, kFontL, 16)); + if (name.isNotEmpty) rows.add((name, nameFont, nameH)); + if (codeText.isNotEmpty) rows.add((codeText, kFontL, 16)); + if (degSpec.isNotEmpty) rows.add((degSpec, kFontL, 16)); + if (date.isNotEmpty) rows.add((date, kFontL, 16)); // 在 y=8..150 区间均匀分布各行 const kTextTop = 8; const kTextBot = 150; - const kTextX = 4; + const kTextX = 4; final totalH = rows.fold(0, (s, r) => s + r.$3); final n = rows.length; final gapSize = n > 0 @@ -423,154 +431,168 @@ Future printProductLabelImpl({ String? printerName, }) async { try { - final font = await _loadFont(); - final doc = pw.Document(); - final qrImage = pw.MemoryImage(qrBytes); + final font = await _loadFont(); + final doc = pw.Document(); + final qrImage = pw.MemoryImage(qrBytes); - // Label: 40 × 20 mm（匹配实际标签纸尺寸） - const labelW = 40.0 * PdfPageFormat.mm; - const labelH = 20.0 * PdfPageFormat.mm; - const headerH = labelH * 0.20; - const footerH = labelH * 0.11; + // Label: 40 × 20 mm（匹配实际标签纸尺寸） + const labelW = 40.0 * PdfPageFormat.mm; + const labelH = 20.0 * PdfPageFormat.mm; + const headerH = labelH * 0.20; + const footerH = labelH * 0.11; - final specVal = (spec ?? '').isNotEmpty ? spec! : ''; - final seriesVal = (series ?? '').isNotEmpty ? series! : ''; - // 度数(系列) + 规格 同一行 - final degSpecVal = [seriesVal, specVal].where((s) => s.isNotEmpty).join(' '); - final dateVal = (productionDate ?? '').isNotEmpty - ? (productionDate!.length > 10 ? productionDate.substring(0, 10) : productionDate) - : '—'; + final specVal = (spec ?? '').isNotEmpty ? spec! : ''; + final seriesVal = (series ?? '').isNotEmpty ? series! : ''; + // 度数(系列) + 规格 同一行 + final degSpecVal = + [seriesVal, specVal].where((s) => s.isNotEmpty).join(' '); + final dateVal = (productionDate ?? '').isNotEmpty + ? (productionDate!.length > 10 + ? productionDate.substring(0, 10) + : productionDate) + : '—'; - // 桌面端热敏机：直接画扁平标签位图 + TSPL 裸发（不走会多走纸的系统打印） - if (await _printFlatLabelThermal( - shop: shopName, - name: name, - code: code, - degSpec: degSpecVal, - date: dateVal == '—' ? '' : dateVal, // 无生产日期(商品详情)则不显示该行 - qrBytes: qrBytes, - printerName: printerName)) { - return; - } + // 桌面端热敏机：直接画扁平标签位图 + TSPL 裸发（不走会多走纸的系统打印） + if (await _printFlatLabelThermal( + shop: shopName, + name: name, + code: code, + degSpec: degSpecVal, + date: dateVal == '—' ? '' : dateVal, // 无生产日期(商品详情)则不显示该行 + qrBytes: qrBytes, + printerName: printerName)) { + return; + } - final contact = [ - if (shopAddress.isNotEmpty) shopAddress, - if (shopPhone.isNotEmpty) shopPhone, - ].join(' · '); - final footerLeft = contact.isNotEmpty ? contact : shopName; + final contact = [ + if (shopAddress.isNotEmpty) shopAddress, + if (shopPhone.isNotEmpty) shopPhone, + ].join(' · '); + final footerLeft = contact.isNotEmpty ? contact : shopName; - // 标签生成时间 - final now = DateTime.now(); - final genTime = - '${now.year}-${now.month.toString().padLeft(2,'0')}-${now.day.toString().padLeft(2,'0')}' - ' ${now.hour.toString().padLeft(2,'0')}:${now.minute.toString().padLeft(2,'0')}'; + // 标签生成时间 + final now = DateTime.now(); + final genTime = + '${now.year}-${now.month.toString().padLeft(2, '0')}-${now.day.toString().padLeft(2, '0')}' + ' ${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}'; - doc.addPage(pw.Page( - pageFormat: const PdfPageFormat(labelW, labelH), - margin: pw.EdgeInsets.zero, - build: (_) => pw.Column( - crossAxisAlignment: pw.CrossAxisAlignment.stretch, - children: [ + doc.addPage(pw.Page( + pageFormat: const PdfPageFormat(labelW, labelH), + margin: pw.EdgeInsets.zero, + build: (_) => pw.Column( + crossAxisAlignment: pw.CrossAxisAlignment.stretch, + children: [ + // ── Header：酒行名称 ───────────────────────────────────────────────── + pw.Container( + height: headerH, + color: _navy, + padding: const pw.EdgeInsets.symmetric(horizontal: 4), + alignment: pw.Alignment.centerLeft, + child: pw.Text(shopName, + maxLines: 1, + overflow: pw.TextOverflow.clip, + style: pw.TextStyle( + font: font, + fontSize: 6, + fontWeight: pw.FontWeight.bold, + color: _cream, + letterSpacing: 0.5, + )), + ), - // ── Header：酒行名称 ───────────────────────────────────────────────── - pw.Container( - height: headerH, - color: _navy, - padding: const pw.EdgeInsets.symmetric(horizontal: 4), - alignment: pw.Alignment.centerLeft, - child: pw.Text(shopName, - maxLines: 1, overflow: pw.TextOverflow.clip, - style: pw.TextStyle( - font: font, fontSize: 6, - fontWeight: pw.FontWeight.bold, - color: _cream, letterSpacing: 0.5, - )), - ), - - // ── Body ───────────────────────────────────────────────────────────── - pw.Expanded( - child: pw.Container( - color: PdfColors.white, - padding: const pw.EdgeInsets.fromLTRB(4, 2, 4, 2), - child: pw.Row( - crossAxisAlignment: pw.CrossAxisAlignment.center, - children: [ - pw.Expanded( - child: pw.Column( + // ── Body ───────────────────────────────────────────────────────────── + pw.Expanded( + child: pw.Container( + color: PdfColors.white, + padding: const pw.EdgeInsets.fromLTRB(4, 2, 4, 2), + child: pw.Row( + crossAxisAlignment: pw.CrossAxisAlignment.center, + children: [ + pw.Expanded( + child: pw.Column( + mainAxisAlignment: pw.MainAxisAlignment.center, + crossAxisAlignment: pw.CrossAxisAlignment.start, + children: [ + // 商品名（过长自动缩小并最多两行） + pw.Text(name, + maxLines: 2, + overflow: pw.TextOverflow.clip, + style: pw.TextStyle( + font: font, + fontSize: name.runes.length > 10 + ? 5.5 + : (name.runes.length > 7 ? 6.5 : 7.5), + fontWeight: pw.FontWeight.bold, + color: _ink, + letterSpacing: 0.3)), + pw.SizedBox(height: 2.5), + // 商品编号（度数上方） + if (code.isNotEmpty) ...[ + pw.Text('编号：$code', + style: pw.TextStyle( + font: font, fontSize: 5.5, color: _ink)), + pw.SizedBox(height: 1.5), + ], + // 度数(系列) + 规格 同一行, 无字段名标签 + pw.Text(degSpecVal, + style: pw.TextStyle( + font: font, fontSize: 5.5, color: _ink)), + pw.SizedBox(height: 1.5), + // 生产日期（只显示日期，无标签） + pw.Text(dateVal, + style: pw.TextStyle( + font: font, fontSize: 5.5, color: _ink)), + ], + ), + ), + pw.SizedBox(width: 4), + // QR + pw.Column( mainAxisAlignment: pw.MainAxisAlignment.center, - crossAxisAlignment: pw.CrossAxisAlignment.start, children: [ - // 商品名（过长自动缩小并最多两行） - pw.Text(name, - maxLines: 2, - overflow: pw.TextOverflow.clip, + pw.SizedBox( + width: 38, + height: 38, + child: pw.Image(qrImage, fit: pw.BoxFit.contain), + ), + pw.SizedBox(height: 1), + pw.Text('扫码溯源', style: pw.TextStyle( font: font, - fontSize: name.runes.length > 10 - ? 5.5 - : (name.runes.length > 7 ? 6.5 : 7.5), - fontWeight: pw.FontWeight.bold, - color: _ink, letterSpacing: 0.3)), - pw.SizedBox(height: 2.5), - // 商品编号（度数上方） - if (code.isNotEmpty) ...[ - pw.Text('编号：$code', - style: pw.TextStyle(font: font, fontSize: 5.5, color: _ink)), - pw.SizedBox(height: 1.5), - ], - // 度数(系列) + 规格 同一行, 无字段名标签 - pw.Text(degSpecVal, - style: pw.TextStyle(font: font, fontSize: 5.5, color: _ink)), - pw.SizedBox(height: 1.5), - // 生产日期（只显示日期，无标签） - pw.Text(dateVal, - style: pw.TextStyle(font: font, fontSize: 5.5, color: _ink)), + fontSize: 3.5, + color: PdfColors.grey600)), ], ), + ], + ), + ), + ), + + // ── Footer ─────────────────────────────────────────────────────────── + pw.Container( + height: footerH, + color: _cream, + padding: const pw.EdgeInsets.symmetric(horizontal: 4), + child: pw.Row( + mainAxisAlignment: pw.MainAxisAlignment.spaceBetween, + crossAxisAlignment: pw.CrossAxisAlignment.center, + children: [ + pw.Flexible( + child: pw.Text(footerLeft, + maxLines: 1, + overflow: pw.TextOverflow.clip, + style: pw.TextStyle( + font: font, fontSize: 3, color: _footnote)), ), - pw.SizedBox(width: 4), - // QR - pw.Column( - mainAxisAlignment: pw.MainAxisAlignment.center, - children: [ - pw.SizedBox( - width: 38, height: 38, - child: pw.Image(qrImage, fit: pw.BoxFit.contain), - ), - pw.SizedBox(height: 1), - pw.Text('扫码溯源', - style: pw.TextStyle( - font: font, fontSize: 3.5, - color: PdfColors.grey600)), - ], - ), + pw.Text(genTime, + style: pw.TextStyle( + font: font, fontSize: 3, color: _footnote)), ], ), ), - ), - - // ── Footer ─────────────────────────────────────────────────────────── - pw.Container( - height: footerH, - color: _cream, - padding: const pw.EdgeInsets.symmetric(horizontal: 4), - child: pw.Row( - mainAxisAlignment: pw.MainAxisAlignment.spaceBetween, - crossAxisAlignment: pw.CrossAxisAlignment.center, - children: [ - pw.Flexible( - child: pw.Text(footerLeft, - maxLines: 1, overflow: pw.TextOverflow.clip, - style: pw.TextStyle(font: font, fontSize: 3, color: _footnote)), - ), - pw.Text(genTime, - style: pw.TextStyle(font: font, fontSize: 3, color: _footnote)), - ], - ), - ), - ], - ), - )); + ], + ), + )); // 预生成 PDF 字节，避免 macOS NSPrintPanel 打开后再调 doc.save() 导致主线程卡住。 final bytes = await doc.save(); @@ -593,7 +615,8 @@ Future printProductLabelImpl({ Future renderLabelPreviewImpl(LabelData label) async { final specVal = (label.spec ?? '').isNotEmpty ? label.spec! : ''; final seriesVal = (label.series ?? '').isNotEmpty ? label.series! : ''; - final degSpecVal = [seriesVal, specVal].where((s) => s.isNotEmpty).join(' '); + final degSpecVal = + [seriesVal, specVal].where((s) => s.isNotEmpty).join(' '); final dateVal = (label.productionDate ?? '').isNotEmpty ? (label.productionDate!.length > 10 ? label.productionDate!.substring(0, 10) @@ -658,15 +681,33 @@ String _qtyStr(double q) => /// 单据明细列（入库/出库统一）：商品编号→备注。 const _orderHeaders = [ - '商品编号', '商品名称', '系列', '规格', '批次号', - '生产日期', '数量', '单价', '金额', '备注', + '商品编号', + '商品名称', + '系列', + '规格', + '批次号', + '生产日期', + '数量', + '单价', + '金额', + '备注', ]; // 针打版式列宽：日期 / 单价 / 金额 加宽，避免大字号下数字、日期断行。 -const _orderColFlex = [1.4, 1.8, 1.0, 1.2, 1.6, 1.45, 0.7, 1.45, 1.45, 0.7]; +const _orderColFlex = [ + 1.4, + 1.8, + 1.0, + 1.2, + 1.6, + 1.45, + 0.7, + 1.45, + 1.45, + 0.7 +]; /// 温馨提示文案（入库/出库统一）。 -const _kTipsText = - '温馨提示：签收时，请务必核对好酒品数量、年份和日期、批次及物流码，' +const _kTipsText = '温馨提示：签收时，请务必核对好酒品数量、年份和日期、批次及物流码，' '如有问题及时反馈，酒品无质量问题一经售出概不退换，谢谢合作。'; /// 各明细列对齐：系列/规格/批次号/生产日期居中，数量/单价/金额右对齐，其余左对齐。 @@ -691,20 +732,20 @@ pw.TextAlign _colAlign(int i) { List _buildOrderDoc({ required pw.Font font, required pw.Font bold, - required String shopName, // 公司名称（顶部抬头） - required String title, // 入 库 单 / 出 库 单 + required String shopName, // 公司名称（顶部抬头） + required String title, // 入 库 单 / 出 库 单 required String orderNo, - required String noPrefix, // 'NO：' / 'NO.' - required String partnerLabel, // 单位名称 / 客户名称 + required String noPrefix, // 'NO：' / 'NO.' + required String partnerLabel, // 单位名称 / 客户名称 required String? partnerName, - required String dateLabel, // 入库日期 / 出库日期 + required String dateLabel, // 入库日期 / 出库日期 required String? orderDate, - required String addressLabel, // 单位地址 / 送货地址 + required String addressLabel, // 单位地址 / 送货地址 required String? warehouseName, - required String signerLabel, // 出货人（签字）/ 收货人（签字） + required String signerLabel, // 出货人（签字）/ 收货人（签字） required String operatorRoleLabel, // 采购员 / 销售员（= 经办人） required String? operatorName, - required String? makerName, // 制单人 = 打印人 + required String? makerName, // 制单人 = 打印人 required String? remark, required bool showTips, required List> rows, @@ -717,13 +758,13 @@ List _buildOrderDoc({ // 数字等宽（内置 Courier，ASCII 数字适用）。 final mono = pw.Font.courierBold(); final monoBold = pw.Font.courierBold(); - final cellStyle = pw.TextStyle( - font: bold, fontSize: 9, fontWeight: pw.FontWeight.bold); + final cellStyle = + pw.TextStyle(font: bold, fontSize: 9, fontWeight: pw.FontWeight.bold); final numStyle = pw.TextStyle(font: mono, fontSize: 9); final headStyle = pw.TextStyle(font: bold, fontSize: 9.5, fontWeight: pw.FontWeight.bold); - final metaStyle = pw.TextStyle( - font: bold, fontSize: 10, fontWeight: pw.FontWeight.bold); + final metaStyle = + pw.TextStyle(font: bold, fontSize: 10, fontWeight: pw.FontWeight.bold); final metaBold = pw.TextStyle(font: bold, fontSize: 10.5, fontWeight: pw.FontWeight.bold); @@ -801,8 +842,8 @@ List _buildOrderDoc({ partnerLabel, partnerName ?? '', pw.TextAlign.left)), pw.Expanded( flex: 4, - child: - metaText(dateLabel, _d10(orderDate), pw.TextAlign.left)), + child: metaText( + dateLabel, _d10(orderDate), pw.TextAlign.left)), pw.Expanded( flex: 3, child: pw.Text('$noPrefix$orderNo', @@ -813,8 +854,7 @@ List _buildOrderDoc({ pw.Row( children: [ pw.Expanded( - flex: 5, - child: metaText('联系电话', '', pw.TextAlign.left)), + flex: 5, child: metaText('联系电话', '', pw.TextAlign.left)), pw.Expanded( flex: 4, child: metaText(addressLabel, '', pw.TextAlign.left)), @@ -1021,7 +1061,8 @@ Future buildStockInOrderPdfImpl( } return _buildOrderPdf(() => _buildOrderDoc( - font: font, bold: bold, + font: font, + bold: bold, shopName: meta.shopName, title: '入 库 单', orderNo: order.orderNo, @@ -1091,7 +1132,8 @@ Future buildStockOutOrderPdfImpl( } return _buildOrderPdf(() => _buildOrderDoc( - font: font, bold: bold, + font: font, + bold: bold, shopName: meta.shopName, title: '出 库 单', orderNo: order.orderNo, diff --git a/client/lib/core/utils/print_util_web.dart b/client/lib/core/utils/print_util_web.dart index 5dc1c52..fa906b9 100644 --- a/client/lib/core/utils/print_util_web.dart +++ b/client/lib/core/utils/print_util_web.dart @@ -33,12 +33,14 @@ Future printProductLabelImpl({ }) async { final base64Img = base64Encode(qrBytes); - final specVal = (spec ?? '').isNotEmpty ? spec! : ''; + final specVal = (spec ?? '').isNotEmpty ? spec! : ''; final seriesVal = (series ?? '').isNotEmpty ? series! : ''; // 度数(系列) + 规格 同一行 final degSpecVal = [seriesVal, specVal].where((s) => s.isNotEmpty).join(' '); - final dateVal = (productionDate ?? '').isNotEmpty - ? (productionDate!.length > 10 ? productionDate.substring(0, 10) : productionDate) + final dateVal = (productionDate ?? '').isNotEmpty + ? (productionDate!.length > 10 + ? productionDate.substring(0, 10) + : productionDate) : '—'; // 商品名过长时缩小字号（适当缩小，配合两行折行） final nameLen = name.runes.length; diff --git a/client/lib/main.dart b/client/lib/main.dart index 8f5735d..66880eb 100644 --- a/client/lib/main.dart +++ b/client/lib/main.dart @@ -13,6 +13,7 @@ import 'core/router/app_router.dart'; import 'core/theme/theme_controller.dart'; import 'core/theme/themes.dart'; import 'providers/connectivity_provider.dart'; +import 'widgets/ds/ds_atoms.dart'; void main() { usePathUrlStrategy(); @@ -70,10 +71,8 @@ class _AlreadyRunningApp extends StatelessWidget { title: const Text('岩美酒库已在运行'), content: const Text('请勿重复打开，程序已在运行中。\n请在任务栏或 Dock 中找到已打开的窗口。'), actions: [ - TextButton( - onPressed: () => exit(0), - child: const Text('确定'), - ), + DsButton('确定', + variant: DsBtnVariant.primary, onPressed: () => exit(0)), ], ), ); diff --git a/client/lib/models/finance.dart b/client/lib/models/finance.dart index 631b5e7..63d9cad 100644 --- a/client/lib/models/finance.dart +++ b/client/lib/models/finance.dart @@ -40,6 +40,17 @@ class FinanceRecord { } } + /// 单据抬头（近期单据列表用）：收付款显示类型，应收/应付回溯到来源单据 + String get docTitle { + final ref = switch (refType) { + 'stock_in' => '入库单', + 'stock_out' => '出库单', + _ => null, + }; + if (ref != null) return ref; + return typeLabel; + } + factory FinanceRecord.fromJson(Map json) => FinanceRecord( id: (json['id'] as num).toInt(), type: json['type'] as String, @@ -47,13 +58,57 @@ class FinanceRecord { balance: (json['balance'] as num).toDouble(), status: json['status'] as String? ?? 'open', refType: json['ref_type'] as String?, - refId: - json['ref_id'] != null ? (json['ref_id'] as num).toInt() : null, + refId: json['ref_id'] != null ? (json['ref_id'] as num).toInt() : null, partnerName: (json['partner'] as Map?)?['name'] as String?, - partnerId: - json['partner_id'] != null ? (json['partner_id'] as num).toInt() : null, + partnerId: json['partner_id'] != null + ? (json['partner_id'] as num).toInt() + : null, recordDate: json['record_date'] as String?, remark: json['remark'] as String?, ); } + +/// GET /finance/summary 行：按往来单位分组的未结清应收/应付聚合 +class PartnerFinanceSummary { + final int? partnerId; + final String partnerName; + final String type; // payable | receivable + final int recordCount; + final double totalAmount; + + const PartnerFinanceSummary({ + this.partnerId, + this.partnerName = '', + required this.type, + this.recordCount = 0, + required this.totalAmount, + }); + + factory PartnerFinanceSummary.fromJson(Map json) => + PartnerFinanceSummary( + partnerId: json['partner_id'] != null + ? (json['partner_id'] as num).toInt() + : null, + partnerName: json['partner_name'] as String? ?? '', + type: json['type'] as String, + recordCount: (json['record_count'] as num?)?.toInt() ?? 0, + totalAmount: (json['total_amount'] as num?)?.toDouble() ?? 0, + ); +} + +/// GET /finance/trend 点：月度收支（in=销售额、out=采购额，单位元）。 +class TrendPoint { + final String month; // "2026-01" + final double inAmount; + final double outAmount; + + const TrendPoint( + {required this.month, required this.inAmount, required this.outAmount}); + + factory TrendPoint.fromJson(Map json) => TrendPoint( + month: json['month'] as String? ?? '', + inAmount: (json['in'] as num?)?.toDouble() ?? 0, + outAmount: (json['out'] as num?)?.toDouble() ?? 0, + ); +} diff --git a/client/lib/models/inventory.dart b/client/lib/models/inventory.dart index 26e2e53..a0d2918 100644 --- a/client/lib/models/inventory.dart +++ b/client/lib/models/inventory.dart @@ -79,12 +79,19 @@ class InventorySummary { final double inStockQty; final int shortageCount; final int warningCount; + // 月初快照（KPI 环比）：由 inventory_logs 反推 + final int lastMonthSku; + final double lastMonthQty; + final double lastMonthValue; const InventorySummary({ this.skuCount = 0, this.stockValue = 0, this.inStockQty = 0, this.shortageCount = 0, this.warningCount = 0, + this.lastMonthSku = 0, + this.lastMonthQty = 0, + this.lastMonthValue = 0, }); factory InventorySummary.fromJson(Map j) => InventorySummary( skuCount: (j['sku_count'] as num?)?.toInt() ?? 0, @@ -92,6 +99,9 @@ class InventorySummary { inStockQty: (j['in_stock_qty'] as num?)?.toDouble() ?? 0, shortageCount: (j['shortage_count'] as num?)?.toInt() ?? 0, warningCount: (j['warning_count'] as num?)?.toInt() ?? 0, + lastMonthSku: (j['last_month_sku'] as num?)?.toInt() ?? 0, + lastMonthQty: (j['last_month_qty'] as num?)?.toDouble() ?? 0, + lastMonthValue: (j['last_month_value'] as num?)?.toDouble() ?? 0, ); } @@ -138,8 +148,7 @@ class InventoryLog { ? (json['qty_after'] as num).toDouble() : null, refType: json['ref_type'] as String?, - refId: - json['ref_id'] != null ? (json['ref_id'] as num).toInt() : null, + refId: json['ref_id'] != null ? (json['ref_id'] as num).toInt() : null, createdAt: json['created_at'] as String?, ); } diff --git a/client/lib/models/license.dart b/client/lib/models/license.dart index c0321f6..0bf6eaf 100644 --- a/client/lib/models/license.dart +++ b/client/lib/models/license.dart @@ -22,8 +22,8 @@ class LicenseInfo { id: (json['id'] as num?)?.toInt() ?? 0, type: json['type'] as String? ?? 'trial', isActive: json['is_active'] as bool? ?? false, - maxDevices: - (json['max_devices'] as num?)?.toInt() ?? AppConstants.defaultMaxDevices, + maxDevices: (json['max_devices'] as num?)?.toInt() ?? + AppConstants.defaultMaxDevices, expiresAt: json['expires_at'] != null ? DateTime.tryParse(json['expires_at'] as String) : null, @@ -44,8 +44,7 @@ class LicenseInfo { } } - bool get isExpired => - expiresAt != null && DateTime.now().isAfter(expiresAt!); + bool get isExpired => expiresAt != null && DateTime.now().isAfter(expiresAt!); int? get daysRemaining { if (expiresAt == null) return null; @@ -62,5 +61,6 @@ class LicenseInfo { bool get isReadOnlyPhase => phase == 'readonly' || phase == 'locked'; bool get isLockedPhase => phase == 'locked'; - bool get needsAttention => phase == 'grace' || phase == 'readonly' || phase == 'locked'; + bool get needsAttention => + phase == 'grace' || phase == 'readonly' || phase == 'locked'; } diff --git a/client/lib/models/number_rule.dart b/client/lib/models/number_rule.dart index 2c4a070..c12a3fb 100644 --- a/client/lib/models/number_rule.dart +++ b/client/lib/models/number_rule.dart @@ -30,7 +30,8 @@ class NumberRule { String get exampleNo { final now = DateTime.now(); - final date = '${now.year}${now.month.toString().padLeft(2, '0')}${now.day.toString().padLeft(2, '0')}'; + final date = + '${now.year}${now.month.toString().padLeft(2, '0')}${now.day.toString().padLeft(2, '0')}'; return '$prefix$date${(currentNo + 1).toString().padLeft(3, '0')}'; } diff --git a/client/lib/models/partner.dart b/client/lib/models/partner.dart index 9e9f2b6..ad268fb 100644 --- a/client/lib/models/partner.dart +++ b/client/lib/models/partner.dart @@ -2,11 +2,12 @@ class Partner { final int id; final String? code; final String name; - final String type; // supplier | customer + final String type; // supplier | customer | supplier,customer(两者) final String? contact; final String? phone; final String? address; final String? bankAccount; + final double balance; // 期初余额（存档字段，不参与应收应付聚合） final String status; final String? remark; @@ -19,10 +20,19 @@ class Partner { this.phone, this.address, this.bankAccount, + this.balance = 0, this.status = 'enabled', this.remark, }); + /// 类型徽章文案（原型 b-供应商/b-客户/b-两者）：SET 双值 = 两者 + String get typeLabel { + final isSupplier = type.contains('supplier'); + final isCustomer = type.contains('customer'); + if (isSupplier && isCustomer) return '两者'; + return isCustomer ? '客户' : '供应商'; + } + factory Partner.fromJson(Map json) => Partner( id: (json['id'] as num).toInt(), code: json['code'] as String?, @@ -32,6 +42,7 @@ class Partner { phone: json['phone'] as String?, address: json['address'] as String?, bankAccount: json['bank_account'] as String?, + balance: (json['balance'] as num?)?.toDouble() ?? 0, status: json['status'] as String? ?? 'enabled', remark: json['remark'] as String?, ); diff --git a/client/lib/models/product.dart b/client/lib/models/product.dart index 39600ca..efb56d6 100644 --- a/client/lib/models/product.dart +++ b/client/lib/models/product.dart @@ -82,12 +82,18 @@ class Product { ?.map((e) => ProductImage.fromJson(e as Map)) .toList() ?? [], - originName: (json['origin'] as Map?)?['name'] as String?, - shelfLifeName: (json['shelf_life'] as Map?)?['name'] as String?, - storageName: (json['storage'] as Map?)?['name'] as String?, - categoryName: (json['category'] as Map?)?['name'] as String?, - descriptionDocTitle: (json['description_doc'] as Map?)?['title'] as String?, - descriptionDocContent: (json['description_doc'] as Map?)?['content'] as String?, + originName: + (json['origin'] as Map?)?['name'] as String?, + shelfLifeName: + (json['shelf_life'] as Map?)?['name'] as String?, + storageName: + (json['storage'] as Map?)?['name'] as String?, + categoryName: + (json['category'] as Map?)?['name'] as String?, + descriptionDocTitle: (json['description_doc'] + as Map?)?['title'] as String?, + descriptionDocContent: (json['description_doc'] + as Map?)?['content'] as String?, ); Map toJson() => { diff --git a/client/lib/models/stock_in.dart b/client/lib/models/stock_in.dart index a6ffa71..27040a0 100644 --- a/client/lib/models/stock_in.dart +++ b/client/lib/models/stock_in.dart @@ -52,29 +52,30 @@ class StockInItem { } return StockInItem( - id: json['id'] != null ? (json['id'] as num).toInt() : null, - orderId: json['order_id'] != null - ? (json['order_id'] as num).toInt() - : null, - productId: (json['product_id'] as num).toInt(), - quantity: (json['quantity'] as num).toDouble(), - unitPrice: (json['unit_price'] as num).toDouble(), - totalPrice: (json['total_price'] as num).toDouble(), - returnedQuantity: (json['returned_quantity'] as num?)?.toDouble() ?? 0, - batchNo: json['batch_no'] as String?, - productionDate: json['production_date'] as String?, - productName: lineOrProduct('product_name', 'name'), - productCode: lineOrProduct('product_code', 'code'), - productSeries: lineOrProduct('series', 'series'), - productSpec: lineOrProduct('spec', 'spec'), - productUnit: (json['product'] as Map?)?['unit'] as String?, - productOrigin: ((json['product'] as Map?)?['origin'] - as Map?)?['name'] as String?, - productShelfLife: ((json['product'] as Map?)?['shelf_life'] - as Map?)?['name'] as String?, - productStorage: ((json['product'] as Map?)?['storage'] - as Map?)?['name'] as String?, - ); + id: json['id'] != null ? (json['id'] as num).toInt() : null, + orderId: + json['order_id'] != null ? (json['order_id'] as num).toInt() : null, + productId: (json['product_id'] as num).toInt(), + quantity: (json['quantity'] as num).toDouble(), + unitPrice: (json['unit_price'] as num).toDouble(), + totalPrice: (json['total_price'] as num).toDouble(), + returnedQuantity: (json['returned_quantity'] as num?)?.toDouble() ?? 0, + batchNo: json['batch_no'] as String?, + productionDate: json['production_date'] as String?, + productName: lineOrProduct('product_name', 'name'), + productCode: lineOrProduct('product_code', 'code'), + productSeries: lineOrProduct('series', 'series'), + productSpec: lineOrProduct('spec', 'spec'), + productUnit: + (json['product'] as Map?)?['unit'] as String?, + productOrigin: ((json['product'] as Map?)?['origin'] + as Map?)?['name'] as String?, + productShelfLife: + ((json['product'] as Map?)?['shelf_life'] + as Map?)?['name'] as String?, + productStorage: ((json['product'] as Map?)?['storage'] + as Map?)?['name'] as String?, + ); } Map toJson() => { @@ -133,19 +134,23 @@ class StockInOrder { orderNo: json['order_no'] as String, type: json['type'] as String?, warehouseId: (json['warehouse_id'] as num).toInt(), - warehouseName: (json['warehouse'] as Map?)?['name'] as String?, + warehouseName: + (json['warehouse'] as Map?)?['name'] as String?, partnerId: json['partner_id'] != null ? (json['partner_id'] as num).toInt() : null, - partnerName: (json['partner'] as Map?)?['name'] as String?, + partnerName: + (json['partner'] as Map?)?['name'] as String?, operatorId: json['operator_id'] != null ? (json['operator_id'] as num).toInt() : null, - operatorName: (json['operator'] as Map?)?['real_name'] as String?, + operatorName: (json['operator'] as Map?)?['real_name'] + as String?, reviewerId: json['reviewer_id'] != null ? (json['reviewer_id'] as num).toInt() : null, - reviewerName: (json['reviewer'] as Map?)?['real_name'] as String?, + reviewerName: (json['reviewer'] as Map?)?['real_name'] + as String?, status: json['status'] as String, returnState: json['return_state'] as String? ?? 'none', orderDate: json['order_date'] as String?, @@ -156,8 +161,7 @@ class StockInOrder { remark: json['remark'] as String?, items: json['items'] != null ? (json['items'] as List) - .map((e) => - StockInItem.fromJson(e as Map)) + .map((e) => StockInItem.fromJson(e as Map)) .toList() : [], ); diff --git a/client/lib/models/stock_out.dart b/client/lib/models/stock_out.dart index cdc51ec..95b5763 100644 --- a/client/lib/models/stock_out.dart +++ b/client/lib/models/stock_out.dart @@ -46,25 +46,25 @@ class StockOutItem { } return StockOutItem( - id: json['id'] != null ? (json['id'] as num).toInt() : null, - orderId: json['order_id'] != null - ? (json['order_id'] as num).toInt() - : null, - productId: (json['product_id'] as num).toInt(), - quantity: (json['quantity'] as num).toDouble(), - unitPrice: (json['unit_price'] as num).toDouble(), - salePrice: (json['sale_price'] as num?)?.toDouble() ?? 0, - totalPrice: (json['total_price'] as num).toDouble(), - returnedQuantity: (json['returned_quantity'] as num?)?.toDouble() ?? 0, - productName: lineOrProduct('product_name', 'name'), - productCode: lineOrProduct('product_code', 'code'), - productSeries: lineOrProduct('series', 'series'), - productSpec: lineOrProduct('spec', 'spec'), - productUnit: (json['product'] as Map?)?['unit'] as String?, - // 批次号/生产日期：优先明细行快照，回退 product 关联（App 新建单据快照列常为空） - batchNo: lineOrProduct('batch_no', 'batch_no'), - productionDate: lineOrProduct('production_date', 'production_date'), - ); + id: json['id'] != null ? (json['id'] as num).toInt() : null, + orderId: + json['order_id'] != null ? (json['order_id'] as num).toInt() : null, + productId: (json['product_id'] as num).toInt(), + quantity: (json['quantity'] as num).toDouble(), + unitPrice: (json['unit_price'] as num).toDouble(), + salePrice: (json['sale_price'] as num?)?.toDouble() ?? 0, + totalPrice: (json['total_price'] as num).toDouble(), + returnedQuantity: (json['returned_quantity'] as num?)?.toDouble() ?? 0, + productName: lineOrProduct('product_name', 'name'), + productCode: lineOrProduct('product_code', 'code'), + productSeries: lineOrProduct('series', 'series'), + productSpec: lineOrProduct('spec', 'spec'), + productUnit: + (json['product'] as Map?)?['unit'] as String?, + // 批次号/生产日期：优先明细行快照，回退 product 关联（App 新建单据快照列常为空） + batchNo: lineOrProduct('batch_no', 'batch_no'), + productionDate: lineOrProduct('production_date', 'production_date'), + ); } } @@ -116,19 +116,23 @@ class StockOutOrder { orderNo: json['order_no'] as String, type: json['type'] as String?, warehouseId: (json['warehouse_id'] as num).toInt(), - warehouseName: (json['warehouse'] as Map?)?['name'] as String?, + warehouseName: + (json['warehouse'] as Map?)?['name'] as String?, partnerId: json['partner_id'] != null ? (json['partner_id'] as num).toInt() : null, - partnerName: (json['partner'] as Map?)?['name'] as String?, + partnerName: + (json['partner'] as Map?)?['name'] as String?, operatorId: json['operator_id'] != null ? (json['operator_id'] as num).toInt() : null, - operatorName: (json['operator'] as Map?)?['real_name'] as String?, + operatorName: (json['operator'] as Map?)?['real_name'] + as String?, reviewerId: json['reviewer_id'] != null ? (json['reviewer_id'] as num).toInt() : null, - reviewerName: (json['reviewer'] as Map?)?['real_name'] as String?, + reviewerName: (json['reviewer'] as Map?)?['real_name'] + as String?, status: json['status'] as String, returnState: json['return_state'] as String? ?? 'none', orderDate: json['order_date'] as String?, @@ -140,8 +144,7 @@ class StockOutOrder { remark: json['remark'] as String?, items: json['items'] != null ? (json['items'] as List) - .map((e) => - StockOutItem.fromJson(e as Map)) + .map((e) => StockOutItem.fromJson(e as Map)) .toList() : [], ); diff --git a/client/lib/models/stock_summary.dart b/client/lib/models/stock_summary.dart index f598f44..616bf0e 100644 --- a/client/lib/models/stock_summary.dart +++ b/client/lib/models/stock_summary.dart @@ -24,10 +24,12 @@ class StockSummary { ); /// 笔数环比（%）；上月为 0 时返回 null（无从比较）。 - double? get countDeltaPct => - lastMonthCount == 0 ? null : (monthCount - lastMonthCount) / lastMonthCount * 100; + double? get countDeltaPct => lastMonthCount == 0 + ? null + : (monthCount - lastMonthCount) / lastMonthCount * 100; /// 金额环比（%）；上月为 0 时返回 null。 - double? get amountDeltaPct => - lastMonthAmount == 0 ? null : (monthAmount - lastMonthAmount) / lastMonthAmount * 100; + double? get amountDeltaPct => lastMonthAmount == 0 + ? null + : (monthAmount - lastMonthAmount) / lastMonthAmount * 100; } diff --git a/client/lib/models/user.dart b/client/lib/models/user.dart index c58d233..99a3ff5 100644 --- a/client/lib/models/user.dart +++ b/client/lib/models/user.dart @@ -3,9 +3,10 @@ class AppUser { final String username; final String? realName; final String? phone; - final String role; // admin | operator | readonly + final String role; // superadmin | admin | operator | readonly final bool isActive; final String? createdAt; + final String? lastLoginAt; const AppUser({ required this.id, @@ -15,6 +16,7 @@ class AppUser { required this.role, required this.isActive, this.createdAt, + this.lastLoginAt, }); String get roleLabel { @@ -40,5 +42,6 @@ class AppUser { role: json['role'] as String? ?? 'operator', isActive: json['is_active'] as bool? ?? true, createdAt: json['created_at'] as String?, + lastLoginAt: json['last_login_at'] as String?, ); } diff --git a/client/lib/providers/changelog_provider.dart b/client/lib/providers/changelog_provider.dart new file mode 100644 index 0000000..dbf17d1 --- /dev/null +++ b/client/lib/providers/changelog_provider.dart @@ -0,0 +1,48 @@ +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../core/api/api_client.dart'; + +/// 更新日志条目（GET /public/release 的 changelog 数组，源自 version.yaml， +/// 与官网下载页时间线同源）。 +class ChangelogEntry { + final String version; + final String date; + final String intro; + final List<({String type, List items})> sections; + + const ChangelogEntry({ + required this.version, + required this.date, + this.intro = '', + this.sections = const [], + }); + + factory ChangelogEntry.fromJson(Map json) => ChangelogEntry( + version: json['version'] as String? ?? '', + date: json['date'] as String? ?? '', + intro: json['intro'] as String? ?? '', + sections: [ + for (final s in (json['sections'] as List? ?? const [])) + if (s is Map) + ( + type: s['type'] as String? ?? '', + items: [ + for (final it in (s['items'] as List? ?? const [])) '$it', + ], + ), + ], + ); +} + +/// 关于页更新日志（接口不可达时返回空列表，页面回退只显当前版本）。 +final changelogProvider = FutureProvider>((ref) async { + try { + final resp = await ref.watch(apiClientProvider).get('/public/release'); + final data = resp.data as Map; + return [ + for (final e in (data['changelog'] as List? ?? const [])) + ChangelogEntry.fromJson(e as Map), + ]; + } catch (_) { + return const []; + } +}); diff --git a/client/lib/providers/connectivity_provider.dart b/client/lib/providers/connectivity_provider.dart index 34159c5..048b100 100644 --- a/client/lib/providers/connectivity_provider.dart +++ b/client/lib/providers/connectivity_provider.dart @@ -91,7 +91,8 @@ class ConnectivityNotifier extends StateNotifier { /// 连通性检测。[withRetry]=true 时按 [_budgets] 退避重试，间隔递增。 Future _check({bool withRetry = false}) async { - final budgets = withRetry ? _budgets : AppConstants.connectivitySingleBudget; + final budgets = + withRetry ? _budgets : AppConstants.connectivitySingleBudget; var ok = false; for (var i = 0; i < budgets.length; i++) { ok = await _ping(budgets[i]); diff --git a/client/lib/providers/finance_provider.dart b/client/lib/providers/finance_provider.dart index 97d40d1..b1720fd 100644 --- a/client/lib/providers/finance_provider.dart +++ b/client/lib/providers/finance_provider.dart @@ -20,6 +20,8 @@ class FinanceListNotifier extends AsyncNotifier> { int _pageSize = AppConstants.defaultPageSize; String _type = ''; String _month = ''; + String _startDate = ''; + String _endDate = ''; @override Future> build() { @@ -31,6 +33,8 @@ class FinanceListNotifier extends AsyncNotifier> { return ref.read(financeRepositoryProvider).listRecords( type: _type.isEmpty ? null : _type, month: _month.isEmpty ? null : _month, + startDate: _startDate.isEmpty ? null : _startDate, + endDate: _endDate.isEmpty ? null : _endDate, page: _page, pageSize: _pageSize, ); @@ -44,6 +48,17 @@ class FinanceListNotifier extends AsyncNotifier> { void setMonth(String month) { _month = month; + _startDate = ''; + _endDate = ''; + _page = 1; + reload(); + } + + /// 日期区间（本季/自定义时间范围）；与 month 互斥。 + void setRange(String startDate, String endDate) { + _startDate = startDate; + _endDate = endDate; + _month = ''; _page = 1; reload(); } @@ -60,10 +75,61 @@ class FinanceListNotifier extends AsyncNotifier> { } void reload() { - state = const AsyncValue.loading(); + // 保留上一次数据（isReloading）→ 屏幕渲染旧内容 + 半透明进度，不白屏。 + state = const AsyncValue>.loading() + .copyWithPrevious(state); _fetch().then( (result) => state = AsyncValue.data(result), - onError: (e, st) => state = AsyncValue.error(e, st), + onError: (e, st) => state = + AsyncValue>.error(e, st) + .copyWithPrevious(state), ); } } + +/// 收支趋势（近 6 个自然月，柱状图数据源）。 +final financeTrendProvider = FutureProvider>((ref) async { + ref.watch(authStateProvider.select((s) => s.user?.shopId)); + return ref.read(financeRepositoryProvider).trend(months: 6); +}); + +/// 应收/应付按往来单位汇总行（合并 /finance/summary 的 recv/pay 两类）。 +class PartnerFinanceRow { + final int? partnerId; + final String name; + final double recv; + final double pay; + final int openCount; + const PartnerFinanceRow( + {this.partnerId, + required this.name, + this.recv = 0, + this.pay = 0, + this.openCount = 0}); + + double get net => recv - pay; +} + +final financePartnerRowsProvider = + FutureProvider>((ref) async { + ref.watch(authStateProvider.select((s) => s.user?.shopId)); + final rows = await ref.read(financeRepositoryProvider).partnerSummary(); + final map = {}; + for (final r in rows) { + final key = '${r.partnerId ?? 0}|${r.partnerName}'; + final cur = map[key] ?? + PartnerFinanceRow( + partnerId: r.partnerId, + name: r.partnerName.isEmpty ? '（未指定单位）' : r.partnerName); + map[key] = PartnerFinanceRow( + partnerId: cur.partnerId, + name: cur.name, + recv: cur.recv + (r.type == 'receivable' ? r.totalAmount : 0), + pay: cur.pay + (r.type == 'payable' ? r.totalAmount : 0), + openCount: cur.openCount + r.recordCount, + ); + } + final list = map.values.toList() + ..sort((a, b) => (b.recv + b.pay).compareTo(a.recv + a.pay)); + return list; +}); diff --git a/client/lib/providers/inventory_provider.dart b/client/lib/providers/inventory_provider.dart index ebeabe8..0ee7299 100644 --- a/client/lib/providers/inventory_provider.dart +++ b/client/lib/providers/inventory_provider.dart @@ -29,6 +29,7 @@ class InventoryListNotifier extends AsyncNotifier> { int _pageSize = AppConstants.defaultPageSize; int? _warehouseId; String _keyword = ''; + String _code = ''; // 商品编码独立筛选（原型 codeInput） List _series = []; List _spec = []; PageResult? _cache; @@ -51,6 +52,7 @@ class InventoryListNotifier extends AsyncNotifier> { return ref.read(inventoryRepositoryProvider).listInventory( warehouseId: _warehouseId, keyword: _keyword.isEmpty ? null : _keyword, + code: _code.isEmpty ? null : _code, series: _series.isEmpty ? null : _series, spec: _spec.isEmpty ? null : _spec, page: _page, @@ -81,6 +83,12 @@ class InventoryListNotifier extends AsyncNotifier> { reload(); } + void setCode(String code) { + _code = code; + _page = 1; + reload(); + } + void setSeries(List series) { _series = series; _page = 1; @@ -94,7 +102,9 @@ class InventoryListNotifier extends AsyncNotifier> { } void reload() { - state = const AsyncValue.loading(); + // 保留上一次数据（isReloading）→ 屏幕渲染旧内容 + 半透明进度，不白屏。 + state = const AsyncValue>.loading() + .copyWithPrevious(state); _fetch().then((result) { _cache = result; state = AsyncValue.data(result); diff --git a/client/lib/providers/partner_provider.dart b/client/lib/providers/partner_provider.dart index 6774f82..c840d73 100644 --- a/client/lib/providers/partner_provider.dart +++ b/client/lib/providers/partner_provider.dart @@ -3,9 +3,11 @@ import '../core/api/api_client.dart'; import '../core/auth/auth_state.dart'; import '../core/config/app_constants.dart'; import '../core/models/page_result.dart'; +import '../models/finance.dart'; import '../models/partner.dart'; import '../repositories/partner_repository.dart'; import 'connectivity_provider.dart'; +import 'finance_provider.dart'; final partnerRepositoryProvider = Provider((ref) { return PartnerRepository(ref.watch(apiClientProvider)); @@ -31,8 +33,42 @@ final allPartnersProvider = () => PartnerListNotifier(type: null, pageSize: 1000), ); +/// 往来单位屏专用：单表 + 类型 chips（原型无分页控件，一页取全）。 +final partnersScreenProvider = + AsyncNotifierProvider>( + () => PartnerListNotifier(type: null, pageSize: 1000), +); + +/// 应收/应付余额（原型 recv/pay 两列）：/finance/summary 按 partner 聚合的未结清额。 +/// 返回 partner_id → (recv 应收, pay 应付)。 +final partnerBalancesProvider = + FutureProvider>((ref) async { + ref.watch(authStateProvider.select((s) => s.user?.shopId)); + final rows = await ref.read(financeRepositoryProvider).partnerSummary(); + final map = {}; + for (final r in rows) { + final id = r.partnerId; + if (id == null) continue; + final cur = map[id] ?? (recv: 0.0, pay: 0.0); + map[id] = r.type == 'receivable' + ? (recv: cur.recv + r.totalAmount, pay: cur.pay) + : (recv: cur.recv, pay: cur.pay + r.totalAmount); + } + return map; +}); + +/// 详情抽屉「近期单据」：该往来单位最近的财务流水（应收/应付/收款/付款， +/// 已覆盖入库、出库与收付款的单据轨迹）。 +final partnerRecentDocsProvider = + FutureProvider.family, int>((ref, partnerId) async { + final page = await ref + .read(financeRepositoryProvider) + .listRecords(partnerId: partnerId, pageSize: 8); + return page.data; +}); + class PartnerListNotifier extends AsyncNotifier> { - final String? type; + String? type; int _page = 1; int _pageSize; String _keyword = ''; @@ -81,6 +117,15 @@ class PartnerListNotifier extends AsyncNotifier> { reload(); } + /// 类型筛选（往来单位屏 chips）：null=全部 / 'supplier' / 'customer'。 + /// 后端 FIND_IN_SET 语义：选「供应商」自动含「两者」，与原型一致。 + void setType(String? t) { + if (t == type) return; + type = t; + _page = 1; + reload(); + } + void reload() { state = const AsyncValue.loading(); _fetch().then((result) { diff --git a/client/lib/providers/product_option_provider.dart b/client/lib/providers/product_option_provider.dart index 63caa44..0a6b8c8 100644 --- a/client/lib/providers/product_option_provider.dart +++ b/client/lib/providers/product_option_provider.dart @@ -5,7 +5,8 @@ import '../models/product_option.dart'; import '../providers/connectivity_provider.dart'; import '../repositories/product_option_repository.dart'; -final productOptionRepositoryProvider = Provider((ref) { +final productOptionRepositoryProvider = + Provider((ref) { return ProductOptionRepository(ref.watch(apiClientProvider)); }); @@ -55,7 +56,8 @@ final productSeriesListProvider = ProductSeriesListNotifier.new, ); -class ProductSeriesListNotifier extends AsyncNotifier> { +class ProductSeriesListNotifier + extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); @@ -133,7 +135,8 @@ final productOriginListProvider = ProductOriginListNotifier.new, ); -class ProductOriginListNotifier extends AsyncNotifier> { +class ProductOriginListNotifier + extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); @@ -167,12 +170,13 @@ class ProductOriginListNotifier extends AsyncNotifier> // ── 保质期 ──────────────────────────────────────────────────── -final productShelfLifeListProvider = - AsyncNotifierProvider>( +final productShelfLifeListProvider = AsyncNotifierProvider< + ProductShelfLifeListNotifier, List>( ProductShelfLifeListNotifier.new, ); -class ProductShelfLifeListNotifier extends AsyncNotifier> { +class ProductShelfLifeListNotifier + extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); @@ -206,12 +210,13 @@ class ProductShelfLifeListNotifier extends AsyncNotifier>( +final productStorageListProvider = AsyncNotifierProvider< + ProductStorageListNotifier, List>( ProductStorageListNotifier.new, ); -class ProductStorageListNotifier extends AsyncNotifier> { +class ProductStorageListNotifier + extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); @@ -245,12 +250,13 @@ class ProductStorageListNotifier extends AsyncNotifier>( +final productDescriptionDocListProvider = AsyncNotifierProvider< + ProductDescriptionDocListNotifier, List>( ProductDescriptionDocListNotifier.new, ); -class ProductDescriptionDocListNotifier extends AsyncNotifier> { +class ProductDescriptionDocListNotifier + extends AsyncNotifier> { @override Future> build() async { ref.watch(authStateProvider.select((s) => s.user?.shopId)); @@ -272,7 +278,9 @@ class ProductDescriptionDocListNotifier extends AsyncNotifier updateItem(int id, Map data) async { - await ref.read(productOptionRepositoryProvider).updateDescriptionDoc(id, data); + await ref + .read(productOptionRepositoryProvider) + .updateDescriptionDoc(id, data); reload(); } diff --git a/client/lib/providers/stock_in_provider.dart b/client/lib/providers/stock_in_provider.dart index 5837584..e85d4e5 100644 --- a/client/lib/providers/stock_in_provider.dart +++ b/client/lib/providers/stock_in_provider.dart @@ -20,13 +20,21 @@ final stockInListProvider = StockInListNotifier.new, ); -/// 入库 KPI 汇总（换店/网络恢复自动刷新）。 +/// 入库 KPI 汇总——自然月口径（财务屏「本月采购额」用；换店/网络恢复自动刷新）。 final stockInSummaryProvider = FutureProvider.autoDispose((ref) { ref.watch(authStateProvider.select((s) => s.user?.shopId)); ref.watch(networkRecoveryCountProvider); return ref.read(stockInRepositoryProvider).summary(); }); +/// 入库 KPI 汇总——近 30 天滚动窗（入库列表卡片用；月初自然月全 0，用户拍板改滚动）。 +final stockInSummary30Provider = + FutureProvider.autoDispose((ref) { + ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); + return ref.read(stockInRepositoryProvider).summary(window: 'rolling30'); +}); + class StockInListNotifier extends AsyncNotifier> { int _page = 1; int _pageSize = AppConstants.defaultPageSize; diff --git a/client/lib/providers/stock_out_provider.dart b/client/lib/providers/stock_out_provider.dart index 7820436..5fcf3b6 100644 --- a/client/lib/providers/stock_out_provider.dart +++ b/client/lib/providers/stock_out_provider.dart @@ -20,13 +20,21 @@ final stockOutListProvider = StockOutListNotifier.new, ); -/// 出库 KPI 汇总（换店/网络恢复自动刷新）。 +/// 出库 KPI 汇总——自然月口径（财务屏「本月销售额」用；换店/网络恢复自动刷新）。 final stockOutSummaryProvider = FutureProvider.autoDispose((ref) { ref.watch(authStateProvider.select((s) => s.user?.shopId)); ref.watch(networkRecoveryCountProvider); return ref.read(stockOutRepositoryProvider).summary(); }); +/// 出库 KPI 汇总——近 30 天滚动窗（出库列表卡片用；月初自然月全 0，用户拍板改滚动）。 +final stockOutSummary30Provider = + FutureProvider.autoDispose((ref) { + ref.watch(authStateProvider.select((s) => s.user?.shopId)); + ref.watch(networkRecoveryCountProvider); + return ref.read(stockOutRepositoryProvider).summary(window: 'rolling30'); +}); + class StockOutListNotifier extends AsyncNotifier> { int _page = 1; int _pageSize = AppConstants.defaultPageSize; diff --git a/client/lib/providers/tab_state_provider.dart b/client/lib/providers/tab_state_provider.dart deleted file mode 100644 index 48251ee..0000000 --- a/client/lib/providers/tab_state_provider.dart +++ /dev/null @@ -1,6 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -final stockInTabProvider = StateProvider((ref) => 0); -final stockOutTabProvider = StateProvider((ref) => 0); -final inventoryTabProvider = StateProvider((ref) => 0); -final financeTabProvider = StateProvider((ref) => 0); diff --git a/client/lib/providers/user_provider.dart b/client/lib/providers/user_provider.dart index e7857d3..b116d3a 100644 --- a/client/lib/providers/user_provider.dart +++ b/client/lib/providers/user_provider.dart @@ -8,8 +8,7 @@ final userRepositoryProvider = Provider((ref) { return UserRepository(ref.watch(apiClientProvider)); }); -final userListProvider = - AsyncNotifierProvider>( +final userListProvider = AsyncNotifierProvider>( UserListNotifier.new, ); diff --git a/client/lib/repositories/finance_repository.dart b/client/lib/repositories/finance_repository.dart index 39b02f1..2ccdba4 100644 --- a/client/lib/repositories/finance_repository.dart +++ b/client/lib/repositories/finance_repository.dart @@ -11,6 +11,9 @@ class FinanceRepository { Future> listRecords({ String? type, String? month, + String? startDate, + String? endDate, + int? partnerId, int page = 1, int pageSize = 50, }) async { @@ -20,6 +23,9 @@ class FinanceRepository { 'page_size': pageSize, if (type != null && type.isNotEmpty) 'type': type, if (month != null && month.isNotEmpty) 'month': month, + if (startDate != null && startDate.isNotEmpty) 'start_date': startDate, + if (endDate != null && endDate.isNotEmpty) 'end_date': endDate, + if (partnerId != null) 'partner_id': partnerId, }; final resp = await _client.get('/finance/records', params: params); return PageResult.fromJson( @@ -34,6 +40,41 @@ class FinanceRepository { } } + /// 按往来单位汇总未结清应收/应付（GET /finance/summary） + Future> partnerSummary() async { + try { + final resp = await _client.get('/finance/summary'); + final data = (resp.data as Map)['data']; + return [ + for (final row in (data as List? ?? const [])) + PartnerFinanceSummary.fromJson(row as Map), + ]; + } on DioException catch (e) { + throw AppException( + e.response?.data?['error'] as String? ?? '获取往来汇总失败', + statusCode: e.response?.statusCode, + ); + } + } + + /// 近 N 个自然月收支趋势（GET /finance/trend）：in=当月销售额、out=当月采购额。 + Future> trend({int months = 6}) async { + try { + final resp = + await _client.get('/finance/trend', params: {'months': months}); + final data = (resp.data as Map)['data']; + return [ + for (final row in (data as List? ?? const [])) + TrendPoint.fromJson(row as Map), + ]; + } on DioException catch (e) { + throw AppException( + e.response?.data?['error'] as String? ?? '获取收支趋势失败', + statusCode: e.response?.statusCode, + ); + } + } + Future create(Map body) async { try { await _client.post('/finance/records', data: body); @@ -58,8 +99,8 @@ class FinanceRepository { Future closeByRef(String refType, int refId) async { try { - await _client.put( - '/finance/records/close-by-ref?ref_type=$refType&ref_id=$refId'); + await _client + .put('/finance/records/close-by-ref?ref_type=$refType&ref_id=$refId'); } on DioException catch (e) { throw AppException( e.response?.data?['error'] as String? ?? '结清失败', diff --git a/client/lib/repositories/inventory_repository.dart b/client/lib/repositories/inventory_repository.dart index 858697e..21adf90 100644 --- a/client/lib/repositories/inventory_repository.dart +++ b/client/lib/repositories/inventory_repository.dart @@ -13,6 +13,7 @@ class InventoryRepository { int? warehouseId, int? productId, String? keyword, + String? code, List? series, List? spec, int page = 1, @@ -25,6 +26,7 @@ class InventoryRepository { if (warehouseId != null) 'warehouse_id': warehouseId, if (productId != null) 'product_id': productId, if (keyword != null && keyword.isNotEmpty) 'keyword': keyword, + if (code != null && code.isNotEmpty) 'code': code, if (series != null && series.isNotEmpty) 'series': series.join(','), if (spec != null && spec.isNotEmpty) 'spec': spec.join(','), }; diff --git a/client/lib/repositories/product_option_repository.dart b/client/lib/repositories/product_option_repository.dart index 3de9de6..18cfffd 100644 --- a/client/lib/repositories/product_option_repository.dart +++ b/client/lib/repositories/product_option_repository.dart @@ -14,7 +14,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/names'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductNameOption.fromJson(e as Map)).toList(); + return data + .map((e) => ProductNameOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取名称列表失败', statusCode: e.response?.statusCode); @@ -54,7 +56,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/series'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductSeriesOption.fromJson(e as Map)).toList(); + return data + .map((e) => ProductSeriesOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取系列列表失败', statusCode: e.response?.statusCode); @@ -136,7 +140,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/specs'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductSpecOption.fromJson(e as Map)).toList(); + return data + .map((e) => ProductSpecOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取规格列表失败', statusCode: e.response?.statusCode); @@ -176,7 +182,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/origins'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductOriginOption.fromJson(e as Map)).toList(); + return data + .map((e) => ProductOriginOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取产地列表失败', statusCode: e.response?.statusCode); @@ -216,7 +224,10 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/shelf-lives'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductShelfLifeOption.fromJson(e as Map)).toList(); + return data + .map( + (e) => ProductShelfLifeOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取保质期列表失败', statusCode: e.response?.statusCode); @@ -256,7 +267,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/storages'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductStorageOption.fromJson(e as Map)).toList(); + return data + .map((e) => ProductStorageOption.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取储存方式列表失败', statusCode: e.response?.statusCode); @@ -296,7 +309,9 @@ class ProductOptionRepository { try { final resp = await _client.get('/product-options/description-docs'); final data = (resp.data as Map)['data'] as List? ?? []; - return data.map((e) => ProductDescriptionDoc.fromJson(e as Map)).toList(); + return data + .map((e) => ProductDescriptionDoc.fromJson(e as Map)) + .toList(); } on DioException catch (e) { throw AppException(e.response?.data?['error'] as String? ?? '获取描述文档列表失败', statusCode: e.response?.statusCode); diff --git a/client/lib/repositories/product_repository.dart b/client/lib/repositories/product_repository.dart index 6d248f6..6a0e4dd 100644 --- a/client/lib/repositories/product_repository.dart +++ b/client/lib/repositories/product_repository.dart @@ -113,12 +113,14 @@ class ProductRepository { try { final MultipartFile file; if (bytes != null) { - file = MultipartFile.fromBytes(bytes, filename: fileName ?? 'image.jpg'); + file = + MultipartFile.fromBytes(bytes, filename: fileName ?? 'image.jpg'); } else { file = await MultipartFile.fromFile(filePath!); } final formData = FormData.fromMap({'file': file}); - final resp = await _client.post('/products/$productId/images', data: formData); + final resp = + await _client.post('/products/$productId/images', data: formData); return ProductImage.fromJson( (resp.data as Map)['data'] as Map); } on DioException catch (e) { @@ -170,7 +172,8 @@ class ProductRepository { if (originId != null) body['origin_id'] = originId; if (shelfLifeId != null) body['shelf_life_id'] = shelfLifeId; if (storageId != null) body['storage_id'] = storageId; - if (descriptionDocId != null) body['description_doc_id'] = descriptionDocId; + if (descriptionDocId != null) + body['description_doc_id'] = descriptionDocId; final resp = await _client.post('/products/find-or-create', data: body); return Product.fromJson( (resp.data as Map)['data'] as Map); diff --git a/client/lib/repositories/stock_in_repository.dart b/client/lib/repositories/stock_in_repository.dart index 5050018..d605c2d 100644 --- a/client/lib/repositories/stock_in_repository.dart +++ b/client/lib/repositories/stock_in_repository.dart @@ -42,10 +42,11 @@ class StockInRepository { } } - /// 入库 KPI 汇总（本月笔数/金额 + 上月同期 + 待审核）。 - Future summary() async { + /// 入库 KPI 汇总（默认自然月+上月；[window]='rolling30' 近30天滚动窗+前一窗）。 + Future summary({String? window}) async { try { - final resp = await _client.get('/stock-in/summary'); + final resp = await _client.get('/stock-in/summary', + params: {if (window != null) 'window': window}); return StockSummary.fromJson(resp.data as Map); } on DioException catch (e) { throw AppException( @@ -150,7 +151,8 @@ class StockInRepository { /// 退单：退掉指定明细（item ids）。入库退单对应库存从库存删除。 Future returnItems(int id, List itemIds) async { try { - await _client.post('/stock-in/orders/$id/return', data: {'item_ids': itemIds}); + await _client + .post('/stock-in/orders/$id/return', data: {'item_ids': itemIds}); } on DioException catch (e) { throw AppException( e.response?.data?['error'] as String? ?? '退单失败', @@ -163,7 +165,8 @@ class StockInRepository { /// items 形如 [{'item_id': 1, 'unit_price': 50.0}]。 Future confirmCost(int id, List> items) async { try { - await _client.post('/stock-in/orders/$id/confirm-cost', data: {'items': items}); + await _client + .post('/stock-in/orders/$id/confirm-cost', data: {'items': items}); } on DioException catch (e) { throw AppException( e.response?.data?['error'] as String? ?? '确认进价失败', diff --git a/client/lib/repositories/stock_out_repository.dart b/client/lib/repositories/stock_out_repository.dart index f3a1b05..d302b97 100644 --- a/client/lib/repositories/stock_out_repository.dart +++ b/client/lib/repositories/stock_out_repository.dart @@ -45,10 +45,11 @@ class StockOutRepository { } } - /// 出库 KPI 汇总（本月笔数/金额 + 上月同期 + 待审核）。 - Future summary() async { + /// 出库 KPI 汇总（默认自然月+上月；[window]='rolling30' 近30天滚动窗+前一窗）。 + Future summary({String? window}) async { try { - final resp = await _client.get('/stock-out/summary'); + final resp = await _client.get('/stock-out/summary', + params: {if (window != null) 'window': window}); return StockSummary.fromJson(resp.data as Map); } on DioException catch (e) { throw AppException( @@ -61,8 +62,8 @@ class StockOutRepository { /// 确认售价（先出后定价）：items 为 [{item_id, sale_price}]。 Future confirmSale(int id, List> items) async { try { - await _client.post('/stock-out/orders/$id/confirm-sale', - data: {'items': items}); + await _client + .post('/stock-out/orders/$id/confirm-sale', data: {'items': items}); } on DioException catch (e) { throw AppException( e.response?.data?['error'] as String? ?? '确认售价失败', @@ -166,7 +167,8 @@ class StockOutRepository { /// 退单：退掉指定明细（item ids）。出库退单数量加回库存。 Future returnItems(int id, List itemIds) async { try { - await _client.post('/stock-out/orders/$id/return', data: {'item_ids': itemIds}); + await _client + .post('/stock-out/orders/$id/return', data: {'item_ids': itemIds}); } on DioException catch (e) { throw AppException( e.response?.data?['error'] as String? ?? '退单失败', diff --git a/client/lib/repositories/user_repository.dart b/client/lib/repositories/user_repository.dart index e67e97e..d5e3000 100644 --- a/client/lib/repositories/user_repository.dart +++ b/client/lib/repositories/user_repository.dart @@ -8,7 +8,9 @@ class UserRepository { Future> list() async { final resp = await _client.get('/users'); final data = (resp.data['data'] as List?) ?? []; - return data.map((e) => AppUser.fromJson(e as Map)).toList(); + return data + .map((e) => AppUser.fromJson(e as Map)) + .toList(); } Future create(Map data) async { @@ -22,7 +24,7 @@ class UserRepository { } Future resetPassword(int id, String newPassword) async { - await _client.put('/users/$id/reset-password', - data: {'password': newPassword}); + await _client + .put('/users/$id/reset-password', data: {'password': newPassword}); } } diff --git a/client/lib/screens/about/about_screen.dart b/client/lib/screens/about/about_screen.dart index 4dda016..3f6b759 100644 --- a/client/lib/screens/about/about_screen.dart +++ b/client/lib/screens/about/about_screen.dart @@ -1,20 +1,33 @@ -import 'dart:io'; +// screens/about/about_screen.dart — 关于我们（照原型 about.html 重建）。 +// 居中 col(max760) 四卡：Hero(渐变+链接+反馈) / 产品信息(2×2 cell) / +// 授权信息(3 cell, licenseProvider 实数据) / 更新日志(timeline, /public/release +// 与官网同源，默认 2 条可展开)。旧版多余卡（帮助文档/扫码防伪/系统信息）删除， +// 构建号并入版本 cell 小字（差异记 design/CONTRACT.md）。 import 'package:file_picker/file_picker.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import '../../core/responsive/responsive.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher.dart'; + import '../../core/config/app_config.dart'; import '../../core/config/app_info.dart'; +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; import '../../core/theme/context_tokens.dart'; import '../../core/update/app_updater.dart'; +import '../../core/utils/clock.dart'; import '../../core/utils/dialog_util.dart'; +import '../../providers/changelog_provider.dart'; import '../../providers/feedback_provider.dart'; +import '../../providers/license_provider.dart'; import '../../providers/update_provider.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/brand_mark.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; -/// 「关于我们」独立页面（左侧菜单项）。 class AboutScreen extends ConsumerStatefulWidget { const AboutScreen({super.key}); @@ -23,254 +36,595 @@ class AboutScreen extends ConsumerStatefulWidget { } class _AboutScreenState extends ConsumerState { + bool _logExpanded = false; + static const _logShown = 2; // 原型 SHOWN=2，其余折叠 + @override Widget build(BuildContext context) { - final appVersion = ref.watch(appVersionProvider).valueOrNull ?? 'v1.0.0'; - final updateInfo = ref.watch(updateProvider).valueOrNull; + final t = context.tokens; + return Container( + color: t.bg, + child: SingleChildScrollView( + padding: context.isMobile + ? const EdgeInsets.all(AppDims.sp4) + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Center( + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 760), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _heroCard(t), + _productCard(t), + _licenseCard(t), + _changelogCard(t), + // 页脚 + Padding( + padding: const EdgeInsets.only(top: 4, bottom: 12), + child: Text('© 2026 岩美科技 · 保留所有权利', + textAlign: TextAlign.center, + style: TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + ), + ], + ), + ), + ), + ), + ); + } - return SingleChildScrollView( - padding: const EdgeInsets.all(24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + /// 原型 .card：surface / border / r-lg / pad 20 22 / mb18。 + Widget _card(dynamic t, Widget child, {Gradient? gradient}) => Container( + margin: const EdgeInsets.only(bottom: 18), + padding: const EdgeInsets.fromLTRB(22, 20, 22, 20), + decoration: BoxDecoration( + color: gradient == null ? t.surface : null, + gradient: gradient, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: child, + ); + + /// 卡标题（.card-h 17/700 + primary 图标）。 + Widget _cardH(dynamic t, IconData icon, String title) => Padding( + padding: const EdgeInsets.only(bottom: 14), + child: Row(children: [ + Icon(icon, size: 18, color: t.primary), + const SizedBox(width: 8), + Text(title, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + ]), + ); + + // ── 卡1：Hero（渐变 + 链接 2×2 + 意见反馈）────────────────── + Widget _heroCard(dynamic t) { + final mobile = context.isMobile; + return _card( + t, + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [t.brand50, t.surface], + ), + Column( + crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - // ── 版本信息 ── - _AboutSection( - title: '版本信息', - children: [ - _AboutRow(label: '当前版本', value: appVersion), - if (updateInfo != null && updateInfo.hasUpdate) - _AboutRow( - label: '最新版本', - value: 'v${updateInfo.latestVersion}', - valueColor: context.tokens.success, - trailing: TextButton( - onPressed: () => startInAppUpdate(context, updateInfo), - child: const Text('立即更新'), - ), - ) - else - _AboutRow( - label: '最新版本', - value: updateInfo != null ? '已是最新' : '检查中…', - valueColor: context.tokens.muted, - trailing: TextButton( - onPressed: () async { - final messenger = ScaffoldMessenger.of(context); - messenger.showSnackBar( - const SnackBar(content: Text('正在检查更新…'))); - await ref.read(updateProvider.notifier).forceCheck(); - if (!context.mounted) return; - final r = ref.read(updateProvider).valueOrNull; - messenger.hideCurrentSnackBar(); - final String msg; - if (r == null) { - msg = '检查更新失败，请检查网络'; - } else if (r.hasUpdate) { - msg = '发现新版本 v${r.latestVersion}'; - } else { - msg = '已是最新版本（v${r.latestVersion}）'; - } - messenger.showSnackBar(SnackBar(content: Text(msg))); - }, - child: const Text('检查更新'), - ), - ), - ], - ), - const SizedBox(height: 20), - - // ── 帮助与文档 ── - _AboutSection( - title: '帮助与文档', - children: [ - const _AboutRow(label: '使用手册', value: '查看产品使用文档与操作指南'), - const SizedBox(height: 8), - Wrap( - spacing: 8, + // .hero-top：62×62 logo（真相源 BrandMark，镜像原型 hero SVG）+ 名称/by + Row(children: [ + const BrandMark(size: 62), + const SizedBox(width: 18), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - OutlinedButton.icon( - onPressed: () async { - final url = Uri.parse( - AppInfo.docsUrl.isNotEmpty - ? AppInfo.docsUrl - : '${AppInfo.website}/docs/'); - if (await canLaunchUrl(url)) launchUrl(url); - }, - icon: const Icon(Icons.menu_book_outlined, size: 16), - label: const Text('打开文档'), - ), - OutlinedButton.icon( - onPressed: () async { - final url = Uri.parse('${AppInfo.website}/changelog/'); - if (await canLaunchUrl(url)) launchUrl(url); - }, - icon: const Icon(Icons.history_outlined, size: 16), - label: const Text('更新日志'), - ), + Text('岩美酒库', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w800, + color: t.heading)), + const SizedBox(height: 4), + Text('酒水进销存 · 财务对账 · 防伪溯源一体化 · 岩美科技出品', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), ], ), - ], + ), + ]), + // .hero-links：2×2 链接 + Container( + margin: const EdgeInsets.only(top: 16), + padding: const EdgeInsets.only(top: 14), + decoration: BoxDecoration( + border: Border(top: BorderSide(color: t.borderSubtle))), + child: mobile + ? Column(children: [ + for (final l in _links()) + Padding( + padding: const EdgeInsets.only(bottom: 10), + child: _linkRow(t, l), + ), + ]) + : Column(children: [ + for (var row = 0; row < 2; row++) + Padding( + padding: EdgeInsets.only(bottom: row == 0 ? 10 : 0), + child: Row(children: [ + for (var col = 0; col < 2; col++) ...[ + if (col > 0) const SizedBox(width: 10), + Expanded( + child: _linkRow(t, _links()[row * 2 + col])), + ], + ]), + ), + ]), ), - const SizedBox(height: 20), - - // ── 关于我们 ── - _AboutSection( - title: '关于我们', - children: [ - _AboutRow(label: '服务商', value: AppInfo.provider), - _AboutRow( - label: '官方网站', - value: AppInfo.website, - trailing: AppInfo.website.isNotEmpty - ? TextButton( - onPressed: () async { - final uri = Uri.parse(AppInfo.website); - if (await canLaunchUrl(uri)) launchUrl(uri); - }, - child: const Text('访问', style: TextStyle(fontSize: 12)), - ) - : null, - ), - _AboutRow(label: '联系邮箱', value: AppInfo.email), - if (AppInfo.phone.isNotEmpty) - _AboutRow(label: '联系电话', value: AppInfo.phone), - if (AppInfo.wechat.isNotEmpty) - _AboutRow(label: '微信', value: AppInfo.wechat), - const _AboutRow(label: '服务时间', value: '周一至周五 9:00–18:00'), - const SizedBox(height: 8), - Wrap( - spacing: 8, - children: [ - OutlinedButton.icon( - onPressed: () async { - final uri = Uri.parse( - 'mailto:${AppInfo.email}?subject=酒库管理系统咨询'); - if (await canLaunchUrl(uri)) launchUrl(uri); - }, - icon: const Icon(Icons.email_outlined, size: 16), - label: const Text('发送邮件'), - ), - ], - ), - ], - ), - const SizedBox(height: 20), - - // ── 扫码防伪 ── - const _AboutSection( - title: '扫码防伪', - children: [ - _AboutRow( - label: '功能说明', - value: '每件商品可生成专属二维码，顾客扫码即可查看商品名称、系列、规格及批次信息，帮助验证商品真实性。', - ), - ], - ), - const SizedBox(height: 20), - - // ── 法律信息 ── - _AboutSection( - title: '法律信息', - children: [ - if (AppInfo.termsUrl.isNotEmpty) - _AboutRow( - label: '服务条款', - value: '查看服务条款', - trailing: TextButton( - onPressed: () async { - final uri = Uri.parse(AppInfo.termsUrl); - if (await canLaunchUrl(uri)) launchUrl(uri); - }, - child: const Text('查看', style: TextStyle(fontSize: 12)), - ), - ), - if (AppInfo.privacyUrl.isNotEmpty) - _AboutRow( - label: '隐私政策', - value: '查看隐私政策', - trailing: TextButton( - onPressed: () async { - final uri = Uri.parse(AppInfo.privacyUrl); - if (await canLaunchUrl(uri)) launchUrl(uri); - }, - child: const Text('查看', style: TextStyle(fontSize: 12)), - ), - ), - _AboutRow(label: '版权', value: '© ${DateTime.now().year} ${AppInfo.provider}'), - ], - ), - const SizedBox(height: 20), - - // ── 系统信息 ── - _AboutSection( - title: '系统信息', - children: [ - _AboutRow( - label: '运行平台', - value: kIsWeb - ? 'Web' - : Platform.isAndroid - ? 'Android' - : Platform.isIOS - ? 'iOS' - : Platform.isMacOS - ? 'macOS' - : Platform.isWindows - ? 'Windows' - : Platform.operatingSystem, - ), - _AboutRow(label: '应用版本', value: appVersion), - FutureBuilder( - future: PackageInfo.fromPlatform(), - builder: (ctx, snap) => _AboutRow( - label: '构建号', - value: snap.data?.buildNumber ?? '-', + // .hero-acts：意见反馈 + Container( + margin: const EdgeInsets.only(top: 16), + padding: const EdgeInsets.only(top: 14), + decoration: BoxDecoration( + border: Border(top: BorderSide(color: t.borderSubtle))), + child: Row(children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('意见反馈', + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(height: 2), + Text('遇到 Bug 或有功能建议，欢迎告诉我们', + style: + TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ], ), ), - ], - ), - const SizedBox(height: 20), - - // ── 意见反馈 ── - _AboutSection( - title: '意见反馈', - children: [ - const _AboutRow( - label: '问题反馈', - value: '遇到 Bug 或有功能建议，欢迎告知我们', - ), - const SizedBox(height: 8), - Wrap( - spacing: 8, - children: [ - ElevatedButton.icon( - onPressed: () => _showFeedbackDialog(isBug: true), - icon: const Icon(Icons.bug_report_outlined, size: 16), - label: const Text('反馈 Bug'), - ), - OutlinedButton.icon( - onPressed: () => _showFeedbackDialog(isBug: false), - icon: const Icon(Icons.lightbulb_outline, size: 16), - label: const Text('功能建议'), - ), - ], - ), - ], + DsFeedbackButtons(onOpen: _openFeedback), + ]), ), ], ), ); } - void _showFeedbackDialog({required bool isBug}) { + List<({IconData icon, String label, VoidCallback onTap})> _links() => [ + ( + icon: LucideIcons.globe, + label: '官网', + onTap: () => _open(AppInfo.website), + ), + ( + icon: LucideIcons.messageCircle, + label: '微信客服', + onTap: () { + showDsToast(context, + '微信客服：${AppInfo.wechat.isNotEmpty ? AppInfo.wechat : '请见官网'}'); + }, + ), + ( + // 原型 i-ic03 = lock + icon: LucideIcons.lock, + label: '隐私政策', + onTap: () => _open(AppInfo.privacyUrl.isNotEmpty + ? AppInfo.privacyUrl + : '${AppInfo.website}/privacy/'), + ), + ( + icon: LucideIcons.fileText, + label: '服务条款', + onTap: () => _open(AppInfo.termsUrl.isNotEmpty + ? AppInfo.termsUrl + : '${AppInfo.website}/terms/'), + ), + ]; + + Future _open(String url) async { + if (url.isEmpty) return; + final uri = Uri.parse(url); + if (await canLaunchUrl(uri)) launchUrl(uri); + } + + /// 原型 .link-row：icon + 文字 + ›。 + Widget _linkRow( + dynamic t, ({IconData icon, String label, VoidCallback onTap}) l) { + return InkWell( + onTap: l.onTap, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 40, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.borderSubtle), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + Icon(l.icon, size: 15, color: t.primary), + const SizedBox(width: 9), + Expanded( + child: Text(l.label, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text)), + ), + Text('›', + style: TextStyle(fontSize: AppDims.fsTitle, color: t.faint)), + ]), + ), + ); + } + + void _openFeedback({required bool isBug}) { showAppDialog( context: context, builder: (_) => _FeedbackDialog(type: isBug ? 'bug' : 'suggestion'), ); } + + // ── 卡2：产品信息（2×2 cell）─────────────────────────────── + Widget _productCard(dynamic t) { + final appVersion = ref.watch(appVersionProvider).valueOrNull ?? 'v1.0.0'; + final mobile = context.isMobile; + final cells = [ + _infoCell( + t, + '当前版本', + Row(children: [ + // 原型 .iv.mono：fs-title 15 / w700 / mono + Text(appVersion, + style: TextStyle( + fontSize: AppDims.fsTitle, + fontWeight: FontWeight.w700, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.heading)), + const SizedBox(width: 6), + FutureBuilder( + future: PackageInfo.fromPlatform(), + builder: (_, snap) => Text( + snap.hasData ? 'build ${snap.data!.buildNumber}' : '', + style: TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + ), + const Spacer(), + DsSmallGhostButton( + label: '检查更新', icon: LucideIcons.refreshCw, onTap: _checkUpdate), + ]), + ), + _infoCell(t, '出品方', _iv(t, '岩美科技 · YANMEI TECH')), + _infoCell(t, '多端覆盖', _iv(t, 'Web · macOS · Windows · iOS · 安卓')), + _infoCell(t, '产品定位', _iv(t, '酒水进销存 / 财务 / 防伪溯源')), + ]; + return _card( + t, + Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [ + _cardH(t, LucideIcons.box, '产品信息'), + if (mobile) + Column(children: [ + for (final c in cells) + Padding(padding: const EdgeInsets.only(bottom: 10), child: c), + ]) + else + Column(children: [ + for (var row = 0; row < 2; row++) + Padding( + padding: EdgeInsets.only(bottom: row == 0 ? 14 : 0), + child: IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var col = 0; col < 2; col++) ...[ + if (col > 0) const SizedBox(width: 14), + Expanded(child: cells[row * 2 + col]), + ], + ], + ), + ), + ), + ]), + ]), + ); + } + + Widget _iv(dynamic t, String v) => Text(v, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.heading)); + + /// 原型 .info-cell：bg 底 / border-subtle / r-md / pad 14 16。 + Widget _infoCell(dynamic t, String label, Widget value) => Container( + padding: const EdgeInsets.fromLTRB(16, 14, 16, 14), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.borderSubtle), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted)), + const SizedBox(height: 6), + value, + ], + ), + ); + + Future _checkUpdate() async { + showDsToast(context, '正在检查更新…'); + await ref.read(updateProvider.notifier).forceCheck(); + if (!mounted) return; + final r = ref.read(updateProvider).valueOrNull; + if (r == null) { + showDsToast(context, '检查更新失败，请检查网络'); + } else if (r.hasUpdate) { + showDsToast(context, '发现新版本 v${r.latestVersion}'); + startInAppUpdate(context, r); + } else { + showDsToast(context, '已是最新版 v${r.latestVersion} ✓'); + } + } + + // ── 卡3：授权信息（3 cell）───────────────────────────────── + Widget _licenseCard(dynamic t) { + final lic = ref.watch(licenseProvider).valueOrNull; + final expires = lic?.expiresAt != null + ? DateFormat('yyyy-MM-dd').format(lic!.expiresAt!) + : '—'; + // 状态/剩余天数走可注入时钟（golden 确定化） + final active = lic?.isActive == true && + (lic?.expiresAt == null || lic!.expiresAt!.isAfter(appNow())); + final days = lic?.expiresAt != null + ? lic!.expiresAt!.difference(appNow()).inDays.clamp(0, 99999) + : null; + final mobile = context.isMobile; + final cells = [ + _licCell(t, '授权状态', active ? '已授权' : '未授权', + color: active ? t.success : t.warn), + _licCell(t, '到期日', expires), + _licCell(t, '剩余天数', days != null ? '$days 天' : '—'), + ]; + return _card( + t, + Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [ + _cardH(t, LucideIcons.shieldCheck, '授权信息'), + if (mobile) + Column(children: [ + for (final c in cells) + Padding(padding: const EdgeInsets.only(bottom: 10), child: c), + ]) + else + Row(children: [ + for (var i = 0; i < cells.length; i++) ...[ + if (i > 0) const SizedBox(width: 14), + Expanded(child: cells[i]), + ], + ]), + ]), + ); + } + + /// 原型 .lic-cell：lk 11 muted + lv 17/700/mono。 + Widget _licCell(dynamic t, String label, String value, {Color? color}) => + Container( + padding: const EdgeInsets.fromLTRB(16, 14, 16, 14), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.borderSubtle), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted)), + const SizedBox(height: 6), + Text(value, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: color ?? t.heading)), + ], + ), + ); + + // ── 卡4：更新日志（timeline，默认 2 条 + 展开）─────────────── + Widget _changelogCard(dynamic t) { + final appVersion = ref.watch(appVersionProvider).valueOrNull ?? ''; + final entries = ref.watch(changelogProvider).valueOrNull ?? const []; + final shown = _logExpanded ? entries : entries.take(_logShown).toList(); + return _card( + t, + Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [ + _cardH(t, LucideIcons.history, '更新日志'), + if (entries.isEmpty) + Padding( + padding: const EdgeInsets.only(bottom: 4), + child: Text(appVersion.isEmpty ? '暂无更新记录' : '当前版本 $appVersion', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ) + else ...[ + // .timeline：左竖线 + 圆点 + for (var i = 0; i < shown.length; i++) + _tlItem(t, shown[i], current: i == 0, last: i == shown.length - 1), + if (entries.length > _logShown) + Padding( + padding: const EdgeInsets.only(top: 10), + child: Align( + alignment: Alignment.centerLeft, + child: DsSmallGhostButton( + label: _logExpanded ? '收起' : '更多历史更新', + onTap: () => setState(() => _logExpanded = !_logExpanded), + ), + ), + ), + ], + ]), + ); + } + + Widget _tlItem(dynamic t, ChangelogEntry e, + {required bool current, required bool last}) { + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // 竖线 + 圆点 + SizedBox( + width: 24, + child: Column(children: [ + Container( + width: 9, + height: 9, + margin: const EdgeInsets.only(top: 4), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: current ? t.primary : t.surface, + border: Border.all(color: t.primary, width: 1.5), + ), + ), + if (!last) + Expanded( + child: Container(width: 1.5, color: t.borderSubtle), + ), + ]), + ), + Expanded( + child: Padding( + padding: const EdgeInsets.only(bottom: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row(children: [ + Text('v${e.version}', + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsBody, + color: t.heading)), + const SizedBox(width: 8), + Text(e.date, + style: + TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + ]), + for (final s in e.sections) ...[ + const SizedBox(height: 8), + _tlTag(t, s.type), + for (final item in s.items) + Padding( + padding: const EdgeInsets.only(top: 4, left: 2), + child: Text('· $item', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.text)), + ), + ], + ], + ), + ), + ), + ], + ), + ); + } + + /// 原型 .tl-tag：feat=success / impr=info(primary) / fix=warn。 + Widget _tlTag(dynamic t, String type) { + final (label, color) = switch (type) { + 'feat' || '新功能' => ('新功能', t.success), + 'impr' || 'improve' || '改进' => ('改进', t.primary), + 'fix' || '修复' => ('修复', t.warn), + _ => (type, t.muted), + }; + return Text(label, + style: TextStyle( + fontSize: AppDims.fsXs, fontWeight: FontWeight.w700, color: color)); + } } -/// 反馈表单弹窗：文字 + 附图，直接提交后台。 +/// hero-acts 的两个反馈按钮（原型 .btn.primary 反馈 Bug + .btn.ghost 功能建议）。 +class DsFeedbackButtons extends StatelessWidget { + final void Function({required bool isBug}) onOpen; + const DsFeedbackButtons({super.key, required this.onOpen}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + Widget btn(String label, IconData icon, bool primary) => InkWell( + onTap: () => onOpen(isBug: primary), + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 38, + padding: const EdgeInsets.symmetric(horizontal: 16), + decoration: BoxDecoration( + color: primary ? t.primary : t.surface, + border: Border.all(color: primary ? t.primary : t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(mainAxisSize: MainAxisSize.min, children: [ + Icon(icon, size: 16, color: primary ? t.onPrimary : t.text), + const SizedBox(width: 7), + Text(label, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: primary ? t.onPrimary : t.text)), + ]), + ), + ); + return Row(mainAxisSize: MainAxisSize.min, children: [ + btn('反馈 Bug', LucideIcons.bug, true), + const SizedBox(width: 10), + btn('功能建议', LucideIcons.lightbulb, false), + ]); + } +} + +/// 小号 ghost 按钮（.btn.ghost.sm，可带前导图标）。 +class DsSmallGhostButton extends StatelessWidget { + final String label; + final IconData? icon; + final VoidCallback onTap; + const DsSmallGhostButton( + {super.key, required this.label, this.icon, required this.onTap}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 32, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + alignment: Alignment.center, + child: Row(mainAxisSize: MainAxisSize.min, children: [ + if (icon != null) ...[ + Icon(icon, size: 14, color: t.text), + const SizedBox(width: 6), + ], + Text(label, + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.text)), + ]), + ), + ); + } +} + +/// 反馈表单弹窗：文字 + 附图，直接提交后台（沿用原实现）。 class _FeedbackDialog extends ConsumerStatefulWidget { final String type; // bug / suggestion const _FeedbackDialog({required this.type}); @@ -312,8 +666,7 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('图片上传失败：$e'))); + showDsToast(context, '图片上传失败：$e'); } } finally { if (mounted) setState(() => _uploading = false); @@ -322,8 +675,7 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { Future _submit() async { if (_ctrl.text.trim().isEmpty && _images.isEmpty) { - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('请填写反馈内容或添加图片'))); + showDsToast(context, '请先填写反馈内容'); return; } setState(() => _submitting = true); @@ -335,23 +687,22 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { ); if (!mounted) return; Navigator.pop(context); - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('反馈已提交，感谢您的反馈！'))); + showDsToast(context, '已提交反馈，感谢你的反馈 ✓'); } catch (e) { if (!mounted) return; setState(() => _submitting = false); - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('提交失败：$e'))); + showDsToast(context, '提交失败：$e'); } } @override Widget build(BuildContext context) { + final t = context.tokens; final isBug = widget.type == 'bug'; return AlertDialog( title: Text(isBug ? '反馈 Bug' : '功能建议'), content: SizedBox( - width: context.dialogWidth(440), + width: context.dialogWidth(480), child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, @@ -360,7 +711,7 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { controller: _ctrl, maxLines: 6, decoration: InputDecoration( - hintText: isBug ? '请描述问题的复现步骤和预期行为…' : '请描述您希望增加的功能…', + hintText: isBug ? '请描述你遇到的问题或建议，我们会尽快跟进…' : '请描述您希望增加的功能…', border: const OutlineInputBorder(), ), ), @@ -369,8 +720,8 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { spacing: 8, runSpacing: 8, children: [ - for (int i = 0; i < _images.length; i++) _thumb(i), - if (_images.length < _maxImages) _addButton(), + for (int i = 0; i < _images.length; i++) _thumb(t, i), + if (_images.length < _maxImages) _addButton(t), ], ), if (_uploading) @@ -389,24 +740,23 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { ), ), actions: [ - TextButton( - onPressed: _submitting ? null : () => Navigator.pop(context), - child: const Text('取消'), - ), - ElevatedButton( + DsButton('取消', + onPressed: _submitting ? null : () => Navigator.pop(context)), + DsButton( + _submitting ? '提交中…' : '提交反馈', + variant: DsBtnVariant.primary, onPressed: (_submitting || _uploading) ? null : _submit, - child: Text(_submitting ? '提交中…' : '提交'), ), ], ); } - Widget _thumb(int i) { + Widget _thumb(dynamic t, int i) { return Stack( clipBehavior: Clip.none, children: [ ClipRRect( - borderRadius: BorderRadius.circular(6), + borderRadius: BorderRadius.circular(AppDims.rMd), child: Image.network( '${AppConfig.baseUrl}${_images[i]}', width: 64, @@ -415,8 +765,8 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { errorBuilder: (_, __, ___) => Container( width: 64, height: 64, - color: Colors.grey.shade200, - child: const Icon(Icons.broken_image, size: 20), + color: t.borderSubtle, + child: Icon(LucideIcons.imageOff, size: 20, color: t.muted), ), ), ), @@ -426,10 +776,10 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { child: GestureDetector( onTap: () => setState(() => _images.removeAt(i)), child: Container( - decoration: const BoxDecoration( - color: Colors.black54, shape: BoxShape.circle), padding: const EdgeInsets.all(2), - child: const Icon(Icons.close, size: 14, color: Colors.white), + decoration: + BoxDecoration(color: t.danger, shape: BoxShape.circle), + child: Icon(LucideIcons.x, size: 12, color: t.onPrimary), ), ), ), @@ -437,85 +787,19 @@ class _FeedbackDialogState extends ConsumerState<_FeedbackDialog> { ); } - Widget _addButton() { + Widget _addButton(dynamic t) { return InkWell( onTap: _uploading ? null : _addImages, + borderRadius: BorderRadius.circular(AppDims.rMd), child: Container( width: 64, height: 64, decoration: BoxDecoration( - border: Border.all(color: Colors.grey.shade400), - borderRadius: BorderRadius.circular(6), + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + color: t.bg, ), - child: const Icon(Icons.add_a_photo_outlined, color: Colors.grey), - ), - ); - } -} - -// ── 关于页辅助 widgets ────────────────────────────────────── - -class _AboutSection extends StatelessWidget { - final String title; - final List children; - const _AboutSection({required this.title, required this.children}); - - @override - Widget build(BuildContext context) { - return Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(title, - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const Divider(height: 24), - ...children, - ], - ), - ), - ); - } -} - -class _AboutRow extends StatelessWidget { - final String label; - final String value; - final Color? valueColor; - final Widget? trailing; - - const _AboutRow({ - required this.label, - required this.value, - this.valueColor, - this.trailing, - }); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 6), - child: Row( - children: [ - SizedBox( - width: 88, - child: Text(label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), - ), - Expanded( - child: Text(value, - style: TextStyle( - fontSize: 13, - color: valueColor ?? context.tokens.text, - fontWeight: FontWeight.w500)), - ), - if (trailing != null) trailing!, - ], + child: Icon(LucideIcons.imagePlus, size: 20, color: t.muted), ), ); } diff --git a/client/lib/screens/auth/auth_shared.dart b/client/lib/screens/auth/auth_shared.dart new file mode 100644 index 0000000..1aa79ad --- /dev/null +++ b/client/lib/screens/auth/auth_shared.dart @@ -0,0 +1,125 @@ +// screens/auth/auth_shared.dart — 登录/注册两屏共用的原型 1:1 骨架。 +// 对应 login.html / register.html 的公共部分： +// body：--page 底、居中、pad 24； +// 主题切换：主界面同款小衣服 ThemePickerPill（onSurface 浅色变体）， +// 放表单面板右上角（2026-07-03 用户拍板，替代原型的 A/B/C 圆钮）； +// .auth：两栏卡片（surface / 1px border / r-xl / sh-3，overflow hidden）； +// .brand：左侧品牌渐变面板 linear-gradient(150deg, side-bg, side-active-bg)。 +// 窄屏（≤ context.isMobile）折叠为单列，隐藏 pts/steps（原型 @media 760px 同构， +// 断点遵项目规则统一走 isMobile）。 +import 'package:flutter/material.dart'; + +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../widgets/theme_picker_pill.dart'; + +/// 整页骨架：page 底 + 居中滚动 + 两栏卡片 + 右上角主题切换器。 +/// [brand]/[form] 为两栏内容；宽屏按 [brandWidth]/[formWidth] 定宽 +/// （其一为 null 表示该栏弹性 1fr），窄屏纵向堆叠。 +class AuthPageScaffold extends StatelessWidget { + final Widget brand; + final Widget form; + final double maxWidth; + final double narrowMaxWidth; + final double? brandWidth; // null = 弹性栏 + final double? formWidth; // null = 弹性栏 + const AuthPageScaffold({ + super.key, + required this.brand, + required this.form, + required this.maxWidth, + required this.narrowMaxWidth, + this.brandWidth, + this.formWidth, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final narrow = context.isMobile; + // 表单面板右上角叠主题小衣服（宽/窄屏都落在白底表单区上） + final formWithPill = Stack( + children: [ + form, + const Positioned( + top: 14, right: 16, child: ThemePickerPill(onSurface: true)), + ], + ); + final card = Container( + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rXl), + boxShadow: [ + BoxShadow( + color: t.shadow, offset: const Offset(0, 12), blurRadius: 34), + ], + ), + child: narrow + ? Column( + mainAxisSize: MainAxisSize.min, children: [brand, formWithPill]) + : IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (brandWidth != null) + SizedBox(width: brandWidth, child: brand) + else + Expanded(child: brand), + if (formWidth != null) + SizedBox(width: formWidth, child: formWithPill) + else + Expanded(child: formWithPill), + ], + ), + ), + ); + return Scaffold( + backgroundColor: t.page, + body: SingleChildScrollView( + padding: const EdgeInsets.all(24), + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: MediaQuery.of(context).size.height - 48), + child: Center( + child: ConstrainedBox( + constraints: + BoxConstraints(maxWidth: narrow ? narrowMaxWidth : maxWidth), + child: card, + ), + ), + ), + ), + ); + } +} + +/// 品牌渐变面板容器（.brand）：linear-gradient(150deg, side-bg, side-active-bg)。 +class AuthBrandPanel extends StatelessWidget { + final EdgeInsets padding; + final double? minHeight; + final Widget child; + const AuthBrandPanel( + {super.key, required this.padding, this.minHeight, required this.child}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Container( + constraints: + minHeight != null ? BoxConstraints(minHeight: minHeight!) : null, + padding: padding, + decoration: BoxDecoration( + // 150deg ≈ 从左上偏上往右下（CSS 角度顺时针自 12 点起） + gradient: LinearGradient( + begin: const Alignment(-0.5, -1), + end: const Alignment(0.5, 1), + colors: [t.sideBg, t.sideActiveBg], + ), + ), + child: child, + ); + } +} diff --git a/client/lib/screens/auth/login_screen.dart b/client/lib/screens/auth/login_screen.dart index 39caf3d..403856e 100644 --- a/client/lib/screens/auth/login_screen.dart +++ b/client/lib/screens/auth/login_screen.dart @@ -1,19 +1,35 @@ +// screens/auth/login_screen.dart — 登录页，照原型 login.html 1:1 重建。 +// 结构：--page 底居中 .auth 两栏卡片（左 .brand 品牌渐变面板：logo+名+tag+三卖点； +// 右 .form：h1/lead + 门店编号/登录账号/密码 三字段 + 记住我行 + 主按钮 + foot） +// + 右上角 A/B/C 主题切换器。窄屏折叠单列、隐藏卖点（原型 @media 同构）。 +// 原型之外保留的功能位（known diffs 见 design/CONTRACT.md）： +// · 门店编号/账号历史下拉（后缀箭头）与密码可见切换（后缀眼睛） +// · 离线提示条 / 服务器错误条 / 授权锁定引导卡（表单内、按钮上方） +// · 会话失效弹窗（被顶下线提示） import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import '../../core/responsive/responsive.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:url_launcher/url_launcher.dart'; + import '../../core/auth/auth_state.dart'; import '../../core/config/app_config.dart'; import '../../core/config/app_constants.dart'; -import '../../core/theme/context_tokens.dart'; +import '../../core/responsive/responsive.dart'; import '../../core/storage/login_history.dart'; +import '../../core/theme/app_chrome.g.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; import '../../providers/connectivity_provider.dart'; import '../../repositories/auth_repository.dart'; +import '../../widgets/brand_mark.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; import '../../widgets/network_retry_button.dart'; +import 'auth_shared.dart'; class LoginScreen extends ConsumerStatefulWidget { const LoginScreen({super.key}); @@ -23,17 +39,17 @@ class LoginScreen extends ConsumerStatefulWidget { } class _LoginScreenState extends ConsumerState { - final _formKey = GlobalKey(); final _shopCodeCtrl = TextEditingController(); final _usernameCtrl = TextEditingController(); final _passwordCtrl = TextEditingController(); - final _hotelCodeFocus = FocusNode(); + final _shopFocus = FocusNode(); final _usernameFocus = FocusNode(); - final _hotelLayerLink = LayerLink(); + final _shopLayerLink = LayerLink(); final _usernameLayerLink = LayerLink(); bool _loading = false; bool _obscure = true; + bool _remember = true; String? _errorMessage; // 客服邮箱（授权续费 / 锁定协助）。与官网 web/_data/site.json 的 support.email 保持一致。 @@ -43,49 +59,52 @@ class _LoginScreenState extends ConsumerState { /// `license locked, please renew or contact support`（见 service.ErrLicenseLocked）。 bool get _isLicenseLocked { final m = _errorMessage?.toLowerCase() ?? ''; - return m.contains('license') && (m.contains('lock') || m.contains('expire')); + return m.contains('license') && + (m.contains('lock') || m.contains('expire')); } - List _hotelCodeHistory = []; + List _shopHistory = []; List _usernameHistory = []; - OverlayEntry? _hotelEntry; + OverlayEntry? _shopEntry; OverlayEntry? _usernameEntry; - Timer? _closeHotelTimer; + Timer? _closeShopTimer; Timer? _closeUsernameTimer; - bool get _hotelShowing => _hotelEntry != null; + bool get _shopShowing => _shopEntry != null; bool get _usernameShowing => _usernameEntry != null; @override void initState() { super.initState(); - _loadHistory(); - _hotelCodeFocus.addListener(() { - if (_hotelCodeFocus.hasFocus) { - _closeHotel(); + _restorePrefill(); + _shopFocus.addListener(() { + if (_shopFocus.hasFocus) { + // 取消失焦延迟关闭：快速失焦→回焦时旧 Timer 会误关刚打开的下拉 + _closeShopTimer?.cancel(); + _closeShop(); _loadHistory().then((_) { - if (!mounted || !_hotelCodeFocus.hasFocus) return; - if (_hotelCodeHistory.isNotEmpty) { - _openDropdown(_hotelLayerLink, _hotelCodeHistory, _shopCodeCtrl, - isHotel: true); + if (!mounted || !_shopFocus.hasFocus) return; + if (_shopHistory.isNotEmpty) { + _openDropdown(_shopLayerLink, _shopHistory, _shopCodeCtrl, + isShop: true); } }); } else { // 延迟关闭：让候选词的 onTap（pointer-up）先执行，再关闭下拉框 - _closeHotelTimer?.cancel(); - _closeHotelTimer = - Timer(AppConstants.dropdownCloseDelay, _closeHotel); + _closeShopTimer?.cancel(); + _closeShopTimer = Timer(AppConstants.dropdownCloseDelay, _closeShop); } }); _usernameFocus.addListener(() { if (_usernameFocus.hasFocus) { + _closeUsernameTimer?.cancel(); _closeUsername(); _loadHistory().then((_) { if (!mounted || !_usernameFocus.hasFocus) return; if (_usernameHistory.isNotEmpty) { _openDropdown(_usernameLayerLink, _usernameHistory, _usernameCtrl, - isHotel: false); + isShop: false); } }); } else { @@ -104,6 +123,24 @@ class _LoginScreenState extends ConsumerState { }); } + /// 「记住我」开启时，用最近一次登录的门店编号/账号预填表单。 + Future _restorePrefill() async { + final remember = await LoginHistoryStorage.getRemember(); + await _loadHistory(); + if (!mounted) return; + setState(() { + _remember = remember; + if (remember) { + if (_shopCodeCtrl.text.isEmpty && _shopHistory.isNotEmpty) { + _shopCodeCtrl.text = _shopHistory.first; + } + if (_usernameCtrl.text.isEmpty && _usernameHistory.isNotEmpty) { + _usernameCtrl.text = _usernameHistory.first; + } + } + }); + } + /// 弹出「登录已失效 / 被强制下线」提示弹窗，并清空 provider 避免重复弹。 void _showSessionEndedDialog(String msg) { if (!mounted) return; @@ -111,25 +148,24 @@ class _LoginScreenState extends ConsumerState { showDialog( context: context, builder: (ctx) => AlertDialog( - icon: Icon(Icons.lock_outline, color: context.tokens.danger), + icon: Icon(LucideIcons.lock, color: context.tokens.danger), title: const Text('登录已失效'), content: Text(msg), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('我知道了'), - ), + DsButton('我知道了', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop()), ], ), ); } Future _loadHistory() async { - final hotels = await LoginHistoryStorage.getHotelCodes(); + final shops = await LoginHistoryStorage.getHotelCodes(); final users = await LoginHistoryStorage.getUsernames(); if (!mounted) return; setState(() { - _hotelCodeHistory = hotels; + _shopHistory = shops; _usernameHistory = users; }); } @@ -138,14 +174,14 @@ class _LoginScreenState extends ConsumerState { LayerLink link, List items, TextEditingController ctrl, { - required bool isHotel, + required bool isShop, }) { - if (isHotel) { - if (_hotelEntry != null) return; + if (isShop) { + if (_shopEntry != null) return; _closeUsername(); } else { if (_usernameEntry != null) return; - _closeHotel(); + _closeShop(); } final entry = OverlayEntry( @@ -155,42 +191,28 @@ class _LoginScreenState extends ConsumerState { Positioned.fill( child: GestureDetector( behavior: HitTestBehavior.translucent, - onTap: isHotel ? _closeHotel : _closeUsername, + onTap: isShop ? _closeShop : _closeUsername, ), ), - // Dropdown positioned below the field + // Dropdown positioned below the field（宽随字段：登录表单列宽 340） CompositedTransformFollower( link: link, targetAnchor: Alignment.bottomLeft, followerAnchor: Alignment.topLeft, showWhenUnlinked: false, - child: Material( - elevation: 6, - borderRadius: - const BorderRadius.vertical(bottom: Radius.circular(4)), - child: SizedBox( - width: context.dialogWidth(320), - child: ListView.separated( - padding: EdgeInsets.zero, - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: items.length, - separatorBuilder: (_, __) => const Divider(height: 1), - itemBuilder: (_, i) => _HistoryMenuItem( - value: items[i], - onSelected: () => - _selectHistoryItem(items[i], ctrl, isHotel: isHotel), - ), - ), - ), + offset: const Offset(0, 4), + child: _HistoryMenu( + width: context.dialogWidth(340), + items: items, + onSelected: (v) => _selectHistoryItem(v, ctrl, isShop: isShop), ), ), ], ), ); - if (isHotel) { - _hotelEntry = entry; + if (isShop) { + _shopEntry = entry; } else { _usernameEntry = entry; } @@ -201,16 +223,16 @@ class _LoginScreenState extends ConsumerState { void _selectHistoryItem( String value, TextEditingController ctrl, { - required bool isHotel, + required bool isShop, }) { ctrl.value = TextEditingValue( text: value, selection: TextSelection.collapsed(offset: value.length), ); - if (isHotel) { - _closeHotel(); - _hotelCodeFocus.unfocus(); + if (isShop) { + _closeShop(); + _shopFocus.unfocus(); } else { _closeUsername(); _usernameFocus.unfocus(); @@ -219,9 +241,9 @@ class _LoginScreenState extends ConsumerState { setState(() {}); } - void _closeHotel() { - _hotelEntry?.remove(); - _hotelEntry = null; + void _closeShop() { + _shopEntry?.remove(); + _shopEntry = null; if (mounted) setState(() {}); } @@ -233,20 +255,32 @@ class _LoginScreenState extends ConsumerState { @override void dispose() { - _closeHotelTimer?.cancel(); + _closeShopTimer?.cancel(); _closeUsernameTimer?.cancel(); - _hotelEntry?.remove(); + _shopEntry?.remove(); _usernameEntry?.remove(); _shopCodeCtrl.dispose(); _usernameCtrl.dispose(); _passwordCtrl.dispose(); - _hotelCodeFocus.dispose(); + _shopFocus.dispose(); _usernameFocus.dispose(); super.dispose(); } Future _login() async { - if (!_formKey.currentState!.validate()) return; + // 原型式校验：逐项 toast 提示（无内联错误文案，保持 38 高盒式字段不抖动） + if (_shopCodeCtrl.text.trim().isEmpty) { + showDsToast(context, '请输入门店编号'); + return; + } + if (_usernameCtrl.text.trim().isEmpty) { + showDsToast(context, '请输入登录账号'); + return; + } + if (_passwordCtrl.text.isEmpty) { + showDsToast(context, '请输入密码'); + return; + } // 登录前先检查连通性 final isOnline = ref.read(connectivityProvider); @@ -260,25 +294,24 @@ class _LoginScreenState extends ConsumerState { _errorMessage = null; }); try { - debugPrint('[Login] calling AuthRepository.login...'); final user = await AuthRepository.login( shopCode: _shopCodeCtrl.text.trim(), username: _usernameCtrl.text.trim(), password: _passwordCtrl.text, ); - debugPrint('[Login] API success, username=${user.username}'); - await LoginHistoryStorage.record( - _shopCodeCtrl.text.trim(), - _usernameCtrl.text.trim(), - ); + await LoginHistoryStorage.setRemember(_remember); + if (_remember) { + await LoginHistoryStorage.record( + _shopCodeCtrl.text.trim(), + _usernameCtrl.text.trim(), + ); + } await ref.read(authStateProvider.notifier).login(user); - debugPrint('[Login] notifier.login done, mounted=$mounted, going to /stock-in'); if (mounted) context.go('/stock-in'); - debugPrint('[Login] context.go called'); } on AuthException catch (e) { - setState(() => _errorMessage = e.message); + if (mounted) setState(() => _errorMessage = e.message); } catch (e) { - setState(() => _errorMessage = '登录失败：$e'); + if (mounted) setState(() => _errorMessage = '登录失败：$e'); } finally { if (mounted) setState(() => _loading = false); } @@ -294,82 +327,7 @@ class _LoginScreenState extends ConsumerState { Future _copySupportEmail() async { await Clipboard.setData(const ClipboardData(text: _supportEmail)); if (!mounted) return; - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('已复制客服邮箱：$_supportEmail')), - ); - } - - /// 授权锁定时的可操作提示：告诉用户「去哪里解决」——前往官网续费 / 联系客服。 - Widget _buildLicenseLockedNotice() { - return Container( - width: double.infinity, - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: context.tokens.danger.withAlpha(15), - borderRadius: BorderRadius.circular(6), - border: Border.all(color: context.tokens.danger.withAlpha(80)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Icon(Icons.lock_clock_outlined, - color: context.tokens.danger, size: 18), - const SizedBox(width: 8), - Expanded( - child: Text( - '授权已过期，账号已锁定', - style: TextStyle( - color: context.tokens.danger, - fontSize: 14, - fontWeight: FontWeight.w600), - ), - ), - ], - ), - const SizedBox(height: 6), - Text( - '当前门店授权已到期，暂时无法登录。请续费授权后重试，或联系客服协助开通。', - style: TextStyle( - color: context.tokens.muted, fontSize: 13, height: 1.4), - ), - const SizedBox(height: 12), - Wrap( - spacing: 8, - runSpacing: 8, - children: [ - ElevatedButton.icon( - onPressed: _openRenewSite, - icon: const Icon(Icons.open_in_new, size: 16), - label: const Text('前往官网续费'), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white, - padding: const EdgeInsets.symmetric( - horizontal: 14, vertical: 10), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4)), - ), - ), - OutlinedButton.icon( - onPressed: _copySupportEmail, - icon: const Icon(Icons.support_agent_outlined, size: 16), - label: const Text('复制客服邮箱'), - style: OutlinedButton.styleFrom( - foregroundColor: context.tokens.danger, - side: BorderSide(color: context.tokens.danger.withAlpha(120)), - padding: const EdgeInsets.symmetric( - horizontal: 14, vertical: 10), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4)), - ), - ), - ], - ), - ], - ), - ); + showDsToast(context, '已复制客服邮箱：$_supportEmail'); } @override @@ -383,309 +341,355 @@ class _LoginScreenState extends ConsumerState { }); } }); - return Scaffold( - backgroundColor: context.tokens.primaryDark, - body: Stack( - children: [ - Positioned.fill( - child: CustomPaint(painter: _BackgroundPainter()), + return AuthPageScaffold( + maxWidth: 880, + narrowMaxWidth: 440, + formWidth: 420, // 原型 grid：minmax(0,1fr) 420px + brand: _brand(context), + form: _form(context), + ); + } + + // ── 左栏 .brand：logo + 名 + tag + 三卖点 ──────────────────────────────── + Widget _brand(BuildContext context) { + final t = context.tokens; + final narrow = context.isMobile; + Widget pt(IconData icon, String text) => Row(children: [ + Container( + width: 30, + height: 30, + alignment: Alignment.center, + decoration: BoxDecoration( + color: AppChrome.heroGlass, + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Icon(icon, size: 16, color: t.sideActiveFg), ), - SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints( - minHeight: MediaQuery.of(context).size.height, - ), - child: Center( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 40), - child: Card( - elevation: 12, - shadowColor: Colors.black38, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8)), - child: Container( - width: context.dialogWidth(400), - padding: const EdgeInsets.all(40), - child: Form( - key: _formKey, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - // Logo（岩美酒库品牌 mark，与 App 图标一致） - Container( - width: 80, - height: 80, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(15), - boxShadow: [ - BoxShadow( - color: context.tokens.primary.withAlpha(102), - blurRadius: 12, - offset: const Offset(0, 4), - ), - ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(15), - child: Image.asset( - 'assets/brand/logo_mark.png', - width: 80, - height: 80, - fit: BoxFit.cover, - ), - ), - ), - const SizedBox(height: 20), - Text( - '岩美酒库', - style: TextStyle( - fontSize: 24, - fontWeight: FontWeight.w700, - color: context.tokens.primaryDark, - letterSpacing: 1, - ), - ), - const SizedBox(height: 6), - Text( - '专业酒水仓储 · 进销存一体化管理', - style: TextStyle( - fontSize: 13, - color: context.tokens.muted), - ), - const SizedBox(height: 32), + const SizedBox(width: 11), + Expanded( + child: Text(text, + style: TextStyle(fontSize: AppDims.fsSm, color: t.sideFg)), + ), + ]); + return AuthBrandPanel( + padding: narrow + ? const EdgeInsets.symmetric(horizontal: 32, vertical: 36) + : const EdgeInsets.symmetric(horizontal: 40, vertical: 48), + minHeight: narrow ? null : 480, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const BrandMark(size: 64), + const SizedBox(height: 24), + Text('岩美酒库', + style: TextStyle( + fontSize: AppDims.fsDisplay, + fontWeight: FontWeight.w800, + letterSpacing: 1, + color: t.sideActiveFg)), + const SizedBox(height: 8), + Text('酒水进销存 · 审核驱动业务流', + style: TextStyle( + fontSize: AppDims.fsBody, color: t.sideFg, height: 1.7)), + if (!narrow) ...[ + const Spacer(), + pt(LucideIcons.box, '入库出库 · 审核后实时改库存'), + const SizedBox(height: 14), + pt(LucideIcons.creditCard, '往来对账 · 财务一目了然'), + const SizedBox(height: 14), + pt(LucideIcons.circleCheck, '多端协同 · 多租户安全隔离'), + ], + ], + ), + ); + } - // Shop code field - CompositedTransformTarget( - link: _hotelLayerLink, - child: TextFormField( - controller: _shopCodeCtrl, - focusNode: _hotelCodeFocus, - decoration: InputDecoration( - labelText: '门店编号', - hintText: '请输入门店编号', - prefixIcon: const Icon( - Icons.store_outlined, size: 20), - suffixIcon: _hotelCodeHistory.isNotEmpty - ? Icon( - _hotelShowing - ? Icons.arrow_drop_up - : Icons.arrow_drop_down, - color: context.tokens.muted, - ) - : null, - ), - validator: (v) => - (v == null || v.isEmpty) - ? '请输入门店编号' - : null, - textInputAction: TextInputAction.next, - ), - ), - const SizedBox(height: 14), - - // Username field - CompositedTransformTarget( - link: _usernameLayerLink, - child: TextFormField( - controller: _usernameCtrl, - focusNode: _usernameFocus, - decoration: InputDecoration( - labelText: '用户名', - hintText: '请输入用户名', - prefixIcon: const Icon( - Icons.person_outline, size: 20), - suffixIcon: _usernameHistory.isNotEmpty - ? Icon( - _usernameShowing - ? Icons.arrow_drop_up - : Icons.arrow_drop_down, - color: context.tokens.muted, - ) - : null, - ), - validator: (v) => - (v == null || v.isEmpty) - ? '请输入用户名' - : null, - textInputAction: TextInputAction.next, - ), - ), - const SizedBox(height: 14), - - // Password - TextFormField( - controller: _passwordCtrl, - obscureText: _obscure, - decoration: InputDecoration( - labelText: '密码', - hintText: '请输入密码', - prefixIcon: const Icon(Icons.lock_outline, - size: 20), - suffixIcon: IconButton( - icon: Icon( - _obscure - ? Icons.visibility_off - : Icons.visibility, - size: 20), - onPressed: () => - setState(() => _obscure = !_obscure), - ), - ), - validator: (v) => - (v == null || v.isEmpty) - ? '请输入密码' - : null, - onFieldSubmitted: (_) => _login(), - ), - - // 离线提示（connectivityProvider 在 _AppBootstrap 中已预热） - if (!ref.watch(connectivityProvider)) ...[ - const SizedBox(height: 12), - Container( - width: double.infinity, - padding: const EdgeInsets.symmetric( - horizontal: 12, vertical: 10), - decoration: BoxDecoration( - color: context.tokens.warnBg, - borderRadius: BorderRadius.circular(4), - border: Border.all( - color: - context.tokens.warn.withAlpha(120)), - ), - child: Row( - children: [ - Icon(Icons.wifi_off, - color: context.tokens.warn, size: 16), - const SizedBox(width: 8), - Expanded( - child: Text( - '服务器不可达，请检查网络连接', - style: TextStyle( - color: context.tokens.warn, - fontSize: 13), - ), - ), - NetworkRetryButton( - foreground: context.tokens.warn), - ], - ), - ), - ], - - // Inline error - if (_errorMessage != null) ...[ - const SizedBox(height: 12), - if (_isLicenseLocked) - _buildLicenseLockedNotice() - else - Container( - width: double.infinity, - padding: const EdgeInsets.symmetric( - horizontal: 12, vertical: 10), - decoration: BoxDecoration( - color: context.tokens.danger.withAlpha(15), - borderRadius: BorderRadius.circular(4), - border: Border.all( - color: context.tokens.danger.withAlpha(80)), - ), - child: Row( - children: [ - Icon(Icons.error_outline, - color: context.tokens.danger, size: 16), - const SizedBox(width: 8), - Expanded( - child: Text( - _errorMessage!, - style: TextStyle( - color: context.tokens.danger, - fontSize: 13), - ), - ), - ], - ), - ), - ], - - const SizedBox(height: 24), - SizedBox( - width: double.infinity, - height: 46, - child: ElevatedButton( - onPressed: _loading ? null : _login, - style: ElevatedButton.styleFrom( - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(4)), - ), - child: _loading - ? const SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - strokeWidth: 2, - color: Colors.white)) - : const Text('登 录', - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - letterSpacing: 2)), - ), - ), - const SizedBox(height: 12), - TextButton( - onPressed: () => context.go('/register'), - child: Text( - '还没有门店账号？立即注册', - style: TextStyle( - fontSize: 15, - color: context.tokens.muted, - ), - ), - ), - ], - ), - ), - ), + // ── 右栏 .form ─────────────────────────────────────────────────────────── + Widget _form(BuildContext context) { + final t = context.tokens; + final narrow = context.isMobile; + return Padding( + padding: narrow + ? const EdgeInsets.symmetric(horizontal: 32, vertical: 34) + : const EdgeInsets.symmetric(horizontal: 40, vertical: 48), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('登录', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(height: 6), + Text('欢迎回来，请输入账号信息', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 26), + DsField('门店编号', + input: CompositedTransformTarget( + link: _shopLayerLink, + child: DsInput( + controller: _shopCodeCtrl, + focusNode: _shopFocus, + hintText: '例如 DSJH-001', + suffix: _shopHistory.isNotEmpty + ? Icon( + _shopShowing + ? LucideIcons.chevronUp + : LucideIcons.chevronDown, + size: 16, + color: t.muted) + : null, + ), + )), + const SizedBox(height: 16), + DsField('登录账号', + input: CompositedTransformTarget( + link: _usernameLayerLink, + child: DsInput( + controller: _usernameCtrl, + focusNode: _usernameFocus, + hintText: '请输入登录账号', + suffix: _usernameHistory.isNotEmpty + ? Icon( + _usernameShowing + ? LucideIcons.chevronUp + : LucideIcons.chevronDown, + size: 16, + color: t.muted) + : null, + ), + )), + const SizedBox(height: 16), + DsField('密码', + input: DsInput( + controller: _passwordCtrl, + hintText: '请输入密码', + obscureText: _obscure, + onSubmitted: (_) => _login(), + suffix: MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + onTap: () => setState(() => _obscure = !_obscure), + child: Icon(_obscure ? LucideIcons.eyeOff : LucideIcons.eye, + size: 16, color: t.muted), ), ), - ), + )), + // .remember：记住我 + 忘记密码（margin 4 0 22） + const SizedBox(height: 4), + Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + DsCheck( + value: _remember, + onChanged: (v) { + setState(() => _remember = v); + LoginHistoryStorage.setRemember(v); + }, + label: Text('记住我', + style: + TextStyle(fontSize: AppDims.fsBody, color: t.text)), + ), + _Link('忘记密码？', + onTap: () => showDsToast(context, '找回密码请联系门店管理员')), + ], ), ), - Positioned( - bottom: 16, - left: 0, - right: 0, - child: Center( - child: Text( - '© 2026 岩美酒库 v1.0.0', - style: TextStyle( - color: Colors.white.withAlpha(102), fontSize: 12), + const SizedBox(height: 14), + + // 离线提示（connectivityProvider 在 _AppBootstrap 中已预热） + if (!ref.watch(connectivityProvider)) ...[ + _noticeBox( + color: t.warn, + bg: t.warnBg, + child: Row(children: [ + Icon(LucideIcons.wifiOff, color: t.warn, size: 16), + const SizedBox(width: 8), + Expanded( + child: Text('服务器不可达，请检查网络连接', + style: + TextStyle(color: t.warn, fontSize: AppDims.fsBody)), + ), + NetworkRetryButton(foreground: t.warn), + ]), + ), + const SizedBox(height: 12), + ], + + // 服务器返回错误（授权锁定时换成引导卡） + if (_errorMessage != null) ...[ + if (_isLicenseLocked) + _licenseLockedNotice(context) + else + _noticeBox( + color: t.danger, + bg: t.dangerBg, + child: Row(children: [ + Icon(LucideIcons.circleAlert, color: t.danger, size: 16), + const SizedBox(width: 8), + Expanded( + child: Text(_errorMessage!, + style: TextStyle( + color: t.danger, fontSize: AppDims.fsBody)), + ), + ]), ), + const SizedBox(height: 12), + ], + + SizedBox( + width: double.infinity, + child: DsButton(_loading ? '登录中…' : '登录', + variant: DsBtnVariant.primary, + large: true, + onPressed: _loading ? null : _login), + ), + const SizedBox(height: 24), + Center( + child: Wrap( + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + Text('还没有门店账号？', + style: TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + _Link('注册新门店 →', + bold: true, onTap: () => context.go('/register')), + ], ), ), + const SizedBox(height: 8), + Center( + child: Text('岩美酒库 © 2026 · 仅授权门店可登录', + style: TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + ), + ], + ), + ); + } + + /// 提示条通用外框（离线 / 错误）：淡底 + 同色系边 + r-md。 + Widget _noticeBox( + {required Color color, required Color bg, required Widget child}) { + return Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), + decoration: BoxDecoration( + color: bg, + borderRadius: BorderRadius.circular(AppDims.rMd), + border: Border.all(color: color.withAlpha(80)), + ), + child: child, + ); + } + + /// 授权锁定时的可操作提示：告诉用户「去哪里解决」——前往官网续费 / 联系客服。 + Widget _licenseLockedNotice(BuildContext context) { + final t = context.tokens; + return Container( + width: double.infinity, + padding: const EdgeInsets.all(14), + decoration: BoxDecoration( + color: t.dangerBg, + borderRadius: BorderRadius.circular(AppDims.rMd), + border: Border.all(color: t.danger.withAlpha(80)), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row(children: [ + Icon(LucideIcons.lock, color: t.danger, size: 18), + const SizedBox(width: 8), + Expanded( + child: Text('授权已过期，账号已锁定', + style: TextStyle( + color: t.danger, + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600)), + ), + ]), + const SizedBox(height: 6), + Text('当前门店授权已到期，暂时无法登录。请续费授权后重试，或联系客服协助开通。', + style: TextStyle( + color: t.muted, fontSize: AppDims.fsBody, height: 1.4)), + const SizedBox(height: 12), + Wrap(spacing: 8, runSpacing: 8, children: [ + DsButton('前往官网续费', + icon: LucideIcons.externalLink, + variant: DsBtnVariant.danger, + small: true, + onPressed: _openRenewSite), + DsButton('复制客服邮箱', + icon: LucideIcons.headset, + small: true, + onPressed: _copySupportEmail), + ]), ], ), ); } } -class _BackgroundPainter extends CustomPainter { - @override - void paint(Canvas canvas, Size size) { - final paint = Paint() - ..color = const Color(0xFF1976D2).withAlpha(38) - ..style = PaintingStyle.fill; - canvas.drawCircle( - Offset(size.width * 0.1, size.height * 0.2), 180, paint); - canvas.drawCircle( - Offset(size.width * 0.9, size.height * 0.8), 220, paint); - paint.color = const Color(0xFF0D47A1).withAlpha(26); - canvas.drawCircle( - Offset(size.width * 0.8, size.height * 0.1), 140, paint); - } +/// 原型 .link：primary 色文字链接（hover 下划线从简）。 +class _Link extends StatelessWidget { + final String text; + final bool bold; + final VoidCallback onTap; + const _Link(this.text, {this.bold = false, required this.onTap}); @override - bool shouldRepaint(covariant CustomPainter oldDelegate) => false; + Widget build(BuildContext context) { + final t = context.tokens; + return MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + onTap: onTap, + child: Text(text, + style: TextStyle( + fontSize: bold ? AppDims.fsXs : AppDims.fsSm, + fontWeight: bold ? FontWeight.w600 : FontWeight.w400, + color: t.primary)), + ), + ); + } +} + +/// 历史账号下拉（surface 浮层 + border + sh，条目 hover=rowHover）。 +class _HistoryMenu extends StatelessWidget { + final double width; + final List items; + final ValueChanged onSelected; + const _HistoryMenu( + {required this.width, required this.items, required this.onSelected}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Material( + color: Colors.transparent, + child: Container( + width: width, + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + boxShadow: [ + BoxShadow( + color: t.shadow, offset: const Offset(0, 4), blurRadius: 14), + ], + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + for (final v in items) + _HistoryMenuItem(value: v, onSelected: () => onSelected(v)), + ], + ), + ), + ); + } } class _HistoryMenuItem extends StatefulWidget { @@ -706,30 +710,24 @@ class _HistoryMenuItemState extends State<_HistoryMenuItem> { @override Widget build(BuildContext context) { + final t = context.tokens; return MouseRegion( onEnter: (_) => setState(() => _hovered = true), onExit: (_) => setState(() => _hovered = false), cursor: SystemMouseCursors.click, - child: Material( - color: _hovered ? context.tokens.rowHover : context.tokens.surface, - child: InkWell( - onTap: widget.onSelected, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), - child: Row( - children: [ - Icon(Icons.history, - size: 14, color: context.tokens.muted), - const SizedBox(width: 8), - Text( - widget.value, - style: TextStyle( - fontSize: 14, - color: context.tokens.text, - ), - ), - ], - ), + child: GestureDetector( + onTap: widget.onSelected, + child: Container( + width: double.infinity, + color: _hovered ? t.rowHover : Colors.transparent, + padding: const EdgeInsets.symmetric(horizontal: 11, vertical: 9), + child: Row( + children: [ + Icon(LucideIcons.history, size: 14, color: t.muted), + const SizedBox(width: 8), + Text(widget.value, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text)), + ], ), ), ), diff --git a/client/lib/screens/auth/register_screen.dart b/client/lib/screens/auth/register_screen.dart index 974ad76..c67a87f 100644 --- a/client/lib/screens/auth/register_screen.dart +++ b/client/lib/screens/auth/register_screen.dart @@ -1,14 +1,29 @@ +// screens/auth/register_screen.dart — 自助注册新门店，照原型 register.html 1:1 重建。 +// 结构：--page 底居中 .auth 两栏卡片（左 .brand 380px：logo+开通门店+tag+三步时间线； +// 右 .form：h1/lead + grid2 门店字段 + 分隔线 + grid2 管理员字段 + 协议 + 主按钮 + foot） +// + 右上角 A/B/C 主题切换器。窄屏折叠单列、隐藏步骤时间线。 +// 与原型的差异（记 design/CONTRACT.md）： +// · 无「门店编号」「授权兑换券」字段——后端 RegisterInput 暂不支持（编号自动分配、 +// 兑换券注册后在 系统设置·授权兑换券 激活，与 step3 文案一致）； +// · 门店地址为必填（后端 binding:required；原型为选填）；密码下限 6 位（后端 min=6）。 +// 校验为原型式：提交时逐项 toast。对应后端 POST /api/v1/register。 import 'package:flutter/material.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/responsive/responsive.dart'; -import '../../core/theme/context_tokens.dart'; +import '../../core/theme/app_chrome.g.dart'; import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../core/theme/context_tokens.dart'; import '../../repositories/auth_repository.dart'; +import '../../widgets/brand_mark.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; +import 'auth_shared.dart'; -/// 应用内自助注册新门店（公开页）。提交后创建门店 + 管理员账号， -/// 返回门店编号引导去登录。对应后端 POST /api/v1/register。 class RegisterScreen extends ConsumerStatefulWidget { const RegisterScreen({super.key}); @@ -17,7 +32,6 @@ class RegisterScreen extends ConsumerStatefulWidget { } class _RegisterScreenState extends ConsumerState { - final _formKey = GlobalKey(); final _shopName = TextEditingController(); final _phone = TextEditingController(); final _address = TextEditingController(); @@ -25,14 +39,20 @@ class _RegisterScreenState extends ConsumerState { final _username = TextEditingController(); final _password = TextEditingController(); final _confirm = TextEditingController(); - bool _agree = false; + bool _agree = true; bool _obscure = true; bool _submitting = false; @override void dispose() { for (final c in [ - _shopName, _phone, _address, _manager, _username, _password, _confirm + _shopName, + _phone, + _address, + _manager, + _username, + _password, + _confirm ]) { c.dispose(); } @@ -40,11 +60,33 @@ class _RegisterScreenState extends ConsumerState { } Future _submit() async { - if (!(_formKey.currentState?.validate() ?? false)) return; + // 原型 submitReg 式校验：逐项 toast（无内联错误文案） + if (_shopName.text.trim().isEmpty) { + showDsToast(context, '请填写门店名称'); + return; + } + if (_phone.text.trim().isEmpty) { + showDsToast(context, '请填写联系电话'); + return; + } + if (_address.text.trim().isEmpty) { + showDsToast(context, '请填写门店地址'); + return; + } + if (_manager.text.trim().isEmpty || _username.text.trim().isEmpty) { + showDsToast(context, '请填写管理员姓名与登录账号'); + return; + } + if (_password.text.length < 6) { + showDsToast(context, '密码至少 6 位'); + return; + } + if (_password.text != _confirm.text) { + showDsToast(context, '两次密码不一致'); + return; + } if (!_agree) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('请先阅读并同意服务条款与隐私政策')), - ); + showDsToast(context, '请先同意服务条款与隐私政策'); return; } setState(() => _submitting = true); @@ -70,33 +112,29 @@ class _RegisterScreenState extends ConsumerState { Text('门店「${r.shopName}」已创建。'), const SizedBox(height: 12), Text('门店编号（登录时需用）：', - style: TextStyle(color: context.tokens.muted, fontSize: 13)), + style: TextStyle( + color: context.tokens.muted, fontSize: AppDims.fsBody)), const SizedBox(height: 4), SelectableText(r.shopCode, style: const TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: 18, fontWeight: FontWeight.w700)), ], ), actions: [ - ElevatedButton( - onPressed: () { - Navigator.of(ctx).pop(); - context.go('/login'); - }, - child: const Text('去登录'), - ), + DsButton('去登录', variant: DsBtnVariant.primary, onPressed: () { + Navigator.of(ctx).pop(); + context.go('/login'); + }), ], ), ); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(e.toString().replaceFirst('AuthException: ', '')), - backgroundColor: context.tokens.danger), - ); + showDsToast(context, e.toString().replaceFirst('AuthException: ', ''), + bg: context.tokens.danger); } } finally { if (mounted) setState(() => _submitting = false); @@ -105,207 +143,274 @@ class _RegisterScreenState extends ConsumerState { @override Widget build(BuildContext context) { - final t = context.tokens; - final wide = !context.isMobile; - return Scaffold( - backgroundColor: t.page, - body: Center( - child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 920, maxHeight: 720), - child: Card( - clipBehavior: Clip.antiAlias, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(AppDims.rXl)), - child: Row( - children: [ - if (wide) SizedBox(width: 320, child: _brandPanel(t)), - Expanded(child: _formPanel(t)), - ], - ), - ), - ), - ), + return AuthPageScaffold( + maxWidth: 940, + narrowMaxWidth: 480, + brandWidth: 380, // 原型 grid：minmax(0,380px) minmax(0,1fr) + brand: _brand(context), + form: _form(context), ); } - Widget _brandPanel(t) { - Widget step(int n, String title, String sub) => Padding( - padding: const EdgeInsets.only(bottom: 18), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 24, - height: 24, - alignment: Alignment.center, - decoration: BoxDecoration( - color: t.onPrimary.withValues(alpha: 0.18), - shape: BoxShape.circle), - child: Text('$n', - style: TextStyle( - color: t.onPrimary, - fontSize: 12, - fontWeight: FontWeight.w700)), - ), - const SizedBox(width: 10), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(title, - style: TextStyle( - color: t.onPrimary, - fontSize: AppDims.fsBody, - fontWeight: FontWeight.w600)), - Text(sub, - style: TextStyle( - color: t.onPrimary.withValues(alpha: 0.72), - fontSize: AppDims.fsSm)), - ], - ), - ), - ], - ), - ); - return Container( - color: t.primary, - padding: const EdgeInsets.all(28), + // ── 左栏 .brand：logo + 开通门店 + tag + 三步时间线 ─────────────────────── + Widget _brand(BuildContext context) { + final t = context.tokens; + final narrow = context.isMobile; + return AuthBrandPanel( + padding: narrow + ? const EdgeInsets.symmetric(horizontal: 32, vertical: 34) + : const EdgeInsets.symmetric(horizontal: 38, vertical: 46), + minHeight: narrow ? null : 560, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Icon(Icons.local_bar, color: t.onPrimary, size: 32), - const SizedBox(height: 16), + const BrandMark(size: 60), + const SizedBox(height: 22), Text('开通门店', style: TextStyle( - color: t.onPrimary, - fontSize: AppDims.fsH1, - fontWeight: FontWeight.w700)), + fontSize: AppDims.fsDisplay, + fontWeight: FontWeight.w800, + letterSpacing: 1, + color: t.sideActiveFg)), const SizedBox(height: 8), - Text('几分钟创建你的酒水进销存门店，立即开始入库出库', - style: TextStyle( - color: t.onPrimary.withValues(alpha: 0.78), - fontSize: AppDims.fsSm, - height: 1.6)), - const SizedBox(height: 28), - step(1, '填写门店信息', '店名、编号与联系人'), - step(2, '创建管理员账号', '用于登录与管理成员'), - step(3, '开始使用', '入库录单即自动建档'), + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 260), + child: Text('几分钟创建你的酒水进销存门店，立即开始入库出库', + style: TextStyle( + fontSize: AppDims.fsBody, color: t.sideFg, height: 1.7)), + ), + if (!narrow) ...[ + const SizedBox(height: 36), + const _Step( + n: 1, + done: true, + title: '填写门店信息', + sub: '店名、编号与联系人', + last: false), + const _Step( + n: 2, + done: false, + title: '创建管理员账号', + sub: '用于登录与管理成员', + last: false), + const _Step( + n: 3, + done: false, + title: '激活授权', + sub: '输入兑换券，或先试用', + last: true), + ], ], ), ); } - Widget _formPanel(t) { - return SingleChildScrollView( - padding: const EdgeInsets.all(28), - child: Form( - key: _formKey, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text('注册新门店', - style: TextStyle( - fontSize: AppDims.fsH2, fontWeight: FontWeight.w700)), - const Spacer(), - TextButton( - onPressed: () => context.go('/login'), - child: const Text('已有门店？直接登录 →'), - ), - ], - ), - const SizedBox(height: 16), - _field(_shopName, '门店名称 *', '例如 鼎昌酒行', required: true), - _row2( - _field(_phone, '联系电话 *', '11 位手机号', - required: true, keyboard: TextInputType.phone), - _field(_address, '门店地址 *', '省 / 市 / 区 详细地址', required: true), - ), - _field(_manager, '管理员姓名 *', '例如 王经理', required: true), - _row2( - _field(_username, '登录账号 *', '字母 / 数字', required: true), - const SizedBox.shrink(), - ), - _row2( - _field(_password, '登录密码 *', '至少 6 位', - required: true, obscure: _obscure, minLen: 6), - _field(_confirm, '确认密码 *', '再次输入', - required: true, - obscure: _obscure, - validator: (v) => - v != _password.text ? '两次密码不一致' : null), - ), - CheckboxListTile( - value: _agree, - onChanged: (v) => setState(() => _agree = v ?? false), - controlAffinity: ListTileControlAffinity.leading, - contentPadding: EdgeInsets.zero, - dense: true, - title: Text('我已阅读并同意 服务条款 与 隐私政策', - style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), - ), - const SizedBox(height: 12), - SizedBox( - width: double.infinity, - child: ElevatedButton( - onPressed: _submitting ? null : _submit, - style: ElevatedButton.styleFrom( - padding: const EdgeInsets.symmetric(vertical: 14)), - child: _submitting - ? const SizedBox( - width: 18, - height: 18, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('创建门店并进入'), - ), - ), - ], - ), - ), - ); - } - - Widget _row2(Widget a, Widget b) => Row( + // ── 右栏 .form ─────────────────────────────────────────────────────────── + Widget _form(BuildContext context) { + final t = context.tokens; + final narrow = context.isMobile; + Widget input(TextEditingController c, String hint, + {bool obscure = false, TextInputType? keyboard}) => + DsInput( + controller: c, + hintText: hint, + obscureText: obscure, + keyboardType: keyboard); + // grid2：宽屏两列 gap14，窄屏单列 + Widget row2(Widget a, Widget b) => narrow + ? Column(children: [a, const SizedBox(height: 14), b]) + : Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded(child: a), + const SizedBox(width: 14), + Expanded(child: b), + ]); + return Padding( + padding: narrow + ? const EdgeInsets.symmetric(horizontal: 30, vertical: 32) + : const EdgeInsets.symmetric(horizontal: 42, vertical: 44), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded(child: a), - const SizedBox(width: 12), - Expanded(child: b), - ], - ); + Text('注册新门店', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(height: 6), + Text.rich( + TextSpan( + text: '已有门店账号？', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted), + children: [ + TextSpan( + text: '直接登录 →', + style: TextStyle( + color: t.primary, fontWeight: FontWeight.w600), + recognizer: TapGestureRecognizer() + ..onTap = () => context.go('/login'), + ), + ]), + ), + const SizedBox(height: 24), - Widget _field( - TextEditingController ctrl, - String label, - String hint, { - bool required = false, - bool obscure = false, - int? minLen, - TextInputType? keyboard, - String? Function(String?)? validator, - }) { - return Padding( - padding: const EdgeInsets.only(bottom: 14), - child: TextFormField( - controller: ctrl, - obscureText: obscure, - keyboardType: keyboard, - decoration: InputDecoration( - labelText: label, - hintText: hint, - isDense: true, - border: const OutlineInputBorder(), - ), - validator: validator ?? - (v) { - if (required && (v == null || v.trim().isEmpty)) return '必填'; - if (minLen != null && (v?.length ?? 0) < minLen) { - return '至少 $minLen 位'; - } - return null; - }, + // 门店信息 + DsField('门店名称', required: true, input: input(_shopName, '例如 鼎晟酒行')), + const SizedBox(height: 14), + row2( + DsField('联系电话', + required: true, + input: input(_phone, '11 位手机号', keyboard: TextInputType.phone)), + DsField('门店地址', + required: true, input: input(_address, '省 / 市 / 区 详细地址')), + ), + const SizedBox(height: 6), + Container(height: 1, color: t.borderSubtle), + const SizedBox(height: 16), + + // 管理员账号 + row2( + DsField('管理员姓名', required: true, input: input(_manager, '例如 王经理')), + DsField('登录账号', required: true, input: input(_username, '字母 / 数字')), + ), + const SizedBox(height: 14), + row2( + DsField('登录密码', + required: true, + input: DsInput( + controller: _password, + hintText: '至少 6 位', + obscureText: _obscure, + suffix: MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + onTap: () => setState(() => _obscure = !_obscure), + child: Icon( + _obscure ? LucideIcons.eyeOff : LucideIcons.eye, + size: 16, + color: t.muted), + ), + ), + )), + DsField('确认密码', + required: true, + input: input(_confirm, '再次输入', obscure: _obscure)), + ), + + // .agree：协议勾选（margin 6 0 20） + const SizedBox(height: 16), + DsCheck( + value: _agree, + alignTop: true, + onChanged: (v) => setState(() => _agree = v), + label: Text.rich( + TextSpan( + text: '我已阅读并同意 ', + style: TextStyle(fontSize: AppDims.fsSm, color: t.text), + children: [ + TextSpan( + text: '服务条款', + style: TextStyle(color: t.primary), + recognizer: TapGestureRecognizer() + ..onTap = () => showDsToast(context, '服务条款请见官网底部链接')), + const TextSpan(text: ' 与 '), + TextSpan( + text: '隐私政策', + style: TextStyle(color: t.primary), + recognizer: TapGestureRecognizer() + ..onTap = () => showDsToast(context, '隐私政策请见官网底部链接')), + ]), + ), + ), + const SizedBox(height: 20), + + SizedBox( + width: double.infinity, + child: DsButton(_submitting ? '创建中…' : '创建门店并进入', + variant: DsBtnVariant.primary, + large: true, + onPressed: _submitting ? null : _submit), + ), + const SizedBox(height: 20), + Center( + child: Text('创建即代表你将成为该门店的管理员', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ], + ), + ); + } +} + +/// 原型 .step：29px 序号圆（done=side-active-fg 底反色）+ 标题/副文案 + +/// 节点间 2px hero-glass 连接线（padding-bottom 22）。 +class _Step extends StatelessWidget { + final int n; + final bool done; + final String title; + final String sub; + final bool last; + const _Step( + {required this.n, + required this.done, + required this.title, + required this.sub, + required this.last}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + SizedBox( + width: 29, + child: Column(children: [ + Container( + width: 29, + height: 29, + alignment: Alignment.center, + decoration: BoxDecoration( + color: done ? t.sideActiveFg : AppChrome.heroGlass, + shape: BoxShape.circle, + ), + child: Text('$n', + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w700, + color: done ? t.sideActiveBg : t.sideActiveFg)), + ), + if (!last) + Expanded( + child: Center( + child: Container(width: 2, color: AppChrome.heroGlass)), + ), + ]), + ), + const SizedBox(width: 13), + Expanded( + child: Padding( + padding: EdgeInsets.only(bottom: last ? 0 : 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.sideActiveFg, + height: 1.45)), + Text(sub, + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.sideFg, + height: 1.45)), + ], + ), + ), + ), + ], ), ); } diff --git a/client/lib/screens/devices/device_management_screen.dart b/client/lib/screens/devices/device_management_screen.dart index 998dd2b..50affd9 100644 --- a/client/lib/screens/devices/device_management_screen.dart +++ b/client/lib/screens/devices/device_management_screen.dart @@ -1,234 +1,746 @@ +// screens/devices/device_management_screen.dart — 设备管理（照原型 devices.html 重建）。 +// 三区块：登录设备管理(会话表，后端 /sessions) + 外设设备(卡片网格，店级 +// custom_fields.peripherals 本地存档) + 打印模板(静态两卡)。无 KPI/toolbar/分页。 +// 外设为登记式存档（用户口径）：测试打印/配置为原型态占位，解绑=从清单删除。 import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/auth/auth_state.dart'; +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; import '../../core/theme/context_tokens.dart'; +import '../../core/utils/dialog_util.dart'; import '../../models/session.dart'; import '../../providers/session_provider.dart'; -import '../../widgets/data_table_card.dart'; -import '../../widgets/kpi_card.dart'; +import '../../providers/shop_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_table.dart'; import '../../widgets/mobile_list_card.dart'; +import '../../widgets/write_guard.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; -/// 设备 / 状态管理：本店在线设备/会话列表。 -/// 所有登录用户只读；管理员/超级管理员可「强制下线」其他登录者。 -class DeviceManagementScreen extends ConsumerWidget { +/// 店级 custom_fields.peripherals 的一项（登记式外设存档）。 +class Peripheral { + final String name; + final String kind; // 标签打印机/小票打印机/扫码枪/电子秤 + final String model; // 型号 / 地址 + final String conn; // USB/蓝牙/WiFi/网络 + final String status; // 在线/离线 + final String last; // 最近活动（存档文案） + + const Peripheral({ + required this.name, + required this.kind, + this.model = '', + this.conn = 'USB', + this.status = '在线', + this.last = '刚刚', + }); + + Map toMap() => { + 'name': name, + 'kind': kind, + 'model': model, + 'conn': conn, + 'status': status, + 'last': last, + }; + + factory Peripheral.fromMap(Map m) => Peripheral( + name: m['name'] as String? ?? '', + kind: m['kind'] as String? ?? '外设', + model: m['model'] as String? ?? '', + conn: m['conn'] as String? ?? '', + status: m['status'] as String? ?? '在线', + last: m['last'] as String? ?? '', + ); + + /// 外设类型 → lucide 图标（原型 dev-ic 内联 SVG 的对应物） + IconData get icon => switch (kind) { + '标签打印机' || '小票打印机' => LucideIcons.printer, + '扫码枪' => LucideIcons.scanBarcode, + '电子秤' => LucideIcons.scale, + _ => LucideIcons.cable, + }; +} + +/// 从店信息读外设清单（custom_fields.peripherals）。 +List peripheralsOf(Map customFields) => [ + for (final m in (customFields['peripherals'] as List? ?? const [])) + if (m is Map) Peripheral.fromMap(Map.from(m)), + ]; + +class DeviceManagementScreen extends ConsumerStatefulWidget { const DeviceManagementScreen({super.key}); + @override + ConsumerState createState() => + _DeviceManagementScreenState(); +} + +class _DeviceManagementScreenState + extends ConsumerState { static final _fmt = DateFormat('MM-dd HH:mm'); + static const _kinds = ['标签打印机', '小票打印机', '扫码枪', '电子秤']; + static const _conns = ['USB', '蓝牙', 'WiFi', '网络']; + + void _reload() { + ref.read(sessionListProvider.notifier).reload(); + ref.invalidate(shopInfoProvider); + } + + void _snack(String msg, {bool err = false}) { + showDsToast(context, msg, + bg: err ? context.tokens.danger : context.tokens.success); + } @override - Widget build(BuildContext context, WidgetRef ref) { - final asyncSessions = ref.watch(sessionListProvider); - final role = ref.watch(authStateProvider.select((s) => s.user?.role)); - final canKick = role == 'admin' || role == 'superadmin'; + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + final peripherals = peripheralsOf( + ref.watch(shopInfoProvider).valueOrNull?.customFields ?? const {}); + final on = peripherals.where((p) => p.status == '在线').length; - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.fromLTRB(24, 20, 24, 8), - child: Row( - children: [ - const Text('设备 / 状态管理', - style: - TextStyle(fontSize: 18, fontWeight: FontWeight.w600)), - const SizedBox(width: 12), - Text( - canKick ? '管理员可强制下线其他登录设备' : '仅查看，无操作权限', - style: TextStyle( - fontSize: 12, color: context.tokens.muted), - ), - const Spacer(), - IconButton( - tooltip: '刷新', - icon: const Icon(Icons.refresh, size: 20), - onPressed: () => - ref.read(sessionListProvider.notifier).reload(), - ), - ], - ), - ), - Expanded( - child: asyncSessions.when( - loading: () => - const Center(child: CircularProgressIndicator()), - error: (e, _) => Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, + return Container( + color: t.bg, + child: SingleChildScrollView( + padding: mobile + ? const EdgeInsets.all(AppDims.sp4) + // 原型 .main{padding:22px 26px} + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // ── 头部（原型 .head{margin-bottom:18px}）── + Padding( + padding: const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, children: [ - Icon(Icons.error_outline, - size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('加载失败：$e', - style: - TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton( - onPressed: () => - ref.read(sessionListProvider.notifier).reload(), - child: const Text('重试'), + Text('设备管理', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text('外设连接与打印配置 · 在线 $on/${peripherals.length}', + style: + TextStyle(fontSize: AppDims.fsSm, color: t.muted)), ), + const Spacer(), + if (!mobile) ...[ + DsButton('刷新', icon: LucideIcons.refreshCw, onPressed: () { + _reload(); + _snack('设备状态已刷新 ✓'); + }), + const SizedBox(width: 10), + WriteGuard( + child: DsButton('添加设备', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: _openAdd), + ), + ], ], ), ), - data: (sessions) => - _buildTable(context, ref, sessions, canKick), - ), - ), - ], - ); - } - - Widget _buildTable(BuildContext context, WidgetRef ref, - List sessions, bool canKick) { - // 还原原型 .badge.b-在线/b-离线：圆点软底 pill。 - Widget onlineBadge(bool online) => online - ? StatusPill( - label: '在线', - color: context.tokens.success, - background: context.tokens.okSoft) - : StatusPill( - label: '离线', - color: context.tokens.muted, - background: context.tokens.infoSoft); - - String fmt(DateTime? t) => t == null ? '-' : _fmt.format(t); - - Widget? kickButton(DeviceSession s, {bool dense = false}) { - if (!canKick) return null; - if (s.isCurrent) { - return Text('当前设备', - style: TextStyle(fontSize: 12, color: context.tokens.muted)); - } - return TextButton( - key: Key('btn_kick_${s.id}'), - onPressed: () => _confirmKick(context, ref, s), - child: Text('强制下线', - style: TextStyle( - fontSize: dense ? 13 : 12, color: context.tokens.danger)), - ); - } - - Widget sessionCard(DeviceSession s) { - final action = kickButton(s, dense: true); - return MobileListCard( - title: Text(s.username.isEmpty ? '用户#${s.userId}' : s.username), - subtitle: Text('${s.platformLabel} · ${s.platformClassLabel}'), - trailing: onlineBadge(s.online), - fields: [ - if (s.deviceName.isNotEmpty) MobileCardField('设备', s.deviceName), - if (s.ip.isNotEmpty) MobileCardField('IP', s.ip), - MobileCardField('登录时间', fmt(s.createdAt)), - MobileCardField('最近活跃', fmt(s.lastSeenAt)), - if (s.isCurrent) const MobileCardField('备注', '当前设备'), - ], - actions: action == null ? null : [action], - ); - } - - return DataTableCard( - mobileCards: sessions.map(sessionCard).toList(), - columns: const [ - DataColumn(label: Text('用户')), - DataColumn(label: Text('平台')), - DataColumn(label: Text('设备')), - DataColumn(label: Text('IP')), - DataColumn(label: Text('登录时间')), - DataColumn(label: Text('最近活跃')), - DataColumn(label: Text('状态')), - DataColumn(label: Text('操作')), - ], - rows: sessions.isEmpty - ? [ - DataRow(cells: [ - DataCell(Text('暂无在线设备', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : sessions.map((s) { - return DataRow(cells: [ - DataCell(Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text(s.username.isEmpty ? '用户#${s.userId}' : s.username, - style: - const TextStyle(fontWeight: FontWeight.w500)), - if (s.isCurrent) ...[ - const SizedBox(width: 6), - Container( - padding: const EdgeInsets.symmetric( - horizontal: 6, vertical: 1), - decoration: BoxDecoration( - color: context.tokens.primary.withAlpha(26), - borderRadius: BorderRadius.circular(4), - ), - child: Text('本机', - style: TextStyle( - fontSize: 11, color: context.tokens.primary)), - ), - ], + // ── 区块 A：登录设备管理 ── + _secTitle(t, '登录设备管理', '管理员可强制下线其他登录设备', first: true), + _sessionSection(), + // ── 区块 B：外设设备 ── + _secTitle(t, '外设设备', '共 ${peripherals.length} 台 · 在线 $on'), + if (mobile) + Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var i = 0; i < peripherals.length; i++) ...[ + if (i > 0) const SizedBox(height: 10), + _peripheralMobileCard(peripherals, i), ], - )), - DataCell(Text('${s.platformLabel} · ${s.platformClassLabel}')), - DataCell(Text(s.deviceName.isEmpty ? '-' : s.deviceName)), - DataCell(Text(s.ip.isEmpty ? '-' : s.ip, - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(fmt(s.createdAt))), - DataCell(Text(fmt(s.lastSeenAt))), - DataCell(onlineBadge(s.online)), - DataCell(kickButton(s) ?? const SizedBox()), - ]); - }).toList(), + if (peripherals.isEmpty) _emptyHint(t, '还没有外设 · 点「添加设备」登记'), + const SizedBox(height: 10), + Align( + alignment: Alignment.centerLeft, + child: WriteGuard( + child: DsButton('添加设备', + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: _openAdd), + ), + ), + ], + ) + else + _devGrid(peripherals), + // ── 区块 C：打印模板 ── + _secTitle(t, '打印模板', '标签与小票排版'), + _tplGrid(t, mobile), + ], + ), + ), ); } - Future _confirmKick( - BuildContext context, WidgetRef ref, DeviceSession s) async { + /// 原型 .sec-title：17/700 heading + small 12 muted，margin 26 0 14（首个 0 顶距）。 + Widget _secTitle(dynamic t, String title, String small, + {bool first = false}) => + Padding( + padding: EdgeInsets.only(top: first ? 0 : 26, bottom: 14), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text(title, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: 10), + Padding( + padding: const EdgeInsets.only(bottom: 1), + child: Text(small, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ], + ), + ); + + Widget _emptyHint(dynamic t, String msg) => Padding( + padding: const EdgeInsets.symmetric(vertical: 20), + child: Text(msg, + style: TextStyle(color: t.muted, fontSize: AppDims.fsBody)), + ); + + // ── 区块 A：登录设备（会话表）────────────────────────────── + Widget _sessionSection() { + final t = context.tokens; + final async = ref.watch(sessionListProvider); + final role = ref.watch(authStateProvider.select((s) => s.user?.role)); + final canKick = role == 'admin' || role == 'superadmin'; + + return async.when( + loading: () => const Padding( + padding: EdgeInsets.all(24), + child: Center(child: CircularProgressIndicator()), + ), + error: (e, _) => Row(children: [ + _emptyHint(t, '会话加载失败'), + const SizedBox(width: 10), + DsButton('重试', + small: true, + onPressed: () => ref.read(sessionListProvider.notifier).reload()), + ]), + data: (sessions) { + String fmt(DateTime? d) => d == null ? '—' : _fmt.format(d); + return DsTable( + shrinkWrap: true, + emptyText: '暂无登录设备', + mobileCards: + sessions.map((s) => _sessionMobileCard(s, canKick)).toList(), + columns: const [ + DsColumn('user', '用户'), + DsColumn('platform', '平台'), + DsColumn('device', '设备'), + DsColumn('ip', 'IP'), + DsColumn('login', '登录时间'), + DsColumn('active', '最近活跃'), + DsColumn('status', '状态'), + DsColumn('actions', '操作', action: true), + ], + rows: sessions.map((s) { + return DsRow(cells: [ + Row(mainAxisSize: MainAxisSize.min, children: [ + // 弹性列（列0）被等宽列挤压时名字截断省略，防 Row 溢出 + Flexible( + child: Text(_sessionName(s), + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w600, color: t.heading)), + ), + if (s.isCurrent) ...[ + const SizedBox(width: 6), + // 原型 .self-tag：高18 pad 0 7 info-soft/primary 11/600 + Container( + height: 18, + padding: const EdgeInsets.symmetric(horizontal: 7), + alignment: Alignment.center, + decoration: BoxDecoration( + color: t.infoSoft, + borderRadius: BorderRadius.circular(AppDims.rPill), + ), + child: Text('本机', + style: TextStyle( + fontSize: AppDims.fsXs, + fontWeight: FontWeight.w600, + color: t.primary)), + ), + ], + ]), + Text('${s.platformLabel} · ${s.platformClassLabel}'), + Text(s.deviceName.isEmpty ? s.platform : s.deviceName, + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsSm, + color: t.muted)), + Text(s.ip.isEmpty ? '—' : s.ip, + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(fmt(s.createdAt), + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsSm, + color: t.muted)), + Text(fmt(s.lastSeenAt), + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsSm, + color: t.muted)), + DsBadge(s.online ? '在线' : '离线', + tone: s.online ? DsBadgeTone.ok : DsBadgeTone.muted), + _kickCell(s, canKick), + ]); + }).toList(), + ); + }, + ); + } + + String _sessionName(DeviceSession s) => + s.username.isEmpty ? '用户#${s.userId}' : s.username; + + Widget _kickCell(DeviceSession s, bool canKick) { + final t = context.tokens; + if (s.isCurrent) { + return Text('当前设备', + style: TextStyle(fontSize: AppDims.fsSm, color: t.faint)); + } + if (!canKick) return Text('—', style: TextStyle(color: t.faint)); + return InkWell( + key: Key('btn_kick_${s.id}'), + onTap: () => _confirmKick(s), + child: Text('强制下线', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.danger)), + ); + } + + Widget _sessionMobileCard(DeviceSession s, bool canKick) { + final t = context.tokens; + String fmt(DateTime? d) => d == null ? '—' : _fmt.format(d); + return MobileListCard( + title: Text(_sessionName(s)), + subtitle: Text('${s.platformLabel} · ${s.platformClassLabel}'), + trailing: DsBadge(s.online ? '在线' : '离线', + tone: s.online ? DsBadgeTone.ok : DsBadgeTone.muted), + fields: [ + if (s.ip.isNotEmpty) MobileCardField('IP', s.ip), + MobileCardField('登录时间', fmt(s.createdAt)), + MobileCardField('最近活跃', fmt(s.lastSeenAt)), + if (s.isCurrent) const MobileCardField('备注', '当前设备'), + ], + actions: (canKick && !s.isCurrent) + ? [ + TextButton( + key: Key('btn_kick_${s.id}'), + onPressed: () => _confirmKick(s), + child: Text('强制下线', + style: TextStyle(fontSize: 13, color: t.danger)), + ), + ] + : null, + ); + } + + Future _confirmKick(DeviceSession s) async { final confirmed = await showDialog( context: context, builder: (ctx) => AlertDialog( title: const Text('强制下线'), - content: Text( - '确认将「${s.username.isEmpty ? '用户#${s.userId}' : s.username}」的' - '${s.platformLabel}设备下线？该设备约 30 秒内退出登录。'), + content: Text('确认将「${_sessionName(s)}」的${s.platformLabel}设备下线？' + '该设备约 30 秒内退出登录。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('强制下线'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('强制下线', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); if (confirmed != true) return; try { await ref.read(sessionListProvider.notifier).forceLogout(s.id); - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已下线'), backgroundColor: context.tokens.success)); - } + if (mounted) _snack('已强制下线 · ${_sessionName(s)}'); } catch (e) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('操作失败：$e'), backgroundColor: context.tokens.danger)); - } + if (mounted) _snack('操作失败：$e', err: true); } } + + // ── 区块 B：外设卡片网格（原型 .dev-grid minmax(300,1fr) gap14）──── + Widget _devGrid(List items) { + final t = context.tokens; + if (items.isEmpty) return _emptyHint(t, '还没有外设 · 点「添加设备」登记'); + return LayoutBuilder(builder: (ctx, cons) { + const gap = 14.0; + final cols = (cons.maxWidth / 314).floor().clamp(1, 4); + final w = (cons.maxWidth - gap * (cols - 1)) / cols; + return Wrap( + spacing: gap, + runSpacing: gap, + children: [ + for (var i = 0; i < items.length; i++) + SizedBox(width: w, child: _devCard(items, i)), + ], + ); + }); + } + + Widget _devCard(List items, int index) { + final t = context.tokens; + final d = items[index]; + final online = d.status == '在线'; + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // .dev-top：42×42 图标块 + 名称/类型 + 状态徽章 + Row(children: [ + Container( + width: 42, + height: 42, + decoration: BoxDecoration( + color: t.infoSoft, + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Icon(d.icon, size: 22, color: t.primary), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(d.name, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsTitle, + fontWeight: FontWeight.w700, + color: t.heading)), + Text(d.kind, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ], + ), + ), + DsBadge(d.status, + tone: online ? DsBadgeTone.ok : DsBadgeTone.muted), + ]), + // .dev-rows：型号 / 连接方式 / 最近活动 + Container( + margin: const EdgeInsets.only(top: 12), + padding: const EdgeInsets.only(top: 10), + decoration: BoxDecoration( + border: Border(top: BorderSide(color: t.borderSubtle))), + child: Column(children: [ + _devRow(t, '型号', d.model.isEmpty ? '—' : d.model), + _devRow(t, '连接方式', d.conn, mono: true), + _devRow(t, '最近活动', d.last.isEmpty ? '—' : d.last), + ]), + ), + const SizedBox(height: 12), + // .dev-foot：测试打印 / 配置 / 解绑 + Row(children: [ + Expanded( + child: DsButton('测试打印', + small: true, + icon: LucideIcons.printer, + onPressed: () => online + ? _snack('已发送测试打印 → ${d.name}') + : _snack('设备离线，无法测试 · ${d.name}', err: true))), + const SizedBox(width: 8), + Expanded( + child: DsButton('配置', + small: true, + icon: LucideIcons.settings, + onPressed: () => _snack('外设配置即将上线'))), + const SizedBox(width: 8), + Expanded( + child: WriteGuard( + child: DsButton('解绑', + small: true, + icon: LucideIcons.unlink, + onPressed: () => _unbind(items, index)), + ), + ), + ]), + ], + ), + ); + } + + Widget _devRow(dynamic t, String label, String value, {bool mono = false}) => + Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + Text(value, + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.text, + fontFamily: mono ? 'monospace' : null)), + ], + ), + ); + + Widget _peripheralMobileCard(List items, int index) { + final d = items[index]; + final online = d.status == '在线'; + return MobileListCard( + title: Text(d.name), + subtitle: Text('${d.model.isEmpty ? d.kind : d.model} · ${d.kind}'), + trailing: + DsBadge(d.status, tone: online ? DsBadgeTone.ok : DsBadgeTone.muted), + fields: [ + MobileCardField('连接方式', d.conn), + if (d.last.isNotEmpty) MobileCardField('最近活动', d.last), + ], + actions: [ + TextButton( + onPressed: () => online + ? _snack('已发送测试打印 → ${d.name}') + : _snack('设备离线，无法测试 · ${d.name}', err: true), + child: const Text('测试打印', style: TextStyle(fontSize: 13)), + ), + WriteGuard( + child: TextButton( + onPressed: () => _unbind(items, index), + child: Text('解绑', + style: TextStyle(fontSize: 13, color: context.tokens.danger)), + ), + ), + ], + ); + } + + // ── 区块 C：打印模板（静态两卡）───────────────────────────── + Widget _tplGrid(dynamic t, bool mobile) { + final cards = [ + _tplCard( + t, LucideIcons.tag, '标签模板 · 商品价签', '40×30mm · 品名 / 规格 / 条码 / 零售价'), + _tplCard(t, LucideIcons.receiptText, '小票模板 · 出库单据', + '58mm 热敏 · 抬头 / 明细 / 合计 / 经手人'), + ]; + if (mobile) { + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [cards[0], const SizedBox(height: 14), cards[1]], + ); + } + return Row(children: [ + Expanded(child: cards[0]), + const SizedBox(width: 14), + Expanded(child: cards[1]), + ]); + } + + Widget _tplCard(dynamic t, IconData icon, String name, String desc) { + return Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Row(children: [ + // .tpl-prev 64×64 虚线框 + Container( + width: 64, + height: 64, + decoration: BoxDecoration( + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + color: t.bg, + ), + child: Icon(icon, size: 24, color: t.muted), + ), + const SizedBox(width: 14), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(name, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(height: 2), + Text(desc, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 8), + Row(children: [ + DsButton('预览', + small: true, onPressed: () => _snack('模板预览即将上线')), + const SizedBox(width: 8), + DsButton('编辑', + small: true, onPressed: () => _snack('模板编辑即将上线')), + ]), + ], + ), + ), + ]), + ); + } + + // ── 外设增删（店级 custom_fields.peripherals）─────────────── + Future _savePeripherals(List items) async { + final shop = await ref.read(shopInfoProvider.future); + final cf = Map.from(shop.customFields) + ..['peripherals'] = items.map((p) => p.toMap()).toList(); + await ref.read(shopRepositoryProvider).updateInfo({ + 'name': shop.name, + 'address': shop.address, + 'phone': shop.phone, + 'manager_name': shop.managerName, + 'wechat_id': shop.wechatId, + if (shop.logoUrl.isNotEmpty) 'logo_url': shop.logoUrl, + 'custom_fields': cf, + }); + ref.invalidate(shopInfoProvider); + } + + Future _unbind(List items, int index) async { + final d = items[index]; + final ok = await showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: const Text('解绑设备'), + content: Text('确认解绑「${d.name}」？'), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('解绑', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), + ], + ), + ); + if (ok != true || !mounted) return; + try { + final next = [...items]..removeAt(index); + await _savePeripherals(next); + if (mounted) _snack('已解绑 · ${d.name}'); + } catch (e) { + if (mounted) _snack('解绑失败：$e', err: true); + } + } + + // 添加设备弹窗（原型 ovAdd：类型+连接方式 / 名称* / 型号或地址） + void _openAdd() { + final nameCtrl = TextEditingController(); + final modelCtrl = TextEditingController(); + var kind = _kinds.first; + var conn = _conns.first; + final formKey = GlobalKey(); + showAppDialog( + context: context, + builder: (ctx) => StatefulBuilder( + builder: (ctx, setLocal) => AlertDialog( + title: const Text('添加设备'), + content: SizedBox( + width: ctx.dialogWidth(560), + child: Form( + key: formKey, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded( + child: DsField('设备类型', + required: true, + input: DsSelect( + value: kind, + options: [for (final k in _kinds) (k, k)], + onChanged: (v) => setLocal(() => kind = v), + )), + ), + const SizedBox(width: 14), + Expanded( + child: DsField('连接方式', + required: true, + input: DsSelect( + value: conn, + options: [for (final c in _conns) (c, c)], + onChanged: (v) => setLocal(() => conn = v), + )), + ), + ]), + const SizedBox(height: 14), + DsField('设备名称', + required: true, + input: TextFormField( + controller: nameCtrl, + decoration: const InputDecoration(hintText: '如：前台标签机'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '不能为空' : null, + )), + const SizedBox(height: 14), + DsField('型号 / 地址', + input: TextFormField( + controller: modelCtrl, + decoration: const InputDecoration( + hintText: '如：Zebra GK888t 或 192.168.1.50'), + )), + ], + ), + ), + ), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop()), + DsButton('保存并连接', variant: DsBtnVariant.primary, + onPressed: () async { + if (!formKey.currentState!.validate()) return; + Navigator.of(ctx).pop(); + final items = peripheralsOf( + ref.read(shopInfoProvider).valueOrNull?.customFields ?? + const {}); + try { + await _savePeripherals([ + ...items, + Peripheral( + name: nameCtrl.text.trim(), + kind: kind, + model: modelCtrl.text.trim(), + conn: conn, + ), + ]); + if (mounted) _snack('设备已添加并连接 ✓'); + } catch (e) { + if (mounted) _snack('添加失败：$e', err: true); + } + }), + ], + ), + ), + ); + } } diff --git a/client/lib/screens/finance/finance_screen.dart b/client/lib/screens/finance/finance_screen.dart index 12359b8..4dde13f 100644 --- a/client/lib/screens/finance/finance_screen.dart +++ b/client/lib/screens/finance/finance_screen.dart @@ -1,751 +1,648 @@ +// screens/finance/finance_screen.dart — 财务管理（照原型 finance.html 重建）。 +// 版式：head + 时间范围 chips + KPI 4 卡 + 收支趋势柱状图 + 应收/应付汇总表 +// + 收支流水表 + 往来抽屉。无分页（原型无 .pager，流水按当前范围一次取）。 +// 已知差异（记 design/CONTRACT.md）：KPI3/4 delta 用「未结清 N 笔」（原型 逾期/到期额 +// 无数据源）；流水类型 chips 扩到 5（含应收/应付）并追加 状态/操作 列（结清能力不回退）； +// 时间范围真实过滤流水（原型只改文案）。 import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + import '../../core/responsive/responsive.dart'; -import '../../core/config/app_constants.dart'; -import '../../core/theme/context_tokens.dart'; import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/utils/clock.dart'; +import '../../core/utils/export_util.dart'; import '../../models/finance.dart'; import '../../providers/finance_provider.dart'; -import '../../widgets/data_table_card.dart'; -import '../../widgets/kpi_card.dart'; +import '../../providers/stock_in_provider.dart'; +import '../../providers/stock_out_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_bar_chart.dart'; +import '../../widgets/ds/ds_kpi.dart'; +import '../../widgets/ds/ds_table.dart'; +import '../../widgets/finance_entry_dialog.dart'; +import '../../widgets/finance_partner_drawer.dart'; import '../../widgets/mobile_list_card.dart'; -import '../../widgets/multi_select_dropdown.dart' - show ColDef, ColumnToggleButton, FilterableColumnHeader; -import '../../core/storage/column_prefs.dart'; -import '../../widgets/page_scaffold.dart'; -import '../../providers/connectivity_provider.dart'; -import '../../core/utils/export_util.dart'; -import '../../core/utils/date_util.dart'; -import '../../repositories/finance_repository.dart'; import '../../widgets/write_guard.dart'; -import '../../widgets/date_picker_field.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; -class FinanceScreen extends ConsumerWidget { +class FinanceScreen extends ConsumerStatefulWidget { const FinanceScreen({super.key}); @override - Widget build(BuildContext context, WidgetRef ref) { - return PageScaffold( - title: '财务管理', - tabs: const [ - Tab(text: '全部记录'), - Tab(text: '应付账款'), - Tab(text: '应收账款'), - ], - tabViews: [ - _FinanceTab(typeFilter: ''), - _FinanceTab(typeFilter: 'payable'), - _FinanceTab(typeFilter: 'receivable'), - ], - ); - } + ConsumerState createState() => _FinanceScreenState(); } -class _FinanceTab extends ConsumerStatefulWidget { - final String typeFilter; - const _FinanceTab({required this.typeFilter}); +class _FinanceScreenState extends ConsumerState { + // 时间范围（原型 .timerow chips）：真实过滤流水表；KPI 恒本月、趋势恒近 6 月 + String _range = '本月'; + String _rangeLabel = '本月'; + // 流水类型筛选（原型 3 chips 扩到 5） + String _flowChip = '全部'; - @override - ConsumerState<_FinanceTab> createState() => _FinanceTabState(); -} + static const _flowChips = ['全部', '应收', '应付', '收款', '付款']; + static const _chipToType = { + '全部': '', + '应收': 'receivable', + '应付': 'payable', + '收款': 'receipt', + '付款': 'payment', + }; -class _FinanceTabState extends ConsumerState<_FinanceTab> { - late String _month; - int _page = 1; - int _pageSize = AppConstants.defaultPageSize; - - late Future> _future; - List _allRecords = []; - int _total = 0; - - Set _filterType = {}; - Set _filterPartner = {}; - Set? _hiddenCols; // null = 尚未载入本地存档（回退到 minWidth 首次默认） - - static const _screenId = 'finance'; - - static const _colDefs = [ - ColDef('date', '日期', required: true), - ColDef('type', '类型'), - ColDef('partner', '往来单位'), - ColDef('ref', '关联单据', minWidth: 900), - ColDef('amount', '金额'), - ColDef('balance', '余额'), - ColDef('status', '状态'), - ColDef('remark', '备注', minWidth: 1000), - ColDef('actions', '操作'), - ]; + static final _ymd = DateFormat('yyyy-MM-dd'); @override void initState() { super.initState(); - final now = DateTime.now(); - _month = '${now.year}-${now.month.toString().padLeft(2, '0')}'; - _fetch(); - ColumnPrefs.load(_screenId).then((saved) { - if (saved != null && mounted) setState(() => _hiddenCols = saved); + // 默认本月（与 KPI 口径一致） + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) _applyRange('本月'); }); } - void _fetch() { - _future = ref - .read(financeRepositoryProvider) - .listRecords( - type: widget.typeFilter.isEmpty ? null : widget.typeFilter, - month: _month, - page: _page, - pageSize: _pageSize, - ) - .then((r) { - _allRecords = r.data; - _total = r.total; - return r.data; - }); - } - - void _refetch() { - setState(() => _fetch()); - } - - List _applyFilters(List all) { - return all.where((r) { - if (_filterType.isNotEmpty && !_filterType.contains(r.typeLabel)) { - return false; - } - if (_filterPartner.isNotEmpty && - !_filterPartner.contains(r.partnerName ?? '')) { - return false; - } - return true; - }).toList(); - } - - Future _closeRecord(FinanceRecord r) async { - try { - await ref.read(financeRepositoryProvider).close(r.id); - _refetch(); - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('操作失败：$e'), backgroundColor: context.tokens.danger), + Future _applyRange(String range) async { + final now = appNow(); + final notifier = ref.read(financeListProvider.notifier); + switch (range) { + case '本月': + final start = DateTime(now.year, now.month, 1); + notifier.setRange(_ymd.format(start), _ymd.format(now)); + setState(() { + _range = range; + _rangeLabel = '本月'; + }); + case '本季': + final qMonth = ((now.month - 1) ~/ 3) * 3 + 1; + final start = DateTime(now.year, qMonth, 1); + notifier.setRange(_ymd.format(start), _ymd.format(now)); + setState(() { + _range = range; + _rangeLabel = '本季'; + }); + case '自定义': + final picked = await showDateRangePicker( + context: context, + firstDate: DateTime(now.year - 3), + lastDate: now, + initialDateRange: + DateTimeRange(start: DateTime(now.year, now.month, 1), end: now), ); - } + if (picked == null) return; + notifier.setRange(_ymd.format(picked.start), _ymd.format(picked.end)); + setState(() { + _range = range; + _rangeLabel = + '${_ymd.format(picked.start)} ~ ${_ymd.format(picked.end)}'; + }); } } - void _showAddDialog() { - showDialog( - context: context, - builder: (_) => _AddPaymentDialog( - typeFilter: widget.typeFilter, - onSaved: _refetch, - repo: ref.read(financeRepositoryProvider), + void _reload() { + ref.read(financeListProvider.notifier).reload(); + ref.invalidate(financePartnerRowsProvider); + ref.invalidate(financeTrendProvider); + ref.invalidate(stockInSummaryProvider); + ref.invalidate(stockOutSummaryProvider); + } + + // ── 金额格式 ── + String _yuan(double v) => '¥${NumberFormat.decimalPattern().format( + v == v.roundToDouble() ? v.round() : v, + )}'; + + /// KPI 大数：¥186万 / ¥48.6万（<1万显示整数元）。 + String _yuanWan(double v) { + if (v >= 10000) { + final wan = v / 10000; + return '¥${wan == wan.roundToDouble() ? wan.round() : wan.toStringAsFixed(1)}万'; + } + return _yuan(v); + } + + (String, DsKpiDelta) _momDelta(double cur, double last) { + if (last <= 0) return ('较上月 —', DsKpiDelta.neutral); + final pct = (cur - last) / last * 100; + if (pct == 0) return ('与上月持平', DsKpiDelta.neutral); + return ( + '${pct.abs().toStringAsFixed(1)}% 较上月', + pct > 0 ? DsKpiDelta.up : DsKpiDelta.down, + ); + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + final flowsAsync = ref.watch(financeListProvider); + final flows = flowsAsync.valueOrNull?.data ?? const []; + + final content = Container( + color: t.bg, + child: SingleChildScrollView( + padding: mobile + ? const EdgeInsets.all(AppDims.sp4) + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _head(t, mobile, flows), + _timeRow(t, mobile), + _kpis(t, mobile), + _secHead(t, '收支趋势', '近 6 个月 · 单位 万元'), + _trendChart(), + const SizedBox(height: 22), + _secHead(t, '应收 / 应付 汇总', '按往来单位 · 点击行查看流水'), + _summaryTable(t, mobile), + const SizedBox(height: 22), + _secHead(t, '收支流水', _flowSub(flows)), + _flowTable(t, mobile, flows, flowsAsync.valueOrNull?.total ?? 0), + ], + ), + ), + ); + return Stack(children: [ + content, + if (flowsAsync.isLoading) const Positioned.fill(child: DsLoadingScrim()), + ]); + } + + // ── head ── + Widget _head(dynamic t, bool mobile, List flows) { + return Padding( + padding: const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text('财务管理', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Expanded( + child: Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text('应收/应付概览 · $_rangeLabel', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ), + if (!mobile) ...[ + DsButton('刷新', icon: LucideIcons.refreshCw, onPressed: _reload), + const SizedBox(width: 10), + DsButton('导出报表', + icon: LucideIcons.download, onPressed: () => _export(flows)), + const SizedBox(width: 10), + WriteGuard( + child: DsButton('登记收支', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => showFinanceEntryDialog(context)), + ), + ], + ], ), ); } - /// 财务记录：窄屏卡片 - Widget _financeCard(FinanceRecord r) { - final canClose = - (r.type == 'payable' || r.type == 'receivable') && r.status == 'open'; - final showStatus = r.type == 'payable' || r.type == 'receivable'; + void _export(List flows) { + exportExcel( + filename: '财务流水', + headers: ['日期', '类型', '往来单位', '金额', '关联单据', '状态', '备注'], + rows: flows + .map((r) => [ + (r.recordDate ?? '').split('T').first, + r.typeLabel, + r.partnerName ?? '', + r.amount, + r.refType != null ? '${r.docTitle}#${r.refId ?? ''}' : '', + r.status == 'open' ? '未结清' : '已结清', + r.remark ?? '', + ]) + .toList(), + ); + } + + // ── 时间范围 chips（原型 .timerow）── + Widget _timeRow(dynamic t, bool mobile) { + return Padding( + padding: const EdgeInsets.only(bottom: 18), + child: Row(children: [ + Text('时间范围', style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(width: 12), + for (final r in const ['本月', '本季', '自定义']) ...[ + DsChip( + label: r, + selected: _range == r, + caret: r == '自定义', + onTap: () => _applyRange(r)), + const SizedBox(width: 10), + ], + if (mobile) ...[ + const Spacer(), + WriteGuard( + child: DsButton('登记', + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => showFinanceEntryDialog(context)), + ), + ], + ]), + ); + } + + // ── KPI 4 卡 ── + Widget _kpis(dynamic t, bool mobile) { + final outSum = ref.watch(stockOutSummaryProvider).valueOrNull; + final inSum = ref.watch(stockInSummaryProvider).valueOrNull; + final rows = ref.watch(financePartnerRowsProvider).valueOrNull ?? const []; + var recv = 0.0, pay = 0.0, openCount = 0; + for (final r in rows) { + recv += r.recv; + pay += r.pay; + openCount += r.openCount; + } + final (saleDelta, saleTone) = outSum != null + ? _momDelta(outSum.monthAmount, outSum.lastMonthAmount) + : ('较上月 —', DsKpiDelta.neutral); + final (buyDelta, buyTone) = inSum != null + ? _momDelta(inSum.monthAmount, inSum.lastMonthAmount) + : ('较上月 —', DsKpiDelta.neutral); + + final cards = [ + DsKpi( + title: '本月销售额', + value: outSum != null ? _yuanWan(outSum.monthAmount) : '—', + icon: LucideIcons.box, + tone: DsKpiTone.info, + delta: saleDelta, + deltaTone: saleTone, + ), + DsKpi( + title: '本月采购额', + value: inSum != null ? _yuanWan(inSum.monthAmount) : '—', + icon: LucideIcons.shoppingCart, + tone: DsKpiTone.blue, + delta: buyDelta, + deltaTone: buyTone, + ), + // 原型 delta「逾期 ¥9.2万」无数据源 → 未结清笔数（已知差异） + DsKpi( + title: '应收账款 · 待收', + value: _yuanWan(recv), + icon: LucideIcons.circleDollarSign, + tone: DsKpiTone.alert, + delta: '未结清 $openCount 笔', + deltaTone: DsKpiDelta.down, + ), + DsKpi( + title: '应付账款', + value: _yuanWan(pay), + icon: LucideIcons.receipt, + tone: DsKpiTone.ok, + delta: '按到期及时结清', + deltaTone: DsKpiDelta.up, + ), + ]; + if (mobile) { + return Padding( + padding: const EdgeInsets.only(bottom: 20), + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: IntrinsicHeight( + child: Row(children: [ + for (var i = 0; i < cards.length; i++) ...[ + if (i > 0) const SizedBox(width: AppDims.sp3), + SizedBox(width: 170, child: cards[i]), + ], + ]), + ), + ), + ); + } + return Padding( + padding: const EdgeInsets.only(bottom: 20), + child: IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var i = 0; i < cards.length; i++) ...[ + if (i > 0) const SizedBox(width: 14), + Expanded(child: cards[i]), + ], + ], + ), + ), + ); + } + + /// 原型 .sec-head：h2 17/700 + 副标 fs-xs muted，下距 12。 + Widget _secHead(dynamic t, String title, String sub) => Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text(title, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: 10), + Padding( + padding: const EdgeInsets.only(bottom: 1), + child: Text(sub, + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted)), + ), + ], + ), + ); + + // ── 收支趋势 ── + Widget _trendChart() { + final t = context.tokens; + final trend = ref.watch(financeTrendProvider); + Widget placeholder(Widget child) => Container( + height: 120, + alignment: Alignment.center, + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: child, + ); + return trend.when( + loading: () => placeholder(const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator(strokeWidth: 2))), + error: (e, _) => placeholder(Text('趋势加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm))), + data: (points) => DsBarChart( + groups: [ + for (final p in points) + DsBarGroup(_monthLabel(p.month), p.inAmount, p.outAmount), + ], + legendA: '收入', + legendB: '支出', + // 柱顶标签：万元取整（原型 TREND 值即万元整数） + format: (v) => '${(v / 10000).round()}', + ), + ); + } + + String _monthLabel(String ym) { + final parts = ym.split('-'); + return parts.length == 2 ? '${int.tryParse(parts[1]) ?? parts[1]}月' : ym; + } + + // ── 应收/应付汇总表 ── + Widget _summaryTable(dynamic t, bool mobile) { + final async = ref.watch(financePartnerRowsProvider); + return async.when( + loading: () => const Padding( + padding: EdgeInsets.all(24), + child: Center(child: CircularProgressIndicator())), + error: (e, _) => Row(children: [ + Text('汇总加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + const SizedBox(width: 10), + DsButton('重试', + small: true, + onPressed: () => ref.invalidate(financePartnerRowsProvider)), + ]), + data: (rows) => DsTable( + shrinkWrap: true, + emptyText: '暂无未结清的应收 / 应付', + mobileCards: rows + .map((r) => MobileListCard( + title: Text(r.name), + trailing: Text(signedYuan(r.net), + style: TextStyle( + fontWeight: FontWeight.w600, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: r.net > 0 + ? t.success + : (r.net < 0 ? t.danger : t.text))), + fields: [ + MobileCardField('应收', r.recv > 0 ? _yuan(r.recv) : '—'), + MobileCardField('应付', r.pay > 0 ? _yuan(r.pay) : '—'), + ], + onTap: () => showFinancePartnerDrawer(context, row: r), + )) + .toList(), + columns: const [ + DsColumn('name', '往来单位'), + DsColumn('recv', '应收', numeric: true), + DsColumn('pay', '应付', numeric: true), + DsColumn('net', '净额', numeric: true), + DsColumn('actions', '操作', action: true), + ], + rows: rows.map((r) { + return DsRow( + onTap: () => showFinancePartnerDrawer(context, row: r), + cells: [ + Text(r.name, + style: + TextStyle(fontWeight: FontWeight.w600, color: t.heading)), + Text(r.recv > 0 ? _yuan(r.recv) : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(r.pay > 0 ? _yuan(r.pay) : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(signedYuan(r.net), + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontWeight: FontWeight.w600, + color: r.net > 0 + ? t.success + : (r.net < 0 ? t.danger : t.text))), + InkWell( + onTap: () => showFinancePartnerDrawer(context, row: r), + child: Text('查看', + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.primary)), + ), + ], + ); + }).toList(), + ), + ); + } + + String _flowSub(List flows) { + final receipts = flows.where((r) => r.type == 'receipt').length; + final payments = flows.where((r) => r.type == 'payment').length; + return '$_rangeLabel ${flows.length} 笔 · 收 $receipts / 付 $payments'; + } + + // ── 收支流水表 ── + Widget _flowTable( + dynamic t, bool mobile, List flows, int total) { + final chips = [ + for (final c in _flowChips) ...[ + DsChip( + label: c, + selected: _flowChip == c, + caret: false, + onTap: () => _setFlowChip(c)), + const SizedBox(width: 10), + ], + ]; + final toolbar = mobile + ? SingleChildScrollView( + scrollDirection: Axis.horizontal, child: Row(children: chips)) + : Row(children: [ + Text('类型', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(width: 12), + ...chips, + const Spacer(), + Text('共 $total 条', + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.muted, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ]); + + return DsTable( + shrinkWrap: true, + emptyText: '没有匹配的流水记录', + toolbar: toolbar, + mobileCards: flows.map((r) => _flowCard(t, r)).toList(), + columns: const [ + DsColumn('date', '日期'), + DsColumn('type', '类型'), + DsColumn('partner', '往来单位'), + DsColumn('amount', '金额', numeric: true), + DsColumn('ref', '关联单号'), + DsColumn('remark', '备注'), + DsColumn('status', '状态'), + DsColumn('actions', '操作', action: true), + ], + rows: flows.map((r) { + final isIn = r.type == 'receipt' || r.type == 'receivable'; + return DsRow(cells: [ + Text((r.recordDate ?? '').split('T').first, + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + financeTypeBadge(r), + Text((r.partnerName?.isNotEmpty == true) ? r.partnerName! : '—'), + // 原型 .qty：+/- 前缀、恒 heading 色（不上正负色） + Text('${isIn ? '+' : '-'}${_yuan(r.amount.abs())}', + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontWeight: FontWeight.w600, + color: t.heading)), + Text( + r.refType != null && r.refId != null + ? '${r.docTitle} #${r.refId}' + : '—', + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsSm, + color: t.muted)), + Text((r.remark?.isNotEmpty == true) ? r.remark! : '—', + style: TextStyle(color: t.muted)), + r.status == 'open' + ? const DsBadge('未结清', tone: DsBadgeTone.warn) + : const DsBadge('已结清', tone: DsBadgeTone.muted), + _closeAction(t, r), + ]); + }).toList(), + ); + } + + void _setFlowChip(String c) { + setState(() => _flowChip = c); + ref.read(financeListProvider.notifier).setType(_chipToType[c] ?? ''); + } + + Widget _closeAction(dynamic t, FinanceRecord r) { + final closable = + r.status == 'open' && (r.type == 'receivable' || r.type == 'payable'); + if (!closable) return Text('—', style: TextStyle(color: t.faint)); + return WriteGuard( + child: InkWell( + onTap: () => _confirmClose(r), + child: Text('结清', + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.primary)), + ), + ); + } + + Future _confirmClose(FinanceRecord r) async { + final ok = await showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: const Text('确认结清'), + content: Text('确认将「${r.partnerName ?? ''} ${r.typeLabel} ' + '${_yuan(r.amount.abs())}」标记为已结清？'), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('结清', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop(true)), + ], + ), + ); + if (ok != true || !mounted) return; + try { + await ref.read(financeRepositoryProvider).close(r.id); + ref.read(financeListProvider.notifier).reload(); + ref.invalidate(financePartnerRowsProvider); + if (mounted) { + showDsToast(context, '已结清 ✓', bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '操作失败：$e', bg: context.tokens.danger); + } + } + } + + Widget _flowCard(dynamic t, FinanceRecord r) { + final isIn = r.type == 'receipt' || r.type == 'receivable'; return MobileListCard( title: Text( - r.partnerName?.isNotEmpty == true ? r.partnerName! : r.typeLabel), - subtitle: Text(r.recordDate?.substring(0, 10) ?? '-'), - trailing: _TypeBadge(r.typeLabel), + (r.partnerName?.isNotEmpty == true) ? r.partnerName! : r.typeLabel), + subtitle: Text((r.recordDate ?? '').split('T').first), + trailing: financeTypeBadge(r), fields: [ - MobileCardField('金额', '¥${r.amount.toStringAsFixed(2)}'), - MobileCardField('余额', null, - valueWidget: Text( - '¥${r.balance.toStringAsFixed(2)}', - style: TextStyle( - fontSize: 13, - color: r.balance > 0 ? context.tokens.danger : context.tokens.muted, - fontWeight: FontWeight.w600, - ), - )), - if (r.refType != null && r.refId != null) - MobileCardField( - '关联单据', '${r.refType!.replaceAll('_', '-')}#${r.refId}'), - if (showStatus) - MobileCardField('状态', null, valueWidget: _StatusBadge(r.status)), + MobileCardField('金额', '${isIn ? '+' : '-'}${_yuan(r.amount.abs())}'), + MobileCardField('状态', r.status == 'open' ? '未结清' : '已结清'), if (r.remark?.isNotEmpty == true) MobileCardField('备注', r.remark), ], - actions: (canClose && !WriteGuard.isReadonly(ref)) + actions: (r.status == 'open' && + (r.type == 'receivable' || r.type == 'payable')) ? [ WriteGuard( child: TextButton( - onPressed: () => _closeRecord(r), - child: Text('结清', - style: TextStyle(fontSize: 13, color: context.tokens.success)), + onPressed: () => _confirmClose(r), + child: const Text('结清', style: TextStyle(fontSize: 13)), ), ), ] : null, ); } - - @override - Widget build(BuildContext context) { - ref.listen(networkRecoveryCountProvider, (_, __) => _refetch()); - - return FutureBuilder>( - future: _future, - builder: (context, snap) { - if (snap.connectionState == ConnectionState.waiting) { - return const Center(child: CircularProgressIndicator()); - } - if (snap.hasError) { - if (_allRecords.isNotEmpty) { - return Column( - children: [ - _OfflineBanner(onRetry: _refetch), - Expanded(child: _buildContent(_applyFilters(_allRecords))), - ], - ); - } - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, - size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton(onPressed: _refetch, child: const Text('重试')), - ], - ), - ); - } - final filtered = _applyFilters(_allRecords); - return _buildContent(filtered); - }, - ); - } - - Widget _buildContent(List records) { - // Summary: only for payable/receivable tabs - final totalAmount = records.fold(0.0, (s, r) => s + r.amount); - final openAmount = records - .where((r) => - (r.type == 'payable' || r.type == 'receivable') && - r.status == 'open') - .fold(0.0, (s, r) => s + r.amount); - final closedAmount = records - .where((r) => - (r.type == 'payable' || r.type == 'receivable') && - r.status == 'closed') - .fold(0.0, (s, r) => s + r.amount); - - final typeOptions = _allRecords.map((r) => r.typeLabel).toSet().toList() - ..sort(); - final partnerOptions = _allRecords - .map((r) => r.partnerName ?? '') - .where((s) => s.isNotEmpty) - .toSet() - .toList() - ..sort(); - - final screenWidth = MediaQuery.of(context).size.width; - // 隐藏列：本地存档优先；无存档时按 minWidth 计算首次默认隐藏集。 - final hidden = _hiddenCols ?? - _colDefs - .where((c) => c.minWidth != null && screenWidth < c.minWidth!) - .map((c) => c.key) - .toSet(); - // 列可见性只看用户选择（minWidth 仅作首次默认，不再运行时强制隐藏）。 - final visibleCols = _colDefs.where((c) => !hidden.contains(c.key)).toList(); - - final columns = visibleCols.map((c) { - final label = switch (c.key) { - 'type' => FilterableColumnHeader( - text: c.label, - options: typeOptions, - selected: _filterType, - onChanged: (v) => setState(() => _filterType = v), - ), - 'partner' => FilterableColumnHeader( - text: c.label, - options: partnerOptions, - selected: _filterPartner, - onChanged: (v) => setState(() => _filterPartner = v), - ), - _ => Text(c.label), - }; - return DataColumn( - label: label, numeric: c.key == 'amount' || c.key == 'balance'); - }).toList(); - - DataCell buildFinanceCell(String key, FinanceRecord r) { - switch (key) { - case 'date': - return DataCell(Text( - r.recordDate?.substring(0, 10) ?? '-', - style: const TextStyle(fontSize: 12), - )); - case 'type': - return DataCell(_TypeBadge(r.typeLabel)); - case 'partner': - return DataCell(SizedBox( - width: 160, - child: Text(r.partnerName ?? '-', overflow: TextOverflow.ellipsis), - )); - case 'ref': - return DataCell(Text( - r.refType != null && r.refId != null - ? '${r.refType!.replaceAll('_', '-')}#${r.refId}' - : '-', - style: TextStyle( - fontSize: 11, fontFamily: 'monospace', color: context.tokens.primary), - )); - case 'amount': - return DataCell(Text( - '¥${r.amount.toStringAsFixed(2)}', - style: const TextStyle(fontWeight: FontWeight.w500), - )); - case 'balance': - return DataCell(Text( - '¥${r.balance.toStringAsFixed(2)}', - style: TextStyle( - color: r.balance > 0 ? context.tokens.danger : context.tokens.muted, - fontWeight: FontWeight.w600, - ), - )); - case 'status': - if (r.type != 'payable' && r.type != 'receivable') { - return const DataCell(SizedBox()); - } - return DataCell(_StatusBadge(r.status)); - case 'remark': - return DataCell(SizedBox( - width: 160, - child: Text(r.remark ?? '-', - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12, color: context.tokens.muted)), - )); - case 'actions': - if ((r.type == 'payable' || r.type == 'receivable') && - r.status == 'open' && - !WriteGuard.isReadonly(ref)) { - return DataCell(WriteGuard( - child: TextButton( - onPressed: () => _closeRecord(r), - child: Text('结清', - style: TextStyle(fontSize: 12, color: context.tokens.success)), - ), - )); - } - return const DataCell(SizedBox()); - default: - return const DataCell(SizedBox()); - } - } - - final rows = records.isEmpty - ? [ - DataRow( - cells: List.generate( - visibleCols.length, - (i) => i == 0 - ? DataCell(Text('暂无记录', - style: TextStyle(color: context.tokens.muted))) - : const DataCell(SizedBox()), - ), - ), - ] - : records - .map((r) => DataRow( - cells: visibleCols - .map((c) => buildFinanceCell(c.key, r)) - .toList(), - )) - .toList(); - - // Determine add button label - final addLabel = widget.typeFilter == 'payable' - ? '添加付款' - : widget.typeFilter == 'receivable' - ? '添加收款' - : null; - - return Column( - children: [ - if (widget.typeFilter.isNotEmpty && records.isNotEmpty) - Builder(builder: (context) { - final mobile = context.isMobile; - final cards = [ - KpiCard( - title: '合计金额', - value: '¥${(totalAmount / 10000).toStringAsFixed(2)}万', - icon: Icons.account_balance_wallet, - tone: KpiTone.info, - ), - KpiCard( - title: '未结清', - value: '¥${(openAmount / 10000).toStringAsFixed(2)}万', - icon: Icons.pending_actions, - tone: KpiTone.warn, - ), - KpiCard( - title: '已结清', - value: '¥${(closedAmount / 10000).toStringAsFixed(2)}万', - icon: Icons.check_circle, - tone: KpiTone.ok, - ), - ]; - final row = []; - for (var i = 0; i < cards.length; i++) { - if (i > 0) row.add(const SizedBox(width: AppDims.sp3)); - row.add(mobile - ? SizedBox(width: 160, child: cards[i]) - : Expanded(child: cards[i])); - } - return Container( - color: context.tokens.bg, - padding: const EdgeInsets.all(AppDims.sp3), - child: mobile - ? SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: IntrinsicHeight(child: Row(children: row)), - ) - : IntrinsicHeight( - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: row)), - ); - }), - if (widget.typeFilter.isNotEmpty && records.isNotEmpty) - const Divider(height: 1), - Expanded( - child: DataTableCard( - totalCount: _total > 0 ? _total : records.length, - page: _page, - pageSize: _pageSize, - onPageChanged: (p) { - setState(() { - _page = p; - _fetch(); - }); - }, - onPageSizeChanged: (s) { - setState(() { - _pageSize = s; - _page = 1; - _fetch(); - }); - }, - toolbar: Row( - children: [ - if (addLabel != null && !WriteGuard.isReadonly(ref)) - WriteGuard( - child: ElevatedButton.icon( - onPressed: _showAddDialog, - icon: const Icon(Icons.add, size: 16), - label: Text(addLabel), - ), - ), - if (addLabel != null && !WriteGuard.isReadonly(ref)) - const SizedBox(width: 8), - OutlinedButton.icon( - onPressed: () { - final tabName = widget.typeFilter.isEmpty - ? '财务全部记录' - : widget.typeFilter == 'payable' - ? '应付账款' - : '应收账款'; - exportExcel( - filename: tabName, - headers: [ - '日期', - '类型', - '往来单位', - '关联单据', - '金额', - '余额', - '状态', - '备注' - ], - rows: records - .map((r) => [ - r.recordDate?.substring(0, 10) ?? '', - r.typeLabel, - r.partnerName ?? '', - r.refType != null && r.refId != null - ? '${r.refType!.replaceAll('_', '-')}#${r.refId}' - : '', - r.amount, - r.balance, - r.status == 'open' ? '未结清' : '已结清', - r.remark ?? '', - ]) - .toList(), - ); - }, - icon: const Icon(Icons.download, size: 16), - label: const Text('导出'), - ), - const Spacer(), - _MonthSelector( - value: _month, - onChanged: (v) { - _month = v; - _page = 1; - _refetch(); - }, - ), - const SizedBox(width: 8), - ColumnToggleButton( - columns: _colDefs, - hidden: hidden, - onChanged: (v) { - setState(() => _hiddenCols = v); - ColumnPrefs.save(_screenId, v); - }, - ), - ], - ), - columns: columns, - rows: rows, - mobileCards: records.map(_financeCard).toList(), - ), - ), - ], - ); - } -} - -// ── 添加付款/收款弹窗 ───────────────────────────────────────── - -class _AddPaymentDialog extends StatefulWidget { - final String typeFilter; // 'payable' | 'receivable' - final VoidCallback onSaved; - final FinanceRepository repo; - - const _AddPaymentDialog({ - required this.typeFilter, - required this.onSaved, - required this.repo, - }); - - @override - State<_AddPaymentDialog> createState() => _AddPaymentDialogState(); -} - -class _AddPaymentDialogState extends State<_AddPaymentDialog> { - final _amountCtrl = TextEditingController(); - final _remarkCtrl = TextEditingController(); - final _partnerCtrl = TextEditingController(); - DateTime _date = DateTime.now(); - bool _saving = false; - - String get _type => widget.typeFilter == 'payable' ? 'payment' : 'receipt'; - String get _title => widget.typeFilter == 'payable' ? '添加付款记录' : '添加收款记录'; - - @override - void dispose() { - _amountCtrl.dispose(); - _remarkCtrl.dispose(); - _partnerCtrl.dispose(); - super.dispose(); - } - - Future _save() async { - final amount = double.tryParse(_amountCtrl.text.trim()); - if (amount == null || amount <= 0) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请输入有效金额'), - backgroundColor: context.tokens.danger), - ); - return; - } - setState(() => _saving = true); - try { - final body = { - 'type': _type, - 'amount': amount, - 'record_date': formatYmd(_date), - if (_remarkCtrl.text.trim().isNotEmpty) - 'remark': _remarkCtrl.text.trim(), - }; - await widget.repo.create(body); - if (mounted) { - Navigator.of(context).pop(); - widget.onSaved(); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('添加成功'), - backgroundColor: context.tokens.success), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('添加失败：$e'), backgroundColor: context.tokens.danger), - ); - } - } finally { - if (mounted) setState(() => _saving = false); - } - } - - @override - Widget build(BuildContext context) { - return AlertDialog( - title: Text(_title), - content: SizedBox( - width: context.dialogWidth(360), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextField( - controller: _amountCtrl, - keyboardType: - const TextInputType.numberWithOptions(decimal: true), - decoration: - const InputDecoration(labelText: '金额', prefixText: '¥ '), - ), - const SizedBox(height: 12), - DatePickerField( - label: '日期', - value: formatYmd(_date), - onChanged: (v) { - final d = parseYmd(v); - if (d != null) setState(() => _date = d); - }, - ), - const SizedBox(height: 12), - TextField( - controller: _remarkCtrl, - decoration: const InputDecoration(labelText: '备注（选填）'), - ), - ], - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('保存'), - ), - ], - ); - } -} - -// ── Widgets ────────────────────────────────────────────────── - -class _StatusBadge extends StatelessWidget { - final String status; - const _StatusBadge(this.status); - - @override - Widget build(BuildContext context) { - final t = context.tokens; - return status == 'open' - ? StatusPill(label: '未结清', color: t.warn, background: t.warnBg) - : StatusPill(label: '已结清', color: t.muted, background: t.infoSoft); - } -} - -class _TypeBadge extends StatelessWidget { - final String label; - const _TypeBadge(this.label); - - @override - Widget build(BuildContext context) { - final t = context.tokens; - final (Color fg, Color bg) = switch (label) { - '应收账款' => (t.primary, t.infoSoft), - '应付账款' => (t.danger, t.dangerBg), - '收款' => (t.success, t.okSoft), - '付款' => (t.warn, t.warnBg), - _ => (t.muted, t.infoSoft), - }; - return StatusPill(label: label, color: fg, background: bg); - } -} - -class _MonthSelector extends StatelessWidget { - final String value; - final ValueChanged onChanged; - - const _MonthSelector({required this.value, required this.onChanged}); - - @override - Widget build(BuildContext context) { - final now = DateTime.now(); - final months = List.generate(12, (i) { - final d = DateTime(now.year, now.month - i, 1); - return '${d.year}-${d.month.toString().padLeft(2, '0')}'; - }); - final safeValue = months.contains(value) ? value : months.first; - - return Container( - height: 36, - padding: const EdgeInsets.symmetric(horizontal: 8), - decoration: BoxDecoration( - border: Border.all(color: context.tokens.border), - borderRadius: BorderRadius.circular(4), - color: context.tokens.surface, - ), - child: DropdownButtonHideUnderline( - child: DropdownButton( - value: safeValue, - items: months - .map((m) => DropdownMenuItem( - value: m, - child: Text(m, style: const TextStyle(fontSize: 13)))) - .toList(), - onChanged: (v) => onChanged(v!), - style: TextStyle(fontSize: 13, color: context.tokens.text), - ), - ), - ); - } -} - -class _OfflineBanner extends StatelessWidget { - final VoidCallback onRetry; - const _OfflineBanner({required this.onRetry}); - - @override - Widget build(BuildContext context) { - final t = context.tokens; - return Container( - width: double.infinity, - color: t.warnBg, - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), - child: Row( - children: [ - Icon(Icons.cloud_off, size: 14, color: t.warn), - const SizedBox(width: 8), - Expanded( - child: Text('网络不可用，当前显示离线缓存数据', - style: TextStyle(color: t.warn, fontSize: 12)), - ), - TextButton( - onPressed: onRetry, - style: TextButton.styleFrom( - foregroundColor: t.warn, - padding: const EdgeInsets.symmetric(horizontal: 8)), - child: const Text('重试', style: TextStyle(fontSize: 12)), - ), - ], - ), - ); - } } diff --git a/client/lib/screens/inventory/inventory_check_screen.dart b/client/lib/screens/inventory/inventory_check_screen.dart index 8e6d5ba..c79c354 100644 --- a/client/lib/screens/inventory/inventory_check_screen.dart +++ b/client/lib/screens/inventory/inventory_check_screen.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -8,6 +9,9 @@ import '../../models/warehouse.dart'; import '../../core/config/app_constants.dart'; import '../../providers/inventory_provider.dart'; import '../../providers/warehouse_provider.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; class InventoryCheckScreen extends ConsumerStatefulWidget { const InventoryCheckScreen({super.key}); @@ -50,10 +54,8 @@ class _InventoryCheckScreenState extends ConsumerState { _checkItems.clear(); }); try { - final result = await ref - .read(inventoryRepositoryProvider) - .listInventory( - warehouseId: wh.id, pageSize: AppConstants.inventoryCheckPageSize); + final result = await ref.read(inventoryRepositoryProvider).listInventory( + warehouseId: wh.id, pageSize: AppConstants.inventoryCheckPageSize); final items = result.data .where((inv) => inv.productId != null) .map((inv) => _CheckItem(inventory: inv)) @@ -67,19 +69,14 @@ class _InventoryCheckScreenState extends ConsumerState { } catch (e) { if (mounted) { setState(() => _loadingItems = false); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('加载库存失败：$e'), - backgroundColor: context.tokens.danger), - ); + showDsToast(context, '加载库存失败：$e', bg: context.tokens.danger); } } } Future _submit() async { if (_selectedWarehouse == null) { - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('请先选择仓库'))); + showDsToast(context, '请先选择仓库'); return; } setState(() => _submitting = true); @@ -106,21 +103,12 @@ class _InventoryCheckScreenState extends ConsumerState { }); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('盘点单已提交'), - backgroundColor: context.tokens.success, - ), - ); + showDsToast(context, '盘点单已提交', bg: context.tokens.success); context.go('/inventory'); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('提交失败：$e'), - backgroundColor: context.tokens.danger), - ); + showDsToast(context, '提交失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _submitting = false); @@ -149,13 +137,13 @@ class _InventoryCheckScreenState extends ConsumerState { child: Row( children: [ IconButton( - icon: const Icon(Icons.arrow_back, size: 20), + icon: const Icon(LucideIcons.arrowLeft, size: 20), onPressed: () => context.go('/inventory'), ), const SizedBox(width: 8), const Text('库存盘点', - style: TextStyle( - fontSize: 16, fontWeight: FontWeight.w600)), + style: + TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), const Spacer(), OutlinedButton( onPressed: () => context.go('/inventory'), @@ -163,16 +151,16 @@ class _InventoryCheckScreenState extends ConsumerState { ), const SizedBox(width: 8), ElevatedButton.icon( - onPressed: (_submitting || _checkItems.isEmpty) - ? null - : _submit, + onPressed: + (_submitting || _checkItems.isEmpty) ? null : _submit, icon: _submitting ? const SizedBox( width: 14, height: 14, child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Icon(Icons.check_circle_outline, size: 16), + strokeWidth: 2, + color: Colors.white)) // ds-ignore: 盘点屏待重建批次统一 + : const Icon(LucideIcons.circleCheck, size: 16), label: const Text('提交盘点'), ), ], @@ -208,7 +196,9 @@ class _InventoryCheckScreenState extends ConsumerState { child: Text( _checkNo, style: const TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: + AppFonts.monoFallback, fontSize: 13), ), ), @@ -222,40 +212,30 @@ class _InventoryCheckScreenState extends ConsumerState { style: TextStyle( color: context.tokens.danger, fontSize: 12)), - data: (warehouses) => - DropdownButtonFormField( + data: (warehouses) => DsSelect( value: _selectedWarehouse, - hint: const Text('请选择仓库'), - items: warehouses - .map((w) => DropdownMenuItem( - value: w, - child: Text(w.name, - style: const TextStyle( - fontSize: 13)))) - .toList(), + hint: '请选择仓库', + options: [ + for (final w in warehouses) (w, w.name), + ], onChanged: (w) { - setState( - () => _selectedWarehouse = w); - if (w != null) _loadInventory(w); + setState(() => _selectedWarehouse = w); + _loadInventory(w); }, - decoration: const InputDecoration(), ), ), ), _InfoField( label: '盘点类型', - child: DropdownButtonFormField( + child: DsSelect( value: _checkType, - items: ['全盘', '抽盘', '循环盘点'] - .map((s) => DropdownMenuItem( - value: s, - child: Text(s, - style: const TextStyle( - fontSize: 13)))) - .toList(), + options: const [ + ('全盘', '全盘'), + ('抽盘', '抽盘'), + ('循环盘点', '循环盘点'), + ], onChanged: (v) => - setState(() => _checkType = v!), - decoration: const InputDecoration(), + setState(() => _checkType = v), ), ), _InfoField( @@ -266,8 +246,7 @@ class _InventoryCheckScreenState extends ConsumerState { final now = DateTime.now(); return Text( '${now.year}-${now.month.toString().padLeft(2, '0')}-${now.day.toString().padLeft(2, '0')}', - style: - const TextStyle(fontSize: 13), + style: const TextStyle(fontSize: 13), ); }), ), @@ -301,8 +280,7 @@ class _InventoryCheckScreenState extends ConsumerState { decoration: BoxDecoration( color: context.tokens.accent.withOpacity(0.1), - borderRadius: - BorderRadius.circular(3), + borderRadius: BorderRadius.circular(3), ), child: Text( '差异 ${_checkItems.where((i) => _getDiff(i) != 0).length} 项', @@ -319,8 +297,8 @@ class _InventoryCheckScreenState extends ConsumerState { child: Padding( padding: const EdgeInsets.all(32), child: Text('请先选择盘点仓库', - style: TextStyle( - color: context.tokens.muted)), + style: + TextStyle(color: context.tokens.muted)), ), ) else if (_loadingItems) @@ -335,8 +313,8 @@ class _InventoryCheckScreenState extends ConsumerState { child: Padding( padding: const EdgeInsets.all(32), child: Text('该仓库暂无库存记录', - style: TextStyle( - color: context.tokens.muted)), + style: + TextStyle(color: context.tokens.muted)), ), ) else @@ -353,8 +331,8 @@ class _InventoryCheckScreenState extends ConsumerState { }, children: [ TableRow( - decoration: BoxDecoration( - color: context.tokens.thBg), + decoration: + BoxDecoration(color: context.tokens.thBg), children: [ '序号', '商品编码', @@ -366,21 +344,18 @@ class _InventoryCheckScreenState extends ConsumerState { '备注', ] .map((h) => Padding( - padding: const EdgeInsets - .symmetric( - horizontal: 8, - vertical: 10), + padding: const EdgeInsets.symmetric( + horizontal: 8, vertical: 10), child: Text(h, style: TextStyle( fontSize: 13, - fontWeight: - FontWeight.w600, - color: context.tokens.primaryDark)), + fontWeight: FontWeight.w600, + color: context + .tokens.primaryDark)), )) .toList(), ), - ...List.generate( - _checkItems.length, + ...List.generate(_checkItems.length, (i) => _buildCheckRow(i)), ], ), @@ -448,37 +423,32 @@ class _InventoryCheckScreenState extends ConsumerState { ), children: [ Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text('${index + 1}', - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), + style: TextStyle(fontSize: 13, color: context.tokens.muted)), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text(inv.productCode.isEmpty ? '-' : inv.productCode, style: TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: 12, color: context.tokens.muted)), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text(inv.productName.isEmpty ? '-' : inv.productName, style: const TextStyle(fontSize: 13), overflow: TextOverflow.ellipsis), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text(inv.unit.isEmpty ? '-' : inv.unit, style: const TextStyle(fontSize: 13)), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text(inv.quantity.toStringAsFixed(0), style: const TextStyle(fontSize: 13)), ), @@ -494,8 +464,7 @@ class _InventoryCheckScreenState extends ConsumerState { ), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8, vertical: 10), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), child: Text( diff == 0 ? '0' : (diff > 0 ? '+$diff' : '$diff'), style: TextStyle( @@ -526,8 +495,8 @@ class _CheckItem { final TextEditingController remarkCtrl; _CheckItem({required this.inventory}) - : actualQtyCtrl = TextEditingController( - text: inventory.quantity.toStringAsFixed(0)), + : actualQtyCtrl = + TextEditingController(text: inventory.quantity.toStringAsFixed(0)), remarkCtrl = TextEditingController(); void dispose() { @@ -550,8 +519,7 @@ class _InfoField extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), + style: TextStyle(fontSize: 13, color: context.tokens.muted)), const SizedBox(height: 6), child, ], @@ -573,14 +541,11 @@ class _SummaryItem extends StatelessWidget { return Row( children: [ Text(label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), + style: TextStyle(fontSize: 13, color: context.tokens.muted)), const SizedBox(width: 4), Text(value, style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: color)), + fontSize: 14, fontWeight: FontWeight.w600, color: color)), ], ); } diff --git a/client/lib/screens/inventory/inventory_list_screen.dart b/client/lib/screens/inventory/inventory_list_screen.dart index 892f2ac..7005b21 100644 --- a/client/lib/screens/inventory/inventory_list_screen.dart +++ b/client/lib/screens/inventory/inventory_list_screen.dart @@ -1,34 +1,32 @@ -import 'dart:async'; -import 'package:dio/dio.dart'; -import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; -import '../../core/config/app_config.dart'; -import '../../core/config/app_constants.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/responsive/responsive.dart'; import '../../core/theme/context_tokens.dart'; -import '../../models/inventory.dart'; -import '../../core/auth/auth_state.dart'; -import '../../widgets/write_guard.dart'; -import '../../providers/inventory_provider.dart'; -import '../../widgets/kpi_card.dart' show StatusPill; // 移动卡片状态药丸 -import 'package:lucide_icons_flutter/lucide_icons.dart'; -import '../../widgets/ds/ds_atoms.dart'; -import '../../widgets/ds/ds_kpi.dart'; -import '../../widgets/ds/ds_table.dart'; -import '../../widgets/mobile_list_card.dart'; import '../../core/theme/app_dims.g.dart'; -import '../../widgets/multi_select_dropdown.dart' show ColDef, ColumnToggleButton, FilterableColumnHeader; import '../../core/storage/column_prefs.dart'; import '../../core/utils/export_util.dart'; import '../../core/utils/print_util.dart'; import '../../core/utils/dialog_util.dart'; -import '../../widgets/label_preview_dialog.dart'; +import '../../models/inventory.dart'; +import '../../providers/inventory_provider.dart'; import '../../providers/product_provider.dart'; import '../../providers/product_option_provider.dart'; import '../../providers/shop_provider.dart' show shopInfoProvider; +import '../../widgets/write_guard.dart'; +import '../../widgets/kpi_card.dart' show StatusPill; // 移动卡片状态药丸 +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_kpi.dart'; +import '../../widgets/ds/ds_menu.dart'; +import '../../widgets/ds/ds_table.dart'; +import '../../widgets/mobile_list_card.dart'; +import '../../widgets/multi_select_dropdown.dart' show ColDef; +import '../../widgets/label_preview_dialog.dart'; +import '../../widgets/product_editor_drawer.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; class InventoryListScreen extends ConsumerStatefulWidget { const InventoryListScreen({super.key}); @@ -49,9 +47,10 @@ class _InventoryListScreenState extends ConsumerState { bool _mobileTableView = false; // 移动端：false=卡片列表，true=表格（横向滚动） static const _screenId = 'inventory_list'; + static const _statusOptions = ['全部', '在售', '预警', '缺货']; - // 列序照原型 inventory.html：商品/规格/系列/批次/库存/成本价/单价/生产/入库/供应商/状态/操作。 - // 成本价=入库进价(unitPrice)，单价=售价(salePrice)；库存列照原型显示(脏数据另清)。 + // 列序照原型 inventory.html COLS：商品/规格/系列/批次/库存/成本价/单价/生产/入库/供应商/状态/操作。 + // 成本价=入库进价(unitPrice)，单价=售价(salePrice)。 // 仓库/备注原型没有 → 默认隐藏的可选列（列设置可开）。 static const _colDefs = [ ColDef('product', '商品', required: true), @@ -73,11 +72,9 @@ class _InventoryListScreenState extends ConsumerState { // 仓库/备注默认隐藏（原型无此两列）；用户在列设置里可开。 static const _defaultHidden = {'warehouse', 'remark'}; - @override void initState() { super.initState(); - // 默认隐藏仓库/备注（原型无此两列）；本地有存档则覆盖。 _hiddenCols = Set.of(_defaultHidden); ColumnPrefs.load(_screenId).then((saved) { if (saved != null && mounted) setState(() => _hiddenCols = saved); @@ -90,8 +87,89 @@ class _InventoryListScreenState extends ConsumerState { super.dispose(); } - void _triggerSearch() { - ref.read(inventoryListProvider.notifier).setKeyword(_searchCtrl.text.trim()); + void _clearFilters() { + setState(() { + _filterWarehouse = {}; + _filterSpec = {}; + _filterSeries = {}; + _statusFilter = '全部'; + _searchCtrl.clear(); + }); + final n = ref.read(inventoryListProvider.notifier); + n.setKeyword(''); + n.setSpec([]); + n.setSeries([]); + } + + String _statusOf(Inventory i) => i.quantity == 0 + ? '缺货' + : (i.minStock != null && i.quantity < i.minStock!) + ? '预警' + : '在售'; + + void _openEditor(Inventory item) { + if (item.productId == null) return; + showProductEditorDrawer( + context, + productId: item.productId!, + qty: item.quantity, + unit: item.unit, + cost: item.unitPrice, + status: _statusOf(item), + ); + } + + // ── 列设置（原型 colBtn → openColMenu：多选保持打开） ── + void _openColMenu(BuildContext anchorContext) { + showDsMultiMenu( + anchorContext, + itemsBuilder: () => [ + for (final c in _colDefs.where((c) => !c.required)) + DsMenuItem( + value: c.key, + label: c.label, + selected: !(_hiddenCols ?? {}).contains(c.key)), + ], + onToggle: (key) { + final next = Set.of(_hiddenCols ?? {}); + next.contains(key) ? next.remove(key) : next.add(key); + setState(() => _hiddenCols = next); + ColumnPrefs.save(_screenId, next); + }, + ); + } + + // ── 状态筛选（chip 与状态列漏斗共用，单选） ── + Future _openStatusMenu(BuildContext anchorContext) async { + final v = await showDsMenu( + anchorContext, + items: [ + for (final s in _statusOptions) + DsMenuItem(value: s, label: s, selected: s == _statusFilter), + ], + ); + if (v != null && mounted) setState(() => _statusFilter = v); + } + + // ── 多选漏斗（规格/系列/仓库） ── + void _openMultiFilter( + BuildContext anchorContext, { + required List options, + required Set selected, + required ValueChanged> onChanged, + }) { + var cur = Set.of(selected); + showDsMultiMenu( + anchorContext, + itemsBuilder: () => [ + for (final o in options) + DsMenuItem(value: o, label: o, selected: cur.contains(o)), + ], + onToggle: (v) { + cur.contains(v) ? cur.remove(v) : cur.add(v); + onChanged(Set.of(cur)); + }, + ); } /// 备注列展示：editable 时附带编辑图标（用于 WriteGuard 的可点子控件）， @@ -114,8 +192,7 @@ class _InventoryListScreenState extends ConsumerState { ), if (editable) ...[ const SizedBox(width: 4), - Icon(Icons.edit_outlined, - size: 12, color: context.tokens.muted), + Icon(LucideIcons.pencil, size: 12, color: context.tokens.muted), ], ], ); @@ -140,14 +217,10 @@ class _InventoryListScreenState extends ConsumerState { ), ), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () => Navigator.pop(ctx, ctrl.text), - child: const Text('保存'), - ), + DsButton('取消', onPressed: () => Navigator.pop(ctx)), + DsButton('保存', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.pop(ctx, ctrl.text)), ], ), ); @@ -158,121 +231,16 @@ class _InventoryListScreenState extends ConsumerState { ref.read(inventoryListProvider.notifier).reload(); } catch (e) { if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('保存失败：$e'), backgroundColor: context.tokens.danger), - ); + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } } } - Future _importInventory(BuildContext context, WidgetRef ref) async { - final result = await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['xls', 'xlsx'], - withData: true, - ); - if (result == null || result.files.isEmpty) return; - final file = result.files.first; - final bytes = file.bytes; - if (bytes == null) return; - if (!context.mounted) return; - - final token = ref.read(authStateProvider).user?.accessToken ?? ''; - final dio = Dio(BaseOptions( - baseUrl: AppConfig.apiBaseUrl, - sendTimeout: AppConstants.importSendTimeout, - receiveTimeout: AppConstants.importReceiveTimeout, - )); - dio.options.headers['Authorization'] = 'Bearer $token'; - - final stateNotifier = ValueNotifier<_ImportState>( - const _ImportState(stage: _ImportStage.uploading, uploadPercent: 0), - ); - - BuildContext? dialogCtx; - showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) { - dialogCtx = ctx; - return PopScope( - canPop: false, - child: _ImportProgressDialog(stateNotifier: stateNotifier), - ); - }, - ); - - Timer? processingTimer; - bool uploadDone = false; - int elapsed = 0; - - void closeDialog() { - processingTimer?.cancel(); - if (dialogCtx != null && dialogCtx!.mounted) { - Navigator.of(dialogCtx!).pop(); - } - } - - try { - final formData = FormData.fromMap({ - 'file': MultipartFile.fromBytes(bytes, filename: file.name), - }); - - final resp = await dio.post( - '/import/inventory', - data: formData, - onSendProgress: (sent, total) { - if (total <= 0) return; - if (sent >= total && !uploadDone) { - uploadDone = true; - elapsed = 0; - stateNotifier.value = const _ImportState( - stage: _ImportStage.processing, uploadPercent: 100, processingSeconds: 0, - ); - processingTimer = Timer.periodic(const Duration(seconds: 1), (_) { - elapsed++; - stateNotifier.value = _ImportState( - stage: _ImportStage.processing, uploadPercent: 100, processingSeconds: elapsed, - ); - }); - } else if (!uploadDone) { - final pct = (sent / total * 100).round().clamp(0, 99); - stateNotifier.value = _ImportState(stage: _ImportStage.uploading, uploadPercent: pct); - } - }, - ); - - processingTimer?.cancel(); - final data = resp.data as Map; - stateNotifier.value = _ImportState( - stage: _ImportStage.done, - uploadPercent: 100, - total: data['total'] ?? 0, - imported: data['imported'] ?? 0, - updated: data['updated'] ?? 0, - errors: (data['errors'] as List?)?.cast() ?? [], - ); - - final hasErrors = (data['errors'] as List?)?.isNotEmpty ?? false; - if (!hasErrors) { - await Future.delayed(const Duration(seconds: 2)); - closeDialog(); - } - if (context.mounted) ref.read(inventoryListProvider.notifier).reload(); - } on DioException catch (e) { - processingTimer?.cancel(); - final msg = (e.response?.data is Map ? e.response!.data['error'] : null) - ?? e.message ?? '未知错误'; - stateNotifier.value = _ImportState( - stage: _ImportStage.error, uploadPercent: 0, errorMsg: msg, - ); - } - } - Future _printLabel(BuildContext context, Inventory item) async { if (item.productId == null) return; - final qrBytes = - await ref.read(productRepositoryProvider).getQRCodeBytes(item.productId!); + final qrBytes = await ref + .read(productRepositoryProvider) + .getQRCodeBytes(item.productId!); final shopInfo = ref.read(shopInfoProvider).valueOrNull; if (!context.mounted) return; final label = LabelData( @@ -295,13 +263,23 @@ class _InventoryListScreenState extends ConsumerState { ); } - /// 商品列：name（可点进详情）+ code 两行（还原原型 .pname/.pcode）。 void _exportInventory(List items) { exportExcel( filename: '库存查询', headers: const [ - '商品编码', '商品名称', '规格', '系列', '批次号', '库存量', - '成本价', '单价', '生产日期', '入库时间', '供应商', '安全库存', '状态' + '商品编码', + '商品名称', + '规格', + '系列', + '批次号', + '库存量', + '成本价', + '单价', + '生产日期', + '入库时间', + '供应商', + '安全库存', + '状态' ], rows: items.map((item) { final status = item.quantity == 0 @@ -330,37 +308,33 @@ class _InventoryListScreenState extends ConsumerState { ); } + /// 商品列（原型 .pname/.pcode）：名 heading fw600 + 编码 mono fs-xs faint。 Widget _productCell(Inventory item, BuildContext context) { - final linked = item.productId != null; - final body = Column( + final t = context.tokens; + // 原型 .pname/.pcode 无定宽：列宽随内容（td 白名单 nowrap），不锁 200。 + return Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( item.productName.isEmpty ? '-' : item.productName, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w600, - color: linked ? context.tokens.primary : context.tokens.text, - ), + style: TextStyle(fontWeight: FontWeight.w600, color: t.heading), ), if (item.productCode.isNotEmpty) - Text( - item.productCode, - style: TextStyle( - fontFamily: 'monospace', - fontSize: AppDims.fsXs, - color: context.tokens.muted, + Padding( + padding: const EdgeInsets.only(top: 2), + child: Text( + item.productCode, + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsXs, + color: t.faint, + ), ), ), ], ); - final cell = SizedBox(width: 200, child: body); - if (!linked) return cell; - return GestureDetector( - onTap: () => context.push('/products/${item.productId}'), - child: cell, - ); } /// 库存表单元格（按列 key 返回 Widget，供 DsTable 的 DsRow.cells）。 @@ -370,34 +344,46 @@ class _InventoryListScreenState extends ConsumerState { 'product' => _productCell(item, context), 'spec' => Text(item.spec.isEmpty ? '-' : item.spec), 'series' => Text(item.series.isEmpty ? '-' : item.series), - 'batch' => Text(item.batchNo.isEmpty ? '-' : item.batchNo, - style: const TextStyle(fontFamily: 'monospace', fontSize: 12)), + 'batch' => Text(item.batchNo.isEmpty ? '-' : item.batchNo), 'warehouse' => Text(item.warehouseName.isEmpty ? '-' : item.warehouseName), 'qty' => Text(item.quantity.toStringAsFixed(0), style: TextStyle( fontWeight: FontWeight.w600, - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, // 低库存染色（qty ≤ 安全库存）：原型 .qty.low → accent color: (item.minStock != null && item.quantity <= item.minStock!) ? t.accent : t.text)), - 'cost' => Text( - item.unitPrice != null ? '¥${item.unitPrice!.toStringAsFixed(2)}' : '-', - style: const TextStyle(fontFamily: 'monospace')), + // 原型成本价：千分位、整数不带小数（¥2,680）；单价保留两位（¥2680.00）。 + 'cost' => Text(item.unitPrice != null ? _fmtCost(item.unitPrice!) : '-', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), 'price' => Text( item.salePrice != null ? '¥${item.salePrice!.toStringAsFixed(2)}' : '待定价', style: item.salePrice == null ? TextStyle(color: t.warn, fontWeight: FontWeight.w600) - : const TextStyle(fontFamily: 'monospace')), - 'prodDate' => Text(item.productionDate ?? '-'), + : const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + // 原型行内样式：生产日期 mono+text、入库时间 mono+muted。 + 'prodDate' => Text(item.productionDate ?? '-', + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.text)), 'inTime' => Text( item.createdAt != null && item.createdAt!.length >= 10 ? item.createdAt!.substring(0, 10) : '-', - style: TextStyle(fontSize: 12, color: t.muted)), + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.muted)), 'supplier' => Text(item.supplierName.isEmpty ? '-' : item.supplierName), 'remark' => WriteGuard( placeholder: _remarkDisplay(item, editable: false), @@ -406,36 +392,40 @@ class _InventoryListScreenState extends ConsumerState { child: _remarkDisplay(item, editable: true), )), 'status' => _dsStatusBadge(item), + // 原型 .row-act：单个眼睛图标（16, muted, hover primary），打开商品抽屉。 'actions' => item.productId != null - ? IconButton( - icon: const Icon(Icons.visibility_outlined, size: 18), - tooltip: '查看详情', - onPressed: () => context.push('/products/${item.productId}'), - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 32, minHeight: 32), - ) + ? _RowActEye(onTap: () => _openEditor(item)) : const SizedBox(), _ => const SizedBox(), }; } + String _fmtCost(double v) { + final s = + v == v.roundToDouble() ? v.toInt().toString() : v.toStringAsFixed(2); + final parts = s.split('.'); + final digits = parts[0]; + final buf = StringBuffer(); + for (var i = 0; i < digits.length; i++) { + if (i > 0 && (digits.length - i) % 3 == 0) buf.write(','); + buf.write(digits[i]); + } + return '¥$buf${parts.length > 1 ? '.${parts[1]}' : ''}'; + } + /// 状态徽章（DsBadge）：派生 qty vs 安全库存 → 在售/预警/缺货。 Widget _dsStatusBadge(Inventory item) { - if (item.quantity == 0) { - return const DsBadge('缺货', tone: DsBadgeTone.danger); - } - if (item.minStock != null && item.quantity < item.minStock!) { - return const DsBadge('预警', tone: DsBadgeTone.warn); - } - return const DsBadge('在售', tone: DsBadgeTone.ok); + return switch (_statusOf(item)) { + '缺货' => const DsBadge('缺货', tone: DsBadgeTone.danger), + '预警' => const DsBadge('预警', tone: DsBadgeTone.warn), + _ => const DsBadge('在售', tone: DsBadgeTone.ok), + }; } /// 库存查询：窄屏卡片 Widget _inventoryCard(Inventory item) { return MobileListCard( - onTap: item.productId != null - ? () => context.push('/products/${item.productId}') - : null, + onTap: item.productId != null ? () => _openEditor(item) : null, title: Text(item.productName.isEmpty ? '-' : item.productName), subtitle: item.productCode.isEmpty ? null : Text(item.productCode), trailing: _InventoryStatusBadge(item), @@ -443,9 +433,13 @@ class _InventoryListScreenState extends ConsumerState { if (item.spec.isNotEmpty) MobileCardField('规格', item.spec), if (item.series.isNotEmpty) MobileCardField('系列', item.series), if (item.batchNo.isNotEmpty) MobileCardField('批次', item.batchNo), - MobileCardField('仓库', item.warehouseName.isEmpty ? '-' : item.warehouseName), - MobileCardField('单价', - item.unitPrice != null ? '¥${item.unitPrice!.toStringAsFixed(2)}' : '待定价'), + MobileCardField( + '仓库', item.warehouseName.isEmpty ? '-' : item.warehouseName), + MobileCardField( + '单价', + item.unitPrice != null + ? '¥${item.unitPrice!.toStringAsFixed(2)}' + : '待定价'), if (item.supplierName.isNotEmpty) MobileCardField('供应商', item.supplierName), ], @@ -473,16 +467,30 @@ class _InventoryListScreenState extends ConsumerState { return _buildInventoryView(); } + // ── KPI 环比文案：对月初快照算涨跌幅（原型 .d up/down「▲ 2.3% 较上月」） ── + (String, DsKpiDelta) _momDelta(double cur, double last) { + if (last <= 0) return ('较上月 —', DsKpiDelta.neutral); + final pct = (cur - last) / last * 100; + if (pct == 0) return ('与上月持平', DsKpiDelta.neutral); + return ( + '${pct.abs().toStringAsFixed(1)}% 较上月', + pct > 0 ? DsKpiDelta.up : DsKpiDelta.down, + ); + } + Widget _buildInventoryView() { final asyncInventory = ref.watch(inventoryListProvider); return asyncInventory.when( + // 搜索/刷新 reload 时保留旧内容不白屏（叠半透明进度，见 data 分支 Stack） + skipLoadingOnReload: true, loading: () => const Center(child: CircularProgressIndicator()), error: (e, _) => Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.error_outline, size: 40, color: context.tokens.muted), + Icon(LucideIcons.circleAlert, + size: 40, color: context.tokens.muted), const SizedBox(height: 12), Text('加载失败：$e', style: TextStyle(color: context.tokens.muted), @@ -506,371 +514,382 @@ class _InventoryListScreenState extends ConsumerState { .toSet() .toList() ..sort(); - final seriesOptions = ref.watch(productSeriesListProvider).valueOrNull + final seriesOptions = ref + .watch(productSeriesListProvider) + .valueOrNull ?.map((s) => s.name) .toList() ?? []; - final specOptions = ref.watch(productSpecListProvider).valueOrNull + final specOptions = ref + .watch(productSpecListProvider) + .valueOrNull ?.map((s) => s.name) .toList() ?? []; - String statusOf(Inventory i) => i.quantity == 0 - ? '缺货' - : (i.minStock != null && i.quantity < i.minStock!) - ? '预警' - : '在售'; final filteredItems = items .where((i) => (_filterWarehouse.isEmpty || _filterWarehouse.contains(i.warehouseName)) && - (_statusFilter == '全部' || statusOf(i) == _statusFilter)) + (_statusFilter == '全部' || _statusOf(i) == _statusFilter)) .toList(); final hidden = _hiddenCols ?? {}; final visibleCols = _colDefs.where((c) => !hidden.contains(c.key)).toList(); - return Column( - children: [ - // 头部（原型 .head）：标题 + SKU 数 + 列设置/导出 - Container( - width: double.infinity, - color: context.tokens.bg, - padding: const EdgeInsets.fromLTRB( - AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2), - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text('库存管理', - style: TextStyle( - fontSize: AppDims.fsH1, - fontWeight: FontWeight.w700, - color: context.tokens.heading)), - const SizedBox(width: AppDims.sp3), - Padding( - padding: const EdgeInsets.only(bottom: 2), - child: Text( - '共 ${NumberFormat.decimalPattern().format(result.total)} 个 SKU · 数据实时', - style: TextStyle( - fontSize: AppDims.fsSm, - color: context.tokens.muted)), - ), - const Spacer(), - if (!context.isMobile) ...[ - ColumnToggleButton( - columns: _colDefs, - hidden: hidden, - onChanged: (v) { - setState(() => _hiddenCols = v); - ColumnPrefs.save(_screenId, v); - }, - ), - const SizedBox(width: AppDims.sp2), - DsButton( - '导出', - icon: Icons.download, - onPressed: () => _exportInventory(filteredItems), - ), - ], - ], - ), - ), - // KPI 卡（还原原型 .kpi）：宽屏 4 等分，窄屏横向滚动 - Builder(builder: (context) { - // KPI 走全店汇总接口（不随分页）。 - final summary = ref.watch(inventorySummaryProvider).valueOrNull; - String yuanWan(double v) => v >= 10000 - ? '¥${(v / 10000).toStringAsFixed(v >= 1000000 ? 0 : 1)}万' - : '¥${v.toStringAsFixed(0)}'; - final cards = [ - DsKpi( - title: 'SKU 总数', - value: NumberFormat.decimalPattern() - .format(summary?.skuCount ?? result.total), - icon: LucideIcons.box, - tone: DsKpiTone.info, - delta: '点击清筛选', - onTap: () { - setState(() { - _filterWarehouse = {}; - _filterSpec = {}; - _filterSeries = {}; - _statusFilter = '全部'; - _searchCtrl.clear(); - }); - final n = ref.read(inventoryListProvider.notifier); - n.setKeyword(''); - n.setSpec([]); - n.setSeries([]); - }, - ), - DsKpi( - title: '库存货值', - value: summary != null ? yuanWan(summary.stockValue) : '—', - icon: LucideIcons.database, - tone: DsKpiTone.ok, - delta: '按进价', - ), - DsKpi( - title: '在库数量', - value: NumberFormat.decimalPattern() - .format((summary?.inStockQty ?? 0).round()), - icon: LucideIcons.box, - tone: DsKpiTone.blue, - delta: '件', - ), - DsKpi( - title: '缺货预警', - value: '${summary?.shortageCount ?? 0}', - icon: LucideIcons.triangleAlert, - tone: DsKpiTone.alert, - delta: (summary?.warningCount ?? 0) > 0 - ? '需补货 ${summary!.warningCount} 项' - : '点击筛选', - onTap: () => setState(() => _statusFilter = '缺货'), - ), - ]; - final mobile = context.isMobile; - final row = []; - for (var i = 0; i < cards.length; i++) { - if (i > 0) { - row.add(const SizedBox(width: AppDims.sp3)); - } - row.add(mobile - ? SizedBox(width: 160, child: cards[i]) - : Expanded(child: cards[i])); - } - return Container( - color: context.tokens.bg, - padding: const EdgeInsets.all(AppDims.sp3), - child: mobile - ? SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: IntrinsicHeight(child: Row(children: row)), - ) - : IntrinsicHeight( - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: row)), - ); - }), - const Divider(height: 1), - Expanded( - child: DsTable( - total: result.total, - page: result.page, - pageSize: result.pageSize, - onPageChanged: (p) => - ref.read(inventoryListProvider.notifier).setPage(p), - onPageSizeChanged: (s) => - ref.read(inventoryListProvider.notifier).setPageSize(s), - toolbar: Builder(builder: (ctx) { - final isMobile = ctx.isMobile; - void doExport() => _exportInventory(filteredItems); - - final searchField = DsSearchBox( - controller: _searchCtrl, - hint: '名称/编码/拼音，回车搜索', - onSubmitted: (_) => _triggerSearch(), - ); - - final canCheck = !WriteGuard.isReadonly(ref); - - if (isMobile) { - // 移动端：搜索独占一行 + 紧凑图标操作行（含 表格/列表 切换） - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - searchField, - const SizedBox(height: AppDims.sp2), - Row( - children: [ - if (canCheck) - WriteGuard( - child: OutlinedButton.icon( - onPressed: () => - context.go('/inventory/check'), - icon: const Icon(Icons.fact_check, size: 16), - label: const Text('盘点'), - style: OutlinedButton.styleFrom( - padding: const EdgeInsets.symmetric( - horizontal: 10, vertical: 6), - minimumSize: Size.zero, - tapTargetSize: - MaterialTapTargetSize.shrinkWrap, - ), - ), - ), - const Spacer(), - IconButton( - tooltip: _mobileTableView ? '卡片视图' : '表格视图', - icon: Icon( - _mobileTableView - ? Icons.view_agenda_outlined - : Icons.table_rows_outlined, - size: 20), - onPressed: () => setState( - () => _mobileTableView = !_mobileTableView), - ), - IconButton( - tooltip: '导出', - icon: const Icon(Icons.download, size: 20), - onPressed: doExport, - ), - ColumnToggleButton( - columns: _colDefs, - hidden: hidden, - compact: true, - onChanged: (v) { - setState(() => _hiddenCols = v); - ColumnPrefs.save(_screenId, v); - }, - ), - IconButton( - tooltip: '刷新', - icon: const Icon(Icons.refresh, size: 20), - onPressed: () => ref - .read(inventoryListProvider.notifier) - .reload(), - ), - ], - ), - ], - ); - } - - // 桌面（原型 .toolbar）：搜索 + 状态筛选 + 重置（导出/列设置在头部） - return Row( + final mobile = context.isMobile; + // 原型 .main{padding:22px 26px}：桌面整页留白统一在此；窄屏保持紧凑。 + final content = Container( + color: context.tokens.bg, + padding: mobile + ? EdgeInsets.zero + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + children: [ + // 头部（原型 .head{margin-bottom:18px}）：标题 + SKU 数 + 列设置/导出 + Container( + width: double.infinity, + color: context.tokens.bg, + padding: mobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, children: [ - SizedBox(width: 240, child: searchField), + Text('库存管理', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: context.tokens.heading)), const SizedBox(width: AppDims.sp3), - PopupMenuButton( - onSelected: (v) => setState(() => _statusFilter = v), - color: ctx.tokens.surface, - elevation: 8, - shape: RoundedRectangleBorder( - side: BorderSide(color: ctx.tokens.border), - borderRadius: BorderRadius.circular(AppDims.rMd), - ), - itemBuilder: (_) => - ['全部', '在售', '预警', '缺货'].map((s) { - final sel = s == _statusFilter; - return PopupMenuItem( - value: s, - height: 40, - child: Row(children: [ - SizedBox( - width: 18, - child: sel - ? Icon(LucideIcons.check, - size: 15, color: ctx.tokens.primary) - : null, - ), - const SizedBox(width: 4), - Text(s, - style: TextStyle( - fontSize: 13, - color: sel - ? ctx.tokens.primary - : ctx.tokens.text, - fontWeight: sel - ? FontWeight.w600 - : FontWeight.w400)), - ]), - ); - }).toList(), - child: DsChip( - label: '状态', - value: _statusFilter == '全部' ? null : _statusFilter, - ), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text( + '共 ${NumberFormat.decimalPattern().format(result.total)} 个 SKU · 数据实时', + style: TextStyle( + fontSize: AppDims.fsSm, + color: context.tokens.muted)), ), const Spacer(), - DsButton( - '重置', - small: true, - onPressed: () { - setState(() { - _filterWarehouse = {}; - _filterSpec = {}; - _filterSeries = {}; - _statusFilter = '全部'; - _searchCtrl.clear(); - }); - final n = ref.read(inventoryListProvider.notifier); - n.setKeyword(''); - n.setSpec([]); - n.setSeries([]); - }, - ), + if (!context.isMobile) ...[ + Builder( + builder: (bctx) => DsButton( + '列设置', + icon: LucideIcons.alignLeft, + onPressed: () => _openColMenu(bctx), + ), + ), + const SizedBox(width: AppDims.sp2), + DsButton( + '导出', + icon: LucideIcons.download, + onPressed: () => _exportInventory(filteredItems), + ), + ], ], + ), + ), + // KPI 卡（还原原型 .kpi）：宽屏 4 等分，窄屏横向滚动 + Builder(builder: (context) { + // KPI 走全店汇总接口（不随分页），环比对月初快照。 + final summary = + ref.watch(inventorySummaryProvider).valueOrNull; + String yuanWan(double v) => v >= 10000 + ? '¥${(v / 10000).toStringAsFixed(v >= 1000000 ? 0 : 1)}万' + : '¥${v.toStringAsFixed(0)}'; + final (skuDelta, skuTone) = summary != null + ? _momDelta(summary.skuCount.toDouble(), + summary.lastMonthSku.toDouble()) + : ('较上月 —', DsKpiDelta.neutral); + final (valDelta, valTone) = summary != null + ? _momDelta(summary.stockValue, summary.lastMonthValue) + : ('较上月 —', DsKpiDelta.neutral); + final (qtyDelta, qtyTone) = summary != null + ? _momDelta(summary.inStockQty, summary.lastMonthQty) + : ('较上月 —', DsKpiDelta.neutral); + final cards = [ + DsKpi( + title: 'SKU 总数', + value: NumberFormat.decimalPattern() + .format(summary?.skuCount ?? result.total), + icon: LucideIcons.box, + tone: DsKpiTone.info, + delta: skuDelta, + deltaTone: skuTone, + onTap: _clearFilters, + ), + DsKpi( + title: '库存货值', + value: + summary != null ? yuanWan(summary.stockValue) : '—', + icon: LucideIcons.database, + tone: DsKpiTone.ok, + delta: valDelta, + deltaTone: valTone, + ), + DsKpi( + title: '在库数量', + value: NumberFormat.decimalPattern() + .format((summary?.inStockQty ?? 0).round()), + icon: LucideIcons.box, + tone: DsKpiTone.blue, + delta: qtyDelta, + deltaTone: qtyTone, + ), + DsKpi( + title: '缺货预警 · 点击筛选', + value: '${summary?.shortageCount ?? 0}', + icon: LucideIcons.triangleAlert, + tone: DsKpiTone.alert, + delta: '需补货 ${summary?.warningCount ?? 0} 项', + deltaTone: (summary?.warningCount ?? 0) > 0 + ? DsKpiDelta.down + : DsKpiDelta.neutral, + onTap: () => setState(() => _statusFilter = '缺货'), + ), + ]; + final mobile = context.isMobile; + final row = []; + for (var i = 0; i < cards.length; i++) { + if (i > 0) { + // 原型 .kpis{gap:14px} + row.add(SizedBox(width: mobile ? AppDims.sp3 : 14)); + } + row.add(mobile + ? SizedBox(width: 160, child: cards[i]) + : Expanded(child: cards[i])); + } + return Container( + color: context.tokens.bg, + // 原型 .kpis{margin-bottom:20px}；左右留白由外层 .main 统一给 + padding: mobile + ? const EdgeInsets.all(AppDims.sp3) + : const EdgeInsets.only(bottom: 20), + child: mobile + ? SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: IntrinsicHeight(child: Row(children: row)), + ) + : IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: row)), ); }), - mobileCards: _mobileTableView - ? null - : filteredItems.map(_inventoryCard).toList(), - emptyText: '暂无库存数据', - columns: visibleCols.map((c) { - final Widget? header = switch (c.key) { - 'spec' => FilterableColumnHeader( - text: c.label, - options: specOptions, - selected: _filterSpec, - onChanged: (v) { - setState(() => _filterSpec = v); - ref - .read(inventoryListProvider.notifier) - .setSpec(v.toList()); - }, - ), - 'series' => FilterableColumnHeader( - text: c.label, - options: seriesOptions, - selected: _filterSeries, - onChanged: (v) { - setState(() => _filterSeries = v); - ref - .read(inventoryListProvider.notifier) - .setSeries(v.toList()); - }, - ), - 'warehouse' => FilterableColumnHeader( - text: c.label, - options: warehouseOptions, - selected: _filterWarehouse, - onChanged: (v) => setState(() => _filterWarehouse = v), - ), - _ => null, - }; - return DsColumn(c.key, c.label, - numeric: const {'qty', 'cost', 'price'}.contains(c.key), - action: c.key == 'actions', - header: header); - }).toList(), - rows: filteredItems.map((item) { - final Color? hl = item.quantity == 0 - ? context.tokens.danger.withValues(alpha: 0.04) - : (item.minStock != null && - item.quantity < item.minStock!) - ? context.tokens.accent.withValues(alpha: 0.04) - : null; - return DsRow( - highlight: hl, - onTap: item.productId != null - ? () => context.push('/products/${item.productId}') - : null, - cells: visibleCols - .map((c) => _buildInventoryCell(c.key, item, context)) - .toList(), - ); - }).toList(), - ), - ), + // 原型 KPI 与表格卡之间无分隔线（桌面）；窄屏保留视觉分隔 + if (mobile) const Divider(height: 1), + Expanded( + child: DsTable( + total: result.total, + page: result.page, + pageSize: result.pageSize, + onPageChanged: (p) => + ref.read(inventoryListProvider.notifier).setPage(p), + onPageSizeChanged: (s) => + ref.read(inventoryListProvider.notifier).setPageSize(s), + toolbar: Builder(builder: (ctx) { + final isMobile = ctx.isMobile; + void doExport() => _exportInventory(filteredItems); + + // 搜索合一（用户口径）：名称/拼音/编码同框，回车触发 + // （后端 keyword 本就 LIKE name/code/拼音/首字母）。 + final searchField = DsSearchBox( + controller: _searchCtrl, + hint: '商品名 / 拼音 / 编码', + onSubmitted: (v) => ref + .read(inventoryListProvider.notifier) + .setKeyword(v.trim()), + ); + + final canCheck = !WriteGuard.isReadonly(ref); + + if (isMobile) { + // 移动端：搜索独占一行 + 紧凑图标操作行（含 表格/列表 切换） + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + searchField, + const SizedBox(height: AppDims.sp2), + Row( + children: [ + if (canCheck) + WriteGuard( + child: OutlinedButton.icon( + onPressed: () => + context.go('/inventory/check'), + icon: const Icon( + LucideIcons.clipboardCheck, + size: 16), + label: const Text('盘点'), + style: OutlinedButton.styleFrom( + padding: const EdgeInsets.symmetric( + horizontal: 10, vertical: 6), + minimumSize: Size.zero, + tapTargetSize: + MaterialTapTargetSize.shrinkWrap, + ), + ), + ), + const Spacer(), + IconButton( + tooltip: _mobileTableView ? '卡片视图' : '表格视图', + icon: Icon( + _mobileTableView + ? LucideIcons.layoutList + : LucideIcons.rows3, + size: 20), + onPressed: () => setState(() => + _mobileTableView = !_mobileTableView), + ), + IconButton( + tooltip: '导出', + icon: const Icon(LucideIcons.download, + size: 20), + onPressed: doExport, + ), + Builder( + builder: (bctx) => IconButton( + tooltip: '列设置', + icon: const Icon(LucideIcons.alignLeft, + size: 20), + onPressed: () => _openColMenu(bctx), + ), + ), + IconButton( + tooltip: '刷新', + icon: const Icon(LucideIcons.refreshCw, + size: 20), + onPressed: () => ref + .read(inventoryListProvider.notifier) + .reload(), + ), + ], + ), + ], + ); + } + + // 桌面 toolbar：合一搜索框 + 重置 + // （状态筛选 chip 已按用户口径删除，状态列漏斗保留） + return Row( + children: [ + SizedBox(width: 260, child: searchField), + const Spacer(), + DsButton('重置', small: true, onPressed: _clearFilters), + ], + ); + }), + mobileCards: _mobileTableView + ? null + : filteredItems.map(_inventoryCard).toList(), + emptyText: '没有匹配的商品 · 试试调整筛选或搜索', + columns: visibleCols.map((c) { + final Widget? header = switch (c.key) { + 'spec' => DsFilterHeader( + label: c.label, + filtered: _filterSpec.isNotEmpty, + onOpen: (bctx) => _openMultiFilter(bctx, + options: specOptions, + selected: _filterSpec, onChanged: (v) { + setState(() => _filterSpec = v); + ref + .read(inventoryListProvider.notifier) + .setSpec(v.toList()); + }), + ), + 'series' => DsFilterHeader( + label: c.label, + filtered: _filterSeries.isNotEmpty, + onOpen: (bctx) => _openMultiFilter(bctx, + options: seriesOptions, + selected: _filterSeries, onChanged: (v) { + setState(() => _filterSeries = v); + ref + .read(inventoryListProvider.notifier) + .setSeries(v.toList()); + }), + ), + 'warehouse' => DsFilterHeader( + label: c.label, + filtered: _filterWarehouse.isNotEmpty, + onOpen: (bctx) => _openMultiFilter(bctx, + options: warehouseOptions, + selected: _filterWarehouse, + onChanged: (v) => + setState(() => _filterWarehouse = v)), + ), + // 原型 COLS 里带 filter 的列只有状态（单选）。 + 'status' => DsFilterHeader( + label: c.label, + filtered: _statusFilter != '全部', + onOpen: _openStatusMenu, + ), + _ => null, + }; + return DsColumn(c.key, c.label, + numeric: + const {'qty', 'cost', 'price'}.contains(c.key), + action: c.key == 'actions', + header: header); + }).toList(), + rows: filteredItems.map((item) { + return DsRow( + onTap: item.productId != null + ? () => _openEditor(item) + : null, + cells: visibleCols + .map((c) => + _buildInventoryCell(c.key, item, context)) + .toList(), + ); + }).toList(), + ), + ), + ], + )); + return Stack( + children: [ + content, + if (asyncInventory.isLoading) + const Positioned.fill(child: DsLoadingScrim()), ], ); }, ); } +} +/// 原型 .row-act svg：16px muted，hover→primary。 +class _RowActEye extends StatefulWidget { + final VoidCallback onTap; + const _RowActEye({required this.onTap}); + + @override + State<_RowActEye> createState() => _RowActEyeState(); +} + +class _RowActEyeState extends State<_RowActEye> { + bool _hover = false; + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return MouseRegion( + cursor: SystemMouseCursors.click, + onEnter: (_) => setState(() => _hover = true), + onExit: (_) => setState(() => _hover = false), + child: GestureDetector( + onTap: widget.onTap, + behavior: HitTestBehavior.opaque, + child: Padding( + padding: const EdgeInsets.all(4), + child: Icon(LucideIcons.eye, + size: 16, color: _hover ? t.primary : t.muted), + ), + ), + ); + } } class _InventoryStatusBadge extends StatelessWidget { @@ -890,163 +909,3 @@ class _InventoryStatusBadge extends StatelessWidget { return StatusPill(label: '在售', color: t.success, background: t.okSoft); } } - -// ── 导入进度对话框 ────────────────────────────────────────── - -enum _ImportStage { uploading, processing, done, error } - -class _ImportState { - final _ImportStage stage; - final int uploadPercent; - final int processingSeconds; - final int total; - final int imported; - final int updated; - final List errors; - final String? errorMsg; - - const _ImportState({ - required this.stage, - required this.uploadPercent, - this.processingSeconds = 0, - this.total = 0, - this.imported = 0, - this.updated = 0, - this.errors = const [], - this.errorMsg, - }); -} - -class _ImportProgressDialog extends StatelessWidget { - final ValueNotifier<_ImportState> stateNotifier; - const _ImportProgressDialog({required this.stateNotifier}); - - @override - Widget build(BuildContext context) { - return AlertDialog( - title: const Text('导入库存'), - content: ValueListenableBuilder<_ImportState>( - valueListenable: stateNotifier, - builder: (_, state, __) => SizedBox( - width: context.dialogWidth(320), - child: _buildContent(context, state), - ), - ), - actions: [ - ValueListenableBuilder<_ImportState>( - valueListenable: stateNotifier, - builder: (ctx, state, __) { - if (state.stage == _ImportStage.done || state.stage == _ImportStage.error) { - return TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('关闭'), - ); - } - return const SizedBox.shrink(); - }, - ), - ], - ); - } - - Widget _buildContent(BuildContext context, _ImportState state) { - switch (state.stage) { - case _ImportStage.uploading: - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('上传文件...', style: TextStyle(fontSize: 14)), - const SizedBox(height: 12), - LinearProgressIndicator( - value: state.uploadPercent / 100, - backgroundColor: context.tokens.borderSubtle, - valueColor: AlwaysStoppedAnimation(context.tokens.primary), - ), - const SizedBox(height: 6), - Text('${state.uploadPercent}%', - style: TextStyle(fontSize: 12, color: context.tokens.muted)), - ], - ); - - case _ImportStage.processing: - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row(children: [ - SizedBox( - width: 16, height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(context.tokens.primary), - ), - ), - const SizedBox(width: 10), - Text( - '导入数据中...${state.processingSeconds > 0 ? "（${state.processingSeconds}秒）" : ""}', - style: const TextStyle(fontSize: 14), - ), - ]), - const SizedBox(height: 8), - LinearProgressIndicator( - backgroundColor: context.tokens.borderSubtle, - valueColor: AlwaysStoppedAnimation(context.tokens.primary), - ), - ], - ); - - case _ImportStage.done: - final allFailed = state.total == 0 && state.errors.isNotEmpty; - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row(children: [ - Icon( - allFailed ? Icons.warning_amber_rounded : Icons.check_circle, - color: allFailed ? context.tokens.danger : context.tokens.success, - size: 20, - ), - const SizedBox(width: 8), - Text( - allFailed ? '导入失败' : '导入完成', - style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), - ), - ]), - const SizedBox(height: 10), - Text('共 ${state.total} 行', style: const TextStyle(fontSize: 13)), - Text('成功插入：${state.imported} 行', style: const TextStyle(fontSize: 13)), - Text('重复更新：${state.updated} 行', - style: TextStyle(fontSize: 13, color: context.tokens.muted)), - if (state.errors.isNotEmpty) - Text('失败：${state.errors.length} 行', - style: TextStyle(fontSize: 13, color: context.tokens.danger)), - if (state.errors.isNotEmpty) ...[ - const SizedBox(height: 6), - ...state.errors.map((e) => Padding( - padding: const EdgeInsets.only(top: 4), - child: Text(e, - style: TextStyle(fontSize: 12, color: context.tokens.danger)), - )), - ], - ], - ); - - case _ImportStage.error: - return Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Icon(Icons.error_outline, color: context.tokens.danger, size: 20), - const SizedBox(width: 8), - Expanded( - child: Text( - '导入失败：${state.errorMsg}', - style: TextStyle(fontSize: 13, color: context.tokens.danger), - ), - ), - ], - ); - } - } -} diff --git a/client/lib/screens/partners/partners_screen.dart b/client/lib/screens/partners/partners_screen.dart index 3b7bac2..9208a8c 100644 --- a/client/lib/screens/partners/partners_screen.dart +++ b/client/lib/screens/partners/partners_screen.dart @@ -1,20 +1,28 @@ -import '../../core/utils/dialog_util.dart'; +// screens/partners/partners_screen.dart — 往来单位（照原型 partners.html 1:1 重建）。 +// 版式：.head(标题+副标+刷新/新增) + .toolbar(搜索 260 + 类型 chips + 重置) +// + .table 7 列(名称双行/类型徽章/联系人/电话/应收/应付/操作) + .pager 仅文案。 +// 行点击 → 详情抽屉（partner_detail_drawer）；新增/编辑 → 弹窗（原型 frow 布局）。 import 'dart:async'; + import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../core/models/page_result.dart'; -import '../../core/responsive/responsive.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + import '../../core/config/app_constants.dart'; -import '../../core/theme/context_tokens.dart'; +import '../../core/responsive/responsive.dart'; import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/utils/dialog_util.dart'; +import '../../core/utils/export_util.dart'; import '../../models/partner.dart'; import '../../providers/partner_provider.dart'; -import '../../widgets/data_table_card.dart'; -import '../../widgets/kpi_card.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_table.dart'; import '../../widgets/mobile_list_card.dart'; -import '../../widgets/page_scaffold.dart'; -import '../../core/utils/export_util.dart'; +import '../../widgets/partner_detail_drawer.dart'; import '../../widgets/write_guard.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; class PartnersScreen extends ConsumerStatefulWidget { const PartnersScreen({super.key}); @@ -24,452 +32,409 @@ class PartnersScreen extends ConsumerStatefulWidget { } class _PartnersScreenState extends ConsumerState { - final _supplierSearchCtrl = TextEditingController(); - final _customerSearchCtrl = TextEditingController(); - Timer? _supplierDebounce; - Timer? _customerDebounce; + final _searchCtrl = TextEditingController(); + Timer? _debounce; + // 类型 chips（原型 TYPES 筛选）：全部 / 供应商 / 客户；「两者」在两侧均出现 + String _typeChip = '全部'; + + static const _typeChips = ['全部', '供应商', '客户']; @override void dispose() { - _supplierSearchCtrl.dispose(); - _customerSearchCtrl.dispose(); - _supplierDebounce?.cancel(); - _customerDebounce?.cancel(); + _debounce?.cancel(); + _searchCtrl.dispose(); super.dispose(); } + void _setType(String chip) { + setState(() => _typeChip = chip); + ref.read(partnersScreenProvider.notifier).setType(switch (chip) { + '供应商' => 'supplier', + '客户' => 'customer', + _ => null, + }); + } + + void _clearFilters() { + _searchCtrl.clear(); + setState(() => _typeChip = '全部'); + final n = ref.read(partnersScreenProvider.notifier); + n.setKeyword(''); + n.setType(null); + } + + void _reload() { + ref.read(partnersScreenProvider.notifier).reload(); + ref.invalidate(partnerBalancesProvider); + } + @override Widget build(BuildContext context) { - return PageScaffold( - title: '往来单位', - tabs: const [ - Tab(text: '供应商'), - Tab(text: '客户'), - ], - tabViews: [ - _buildSupplierTab(), - _buildCustomerTab(), - ], - ); - } + final t = context.tokens; + final async = ref.watch(partnersScreenProvider); + final balances = ref.watch(partnerBalancesProvider).valueOrNull ?? const {}; - Widget _buildSupplierTab() { - final asyncPartners = ref.watch(supplierListProvider); - return asyncPartners.when( + return async.when( loading: () => const Center(child: CircularProgressIndicator()), error: (e, _) => Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), + Icon(LucideIcons.cloudOff, size: 40, color: t.muted), const SizedBox(height: 12), - ElevatedButton( - onPressed: () => - ref.read(supplierListProvider.notifier).reload(), - child: const Text('重试'), - ), + Text('暂无数据，网络不可用', style: TextStyle(color: t.muted)), + const SizedBox(height: 12), + DsButton('重试', variant: DsBtnVariant.primary, onPressed: _reload), ], ), ), - data: (result) => _buildPartnerList( - result, - isSupplier: true, - searchCtrl: _supplierSearchCtrl, - onSearchChanged: (v) { - _supplierDebounce?.cancel(); - _supplierDebounce = Timer(AppConstants.searchDebounce, () { - ref.read(supplierListProvider.notifier).setKeyword(v); - }); - }, - onPageChanged: (p) => - ref.read(supplierListProvider.notifier).setPage(p), - onPageSizeChanged: (s) => - ref.read(supplierListProvider.notifier).setPageSize(s), - onAdd: () => _showPartnerDialog(context, isSupplier: true), - onEdit: (p) => - _showPartnerDialog(context, isSupplier: true, partner: p), - onDelete: (p) => _confirmDelete(context, p, isSupplier: true), - ), + data: (result) { + final partners = result.data; + final mobile = context.isMobile; + // 原型 .main{padding:22px 26px}；窄屏保持紧凑 + return Container( + color: t.bg, + padding: mobile + ? EdgeInsets.zero + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + children: [ + // ── 头部（原型 .head{margin-bottom:18px}）── + Container( + width: double.infinity, + color: t.bg, + padding: mobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text('往来单位', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text('供应商与客户档案 · 共 ${result.total} 个', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.muted)), + ), + const Spacer(), + if (!mobile) ...[ + DsButton('刷新', + icon: LucideIcons.refreshCw, onPressed: _reload), + const SizedBox(width: 10), + WriteGuard( + child: DsButton('新增往来单位', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => _openForm()), + ), + ], + ], + ), + ), + Expanded( + child: DsTable( + pagerInfoText: '共 ${result.total} 个往来单位', + emptyText: '没有匹配的往来单位 · 试试调整筛选或搜索', + toolbar: _toolbar(mobile, partners), + mobileCards: partners.map((p) => _card(p, balances)).toList(), + columns: const [ + DsColumn('name', '名称'), + DsColumn('type', '类型'), + DsColumn('contact', '联系人'), + DsColumn('phone', '电话'), + DsColumn('recv', '应收', numeric: true), + DsColumn('pay', '应付', numeric: true), + DsColumn('actions', '操作', action: true), + ], + rows: partners + .map((p) => DsRow( + onTap: () => _openDetail(p, balances), + cells: _cells(p, balances), + )) + .toList(), + ), + ), + ], + ), + ); + }, ); } - Widget _buildCustomerTab() { - final asyncPartners = ref.watch(customerListProvider); - return asyncPartners.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton( - onPressed: () => - ref.read(customerListProvider.notifier).reload(), - child: const Text('重试'), + // ── toolbar（原型：searchbox 260 + chips + sp + 重置）── + Widget _toolbar(bool mobile, List partners) { + final search = DsSearchBox( + controller: _searchCtrl, + hint: '名称 / 拼音', + width: mobile ? null : 260, + onChanged: (v) { + _debounce?.cancel(); + _debounce = Timer(AppConstants.searchDebounce, () { + ref.read(partnersScreenProvider.notifier).setKeyword(v.trim()); + }); + }, + ); + final chips = [ + for (final c in _typeChips) ...[ + DsChip( + label: c, + selected: _typeChip == c, + caret: false, + onTap: () => _setType(c)), + const SizedBox(width: 10), + ], + ]; + final reset = DsButton('重置', small: true, onPressed: _clearFilters); + final export = + DsButton('导出', small: true, icon: LucideIcons.download, onPressed: () { + exportExcel( + filename: '往来单位', + headers: ['编码', '名称', '类型', '联系人', '电话', '地址', '备注'], + rows: partners + .map((p) => [ + p.code ?? '', + p.name, + p.typeLabel, + p.contact ?? '', + p.phone ?? '', + p.address ?? '', + p.remark ?? '', + ]) + .toList(), + ); + }); + if (mobile) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + search, + const SizedBox(height: AppDims.sp2), + Row(children: [ + ...chips, + const Spacer(), + WriteGuard( + child: DsButton('新增', + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => _openForm()), ), - ], - ), - ), - data: (result) => _buildPartnerList( - result, - isSupplier: false, - searchCtrl: _customerSearchCtrl, - onSearchChanged: (v) { - _customerDebounce?.cancel(); - _customerDebounce = Timer(AppConstants.searchDebounce, () { - ref.read(customerListProvider.notifier).setKeyword(v); - }); - }, - onPageChanged: (p) => - ref.read(customerListProvider.notifier).setPage(p), - onPageSizeChanged: (s) => - ref.read(customerListProvider.notifier).setPageSize(s), - onAdd: () => _showPartnerDialog(context, isSupplier: false), - onEdit: (p) => - _showPartnerDialog(context, isSupplier: false, partner: p), - onDelete: (p) => _confirmDelete(context, p, isSupplier: false), - ), - ); - } - - Widget _buildPartnerList( - PageResult result, { - required bool isSupplier, - required TextEditingController searchCtrl, - required void Function(String) onSearchChanged, - required void Function(int) onPageChanged, - required void Function(int) onPageSizeChanged, - required VoidCallback onAdd, - required void Function(Partner) onEdit, - required void Function(Partner) onDelete, - }) { - final partners = result.data; - - Widget partnerCard(Partner p) { - return MobileListCard( - title: Text(p.name), - subtitle: p.code != null ? Text(p.code!) : null, - trailing: _PartnerStatusPill(p.status), - fields: [ - if (p.contact?.isNotEmpty == true) MobileCardField('联系人', p.contact), - if (p.phone?.isNotEmpty == true) MobileCardField('电话', p.phone), - if (p.address?.isNotEmpty == true) MobileCardField('地址', p.address), + ]), ], - actions: WriteGuard.isReadonly(ref) - ? const [] - : [ - WriteGuard( - child: TextButton( - key: Key('btn_edit_${p.id}'), - onPressed: () => onEdit(p), - child: const Text('编辑', style: TextStyle(fontSize: 13)), - ), - ), - WriteGuard( - child: TextButton( - key: Key('btn_delete_${p.id}'), - onPressed: () => onDelete(p), - child: Text('删除', - style: TextStyle(fontSize: 13, color: context.tokens.danger)), - ), - ), - ], ); } + return Row(children: [ + search, + const SizedBox(width: 10), + ...chips, + const Spacer(), + export, + const SizedBox(width: 10), + reset + ]); + } - return Column( - children: [ - // 副标（还原原型 .head .sub） - Container( - width: double.infinity, - color: context.tokens.bg, - padding: const EdgeInsets.fromLTRB( - AppDims.sp3, AppDims.sp3, AppDims.sp3, 0), - child: Text( - '共 ${result.total} 个${isSupplier ? '供应商' : '客户'}', - style: TextStyle( - fontSize: AppDims.fsSm, color: context.tokens.muted), - ), - ), - Expanded( - child: DataTableCard( - totalCount: result.total, - page: result.page, - pageSize: result.pageSize, - onPageChanged: onPageChanged, - onPageSizeChanged: onPageSizeChanged, - mobileCards: partners.map(partnerCard).toList(), - toolbar: Builder(builder: (ctx) { - final searchField = TextField( - controller: searchCtrl, - decoration: InputDecoration( - hintText: isSupplier ? '搜索供应商名称/编码' : '搜索客户名称/编码', - prefixIcon: const Icon(Icons.search, size: 16), - hintStyle: const TextStyle(fontSize: 13), - ), - onChanged: onSearchChanged, - ); - final buttons = [ - if (!WriteGuard.isReadonly(ref)) ...[ - WriteGuard( - child: ElevatedButton.icon( - onPressed: onAdd, - icon: const Icon(Icons.add, size: 16), - label: const Text('新建'), - ), + // ── 表格单元格（原型 7 列）── + List _cells(Partner p, Map bal) { + final t = context.tokens; + final b = bal[p.id]; + return [ + // 名称双行：.pname + .pcode(地址前 12 字…) + Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(p.name, + style: TextStyle(fontWeight: FontWeight.w600, color: t.heading)), + // 地址为空则不渲染副行（不占位、不显示「—」），行高回落单行 + if (p.address?.isNotEmpty == true) + Padding( + padding: const EdgeInsets.only(top: 2), + child: Text(_addrBrief(p.address!), + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), ), - const SizedBox(width: AppDims.sp2), - ], - OutlinedButton.icon( - onPressed: () => exportExcel( - filename: isSupplier ? '供应商列表' : '客户列表', - headers: ['编码', '名称', '联系人', '电话', '地址', '备注'], - rows: partners.map((p) => [ - p.code ?? '', p.name, p.contact ?? '', - p.phone ?? '', p.address ?? '', p.remark ?? '', - ]).toList(), - ), - icon: const Icon(Icons.download, size: 16), - label: const Text('导出'), - ), - ]; - if (ctx.isMobile) { - // 窄屏：搜索独占一行 + 操作按钮一行 - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - searchField, - const SizedBox(height: AppDims.sp2), - Row(children: [...buttons, const Spacer()]), - ], - ); - } - return Row( - children: [ - ...buttons, - const Spacer(), - SizedBox(width: 240, child: searchField), - ], - ); - }), - columns: const [ - DataColumn(label: Text('名称')), - DataColumn(label: Text('联系人')), - DataColumn(label: Text('联系电话')), - DataColumn(label: Text('地址')), - DataColumn(label: Text('状态')), - DataColumn(label: Text('操作')), - ], - rows: partners.isEmpty - ? [ - DataRow(cells: [ - DataCell(Text(isSupplier ? '暂无供应商' : '暂无客户', - style: - TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : partners - .map((p) => DataRow( - cells: [ - DataCell(SizedBox( - width: 200, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(p.name, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.w600)), - if ((p.code ?? '').isNotEmpty) - Text(p.code!, - style: TextStyle( - fontFamily: 'monospace', - fontSize: AppDims.fsXs, - color: context.tokens.muted)), - ], - ), - )), - DataCell(Text(p.contact ?? '-')), - DataCell(Text(p.phone ?? '-')), - DataCell(SizedBox( - width: 160, - child: Text(p.address ?? '-', - overflow: TextOverflow.ellipsis), - )), - DataCell(_PartnerStatusPill(p.status)), - DataCell(Row( - mainAxisSize: MainAxisSize.min, - children: WriteGuard.isReadonly(ref) - ? const [] - : [ - WriteGuard( - child: TextButton( - key: Key('btn_edit_${p.id}'), - onPressed: () => onEdit(p), - child: const Text('编辑', - style: TextStyle(fontSize: 12)), - ), - ), - WriteGuard( - child: TextButton( - key: Key('btn_delete_${p.id}'), - onPressed: () => onDelete(p), - child: Text('删除', - style: TextStyle( - fontSize: 12, - color: context.tokens.danger)), - ), - ), - ], - )), - ], - )) - .toList(), + ], + ), + partnerTypeBadge(p), + Text((p.contact?.isNotEmpty == true) ? p.contact! : '—'), + Text((p.phone?.isNotEmpty == true) ? p.phone! : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(fmtYuan(b?.recv ?? 0), + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(fmtYuan(b?.pay ?? 0), + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + _iconBtn(LucideIcons.eye, '详情', () => _openDetail(p, bal)), + const SizedBox(width: 8), + WriteGuard( + child: _iconBtn(LucideIcons.pencil, '编辑', () => _openForm(p)), ), + ], + ), + ]; + } + + /// 原型 .pcode = addr.slice(0,12)…（地址前 12 字 + 省略号） + String _addrBrief(String addr) => + addr.length > 12 ? '${addr.substring(0, 12)}…' : addr; + + Widget _iconBtn(IconData icon, String tip, VoidCallback onTap) { + final t = context.tokens; + return Tooltip( + message: tip, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Padding( + padding: const EdgeInsets.all(2), + child: Icon(icon, size: 16, color: t.muted), ), - ], + ), ); } - void _showPartnerDialog(BuildContext context, - {required bool isSupplier, Partner? partner}) { + // ── 窄屏卡片（m-partners：右侧类型徽章 + 应收/应付）── + Widget _card(Partner p, Map bal) { + final b = bal[p.id]; + return MobileListCard( + title: Text(p.name), + subtitle: (p.code?.isNotEmpty == true) ? Text(p.code!) : null, + trailing: partnerTypeBadge(p), + fields: [ + if (p.contact?.isNotEmpty == true) MobileCardField('联系人', p.contact), + if (p.phone?.isNotEmpty == true) MobileCardField('电话', p.phone), + MobileCardField('应收', fmtYuan(b?.recv ?? 0)), + MobileCardField('应付', fmtYuan(b?.pay ?? 0)), + ], + onTap: () => _openDetail(p, bal), + ); + } + + void _openDetail(Partner p, Map bal) { + showPartnerDetailDrawer( + context, + partner: p, + balance: bal[p.id], + onEdit: WriteGuard.isReadonly(ref) ? null : () => _openForm(p), + ); + } + + void _openForm([Partner? partner]) { showAppDialog( context: context, builder: (ctx) => _PartnerFormDialog( - isSupplier: isSupplier, partner: partner, - onSaved: () { - if (isSupplier) { - ref.read(supplierListProvider.notifier).reload(); - } else { - ref.read(customerListProvider.notifier).reload(); - } - }, + onSaved: _reload, + onDelete: partner == null ? null : () => _confirmDelete(partner), ), ); } - Future _confirmDelete(BuildContext context, Partner partner, - {required bool isSupplier}) async { + Future _confirmDelete(Partner partner) async { final confirmed = await showDialog( context: context, builder: (ctx) => AlertDialog( title: const Text('确认删除'), content: Text('确认删除「${partner.name}」？此操作不可恢复。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('删除'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('删除', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); if (confirmed == true && mounted) { try { - if (isSupplier) { - await ref - .read(supplierListProvider.notifier) - .deletePartner(partner.id); - } else { - await ref - .read(customerListProvider.notifier) - .deletePartner(partner.id); - } + await ref + .read(partnersScreenProvider.notifier) + .deletePartner(partner.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('删除成功'), - backgroundColor: context.tokens.success)); + showDsToast(context, '删除成功', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('删除失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); } } } } } -// 往来单位状态徽章（启用/停用），还原原型 .badge 圆点软底。 -class _PartnerStatusPill extends StatelessWidget { - final String status; - const _PartnerStatusPill(this.status); - - @override - Widget build(BuildContext context) { - final t = context.tokens; - return status == 'enabled' - ? StatusPill(label: '启用', color: t.success, background: t.okSoft) - : StatusPill(label: '停用', color: t.muted, background: t.borderSubtle); - } -} - +// ── 新增/编辑弹窗（原型 openAdd 的 frow 布局：名称*+类型 / 联系人+电话 / 地址 / +// 期初余额 + 备注（备注为既有能力保留））── class _PartnerFormDialog extends ConsumerStatefulWidget { - final bool isSupplier; final Partner? partner; final VoidCallback onSaved; + final VoidCallback? onDelete; - const _PartnerFormDialog({ - required this.isSupplier, - this.partner, - required this.onSaved, - }); + const _PartnerFormDialog( + {this.partner, required this.onSaved, this.onDelete}); @override - ConsumerState<_PartnerFormDialog> createState() => - _PartnerFormDialogState(); + ConsumerState<_PartnerFormDialog> createState() => _PartnerFormDialogState(); } class _PartnerFormDialogState extends ConsumerState<_PartnerFormDialog> { final _formKey = GlobalKey(); late final TextEditingController _nameCtrl; - late final TextEditingController _codeCtrl; late final TextEditingController _contactCtrl; late final TextEditingController _phoneCtrl; late final TextEditingController _addressCtrl; + late final TextEditingController _balanceCtrl; late final TextEditingController _remarkCtrl; + late String _type; // supplier / customer / supplier,customer bool _saving = false; + static const _typeOptions = { + 'supplier': '供应商', + 'customer': '客户', + 'supplier,customer': '两者', + }; + @override void initState() { super.initState(); final p = widget.partner; _nameCtrl = TextEditingController(text: p?.name ?? ''); - _codeCtrl = TextEditingController(text: p?.code ?? ''); _contactCtrl = TextEditingController(text: p?.contact ?? ''); _phoneCtrl = TextEditingController(text: p?.phone ?? ''); _addressCtrl = TextEditingController(text: p?.address ?? ''); + _balanceCtrl = TextEditingController( + text: (p?.balance ?? 0) == 0 ? '' : '${p!.balance}'); _remarkCtrl = TextEditingController(text: p?.remark ?? ''); + // SET 值可能乱序（customer,supplier）；归一化到选项 key + final raw = p?.type ?? 'supplier'; + final isS = raw.contains('supplier'), isC = raw.contains('customer'); + _type = isS && isC ? 'supplier,customer' : (isC ? 'customer' : 'supplier'); } @override void dispose() { _nameCtrl.dispose(); - _codeCtrl.dispose(); _contactCtrl.dispose(); _phoneCtrl.dispose(); _addressCtrl.dispose(); + _balanceCtrl.dispose(); _remarkCtrl.dispose(); super.dispose(); } @@ -479,19 +444,16 @@ class _PartnerFormDialogState extends ConsumerState<_PartnerFormDialog> { setState(() => _saving = true); final data = { 'name': _nameCtrl.text.trim(), - 'type': widget.isSupplier ? 'supplier' : 'customer', - if (_codeCtrl.text.trim().isNotEmpty) 'code': _codeCtrl.text.trim(), - if (_contactCtrl.text.trim().isNotEmpty) - 'contact': _contactCtrl.text.trim(), - if (_phoneCtrl.text.trim().isNotEmpty) 'phone': _phoneCtrl.text.trim(), - if (_addressCtrl.text.trim().isNotEmpty) - 'address': _addressCtrl.text.trim(), - if (_remarkCtrl.text.trim().isNotEmpty) 'remark': _remarkCtrl.text.trim(), + 'type': _type, + 'contact': _contactCtrl.text.trim(), + 'phone': _phoneCtrl.text.trim(), + 'address': _addressCtrl.text.trim(), + 'balance': double.tryParse(_balanceCtrl.text.trim()) ?? 0, + 'remark': _remarkCtrl.text.trim(), + if (widget.partner?.code != null) 'code': widget.partner!.code, }; try { - final notifier = widget.isSupplier - ? ref.read(supplierListProvider.notifier) - : ref.read(customerListProvider.notifier); + final notifier = ref.read(partnersScreenProvider.notifier); if (widget.partner != null) { await notifier.updatePartner(widget.partner!.id, data); } else { @@ -500,20 +462,12 @@ class _PartnerFormDialogState extends ConsumerState<_PartnerFormDialog> { if (mounted) { Navigator.of(context).pop(); widget.onSaved(); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(widget.partner != null ? '更新成功' : '创建成功'), - backgroundColor: context.tokens.success, - ), - ); + showDsToast(context, widget.partner != null ? '更新成功' : '创建成功', + bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('保存失败：$e'), - backgroundColor: context.tokens.danger), - ); + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _saving = false); @@ -523,83 +477,119 @@ class _PartnerFormDialogState extends ConsumerState<_PartnerFormDialog> { @override Widget build(BuildContext context) { final isEdit = widget.partner != null; - final typeName = widget.isSupplier ? '供应商' : '客户'; return Dialog( child: Container( - width: context.dialogWidth(520), + width: context.dialogWidth(560), padding: const EdgeInsets.all(24), child: Form( key: _formKey, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(isEdit ? '编辑$typeName' : '新建$typeName', - style: const TextStyle( - fontSize: 18, fontWeight: FontWeight.w600)), - const SizedBox(height: 20), - TextFormField( - controller: _nameCtrl, - decoration: InputDecoration(labelText: '$typeName名称'), - validator: (v) => - (v == null || v.isEmpty) ? '不能为空' : null, - ), - const SizedBox(height: 12), - Row(children: [ - if (isEdit) ...[ + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(isEdit ? '编辑往来单位' : '新增往来单位', + style: const TextStyle( + fontSize: 18, fontWeight: FontWeight.w600)), + const SizedBox(height: 20), + // frow1：名称* + 类型* + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ Expanded( - child: TextFormField( - controller: _codeCtrl, - decoration: const InputDecoration(labelText: '编码'), - ), + child: DsField('名称', + required: true, + input: TextFormField( + controller: _nameCtrl, + decoration: + const InputDecoration(hintText: '如：茅台华东总代'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '不能为空' : null, + )), ), - const SizedBox(width: 12), - ], - Expanded( - child: TextFormField( - controller: _contactCtrl, - decoration: const InputDecoration(labelText: '联系人'), + const SizedBox(width: 14), + Expanded( + child: DsField('类型', + required: true, + input: DsSelect( + value: _type, + options: [ + for (final e in _typeOptions.entries) + (e.key, e.value), + ], + onChanged: (v) => setState(() => _type = v), + )), ), + ]), + const SizedBox(height: 14), + // frow2：联系人 + 电话 + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded( + child: DsField('联系人', + input: TextFormField( + controller: _contactCtrl, + decoration: const InputDecoration(hintText: '姓名'), + )), + ), + const SizedBox(width: 14), + Expanded( + child: DsField('电话', + input: TextFormField( + controller: _phoneCtrl, + decoration: + const InputDecoration(hintText: '手机 / 座机'), + )), + ), + ]), + const SizedBox(height: 14), + // frow3：地址（单列占满） + DsField('地址', + input: TextFormField( + controller: _addressCtrl, + decoration: + const InputDecoration(hintText: '省 / 市 / 详细地址'), + )), + const SizedBox(height: 14), + // frow4：期初余额 + 备注 + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded( + child: DsField('期初余额', + input: TextFormField( + controller: _balanceCtrl, + keyboardType: const TextInputType.numberWithOptions( + decimal: true), + decoration: const InputDecoration(hintText: '0.00'), + )), + ), + const SizedBox(width: 14), + Expanded( + child: DsField('备注', + input: TextFormField( + controller: _remarkCtrl, + decoration: const InputDecoration(hintText: '备注说明'), + )), + ), + ]), + const SizedBox(height: 24), + Row( + children: [ + if (widget.onDelete != null) + WriteGuard( + child: DsButton('删除', variant: DsBtnVariant.danger, + onPressed: () { + Navigator.of(context).pop(); + widget.onDelete!(); + }), + ), + const Spacer(), + DsButton('取消', + onPressed: () => Navigator.of(context).pop()), + const SizedBox(width: 10), + DsButton(_saving ? '保存中…' : '保存', + variant: DsBtnVariant.primary, + onPressed: _saving ? null : _save), + ], ), - ]), - const SizedBox(height: 12), - TextFormField( - controller: _phoneCtrl, - decoration: const InputDecoration(labelText: '联系电话'), - ), - const SizedBox(height: 12), - TextFormField( - controller: _addressCtrl, - decoration: const InputDecoration(labelText: '地址'), - ), - const SizedBox(height: 12), - TextFormField( - controller: _remarkCtrl, - decoration: const InputDecoration(labelText: '备注'), - maxLines: 2, - ), - const SizedBox(height: 24), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - const SizedBox(width: 8), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('保存'), - ), - ], - ), - ], + ], + ), ), ), ), diff --git a/client/lib/screens/products/product_detail_screen.dart b/client/lib/screens/products/product_detail_screen.dart index 3b2d0e9..30ccbef 100644 --- a/client/lib/screens/products/product_detail_screen.dart +++ b/client/lib/screens/products/product_detail_screen.dart @@ -1,5 +1,5 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/utils/dialog_util.dart'; -import 'dart:typed_data'; import 'package:file_picker/file_picker.dart'; import 'package:image_picker/image_picker.dart'; import 'package:flutter/foundation.dart'; @@ -21,6 +21,9 @@ import '../../providers/product_provider.dart'; import '../../providers/inventory_provider.dart'; import '../../providers/shop_provider.dart' show shopInfoProvider; import '../../widgets/kpi_card.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; class ProductDetailScreen extends ConsumerStatefulWidget { final int productId; @@ -114,15 +117,11 @@ class _ProductDetailScreenState extends ConsumerState { _descChanged = false; }); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('描述已保存')), - ); + showDsToast(context, '描述已保存'); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('保存失败：$e'), backgroundColor: context.tokens.danger), - ); + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _savingDesc = false); @@ -153,12 +152,12 @@ class _ProductDetailScreenState extends ConsumerState { mainAxisSize: MainAxisSize.min, children: [ ListTile( - leading: const Icon(Icons.camera_alt_outlined), + leading: const Icon(LucideIcons.camera), title: const Text('拍照'), onTap: () => Navigator.pop(ctx, ImageSource.camera), ), ListTile( - leading: const Icon(Icons.photo_library_outlined), + leading: const Icon(LucideIcons.images), title: const Text('从相册选择'), onTap: () => Navigator.pop(ctx, ImageSource.gallery), ), @@ -202,15 +201,11 @@ class _ProductDetailScreenState extends ConsumerState { bytes: bytes, fileName: fileName); _updateImages([..._product!.images, img]); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('图片上传成功')), - ); + showDsToast(context, '图片上传成功'); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('上传失败：$e'), backgroundColor: context.tokens.danger), - ); + showDsToast(context, '上传失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _uploading = false); @@ -219,13 +214,13 @@ class _ProductDetailScreenState extends ConsumerState { Future _deleteImage(ProductImage img) async { try { - await ref.read(productRepositoryProvider).deleteImage(_product!.id, img.id); + await ref + .read(productRepositoryProvider) + .deleteImage(_product!.id, img.id); _updateImages(_product!.images.where((i) => i.id != img.id).toList()); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('删除失败：$e'), backgroundColor: context.tokens.danger), - ); + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); } } } @@ -234,13 +229,27 @@ class _ProductDetailScreenState extends ConsumerState { final p = _product!; setState(() { _product = Product( - id: p.id, publicId: p.publicId, code: p.code, barcode: p.barcode, - name: p.name, series: p.series, spec: p.spec, unit: p.unit, - categoryId: p.categoryId, brand: p.brand, purchasePrice: p.purchasePrice, - salePrice: p.salePrice, minStock: p.minStock, description: p.description, - remark: p.remark, customFields: p.customFields, images: images, - originName: p.originName, shelfLifeName: p.shelfLifeName, - storageName: p.storageName, categoryName: p.categoryName, + id: p.id, + publicId: p.publicId, + code: p.code, + barcode: p.barcode, + name: p.name, + series: p.series, + spec: p.spec, + unit: p.unit, + categoryId: p.categoryId, + brand: p.brand, + purchasePrice: p.purchasePrice, + salePrice: p.salePrice, + minStock: p.minStock, + description: p.description, + remark: p.remark, + customFields: p.customFields, + images: images, + originName: p.originName, + shelfLifeName: p.shelfLifeName, + storageName: p.storageName, + categoryName: p.categoryName, descriptionDocTitle: p.descriptionDocTitle, descriptionDocContent: p.descriptionDocContent, ); @@ -250,7 +259,8 @@ class _ProductDetailScreenState extends ConsumerState { void _showQRCode() { showAppDialog( context: context, - builder: (_) => _QRCodeDialog(productId: widget.productId, product: _product!), + builder: (_) => + _QRCodeDialog(productId: widget.productId, product: _product!), ); } @@ -260,7 +270,8 @@ class _ProductDetailScreenState extends ConsumerState { body: FutureBuilder( future: _future, builder: (context, snap) { - if (snap.connectionState == ConnectionState.waiting && _product == null) { + if (snap.connectionState == ConnectionState.waiting && + _product == null) { return const Center(child: CircularProgressIndicator()); } if (snap.hasError && _product == null) { @@ -268,7 +279,8 @@ class _ProductDetailScreenState extends ConsumerState { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.error_outline, size: 40, color: context.tokens.danger), + Icon(LucideIcons.circleAlert, + size: 40, color: context.tokens.danger), const SizedBox(height: 12), Text('加载失败：${snap.error}'), const SizedBox(height: 12), @@ -287,7 +299,7 @@ class _ProductDetailScreenState extends ConsumerState { Row( children: [ IconButton( - icon: const Icon(Icons.arrow_back), + icon: const Icon(LucideIcons.arrowLeft), onPressed: () => Navigator.of(context).pop(), tooltip: '返回', padding: EdgeInsets.zero, @@ -301,7 +313,7 @@ class _ProductDetailScreenState extends ConsumerState { ), OutlinedButton.icon( onPressed: _showQRCode, - icon: const Icon(Icons.qr_code, size: 16), + icon: const Icon(LucideIcons.qrCode, size: 16), label: const Text('二维码'), ), ], @@ -346,7 +358,8 @@ class _ProductDetailScreenState extends ConsumerState { // ── 富数据：KPI / 各仓库分布 / 近期流水（还原原型详情页） ────────────── - Widget _statCard({required String title, Widget? hint, required Widget body}) { + Widget _statCard( + {required String title, Widget? hint, required Widget body}) { return Card( elevation: 0, shape: RoundedRectangleBorder( @@ -392,18 +405,18 @@ class _ProductDetailScreenState extends ConsumerState { KpiCard( title: '当前库存', value: currentStock.toStringAsFixed(0), - icon: Icons.inventory_2, + icon: LucideIcons.box, tone: KpiTone.info, delta: '件'), KpiCard( title: '库存货值', value: '¥${(stockValue / 10000).toStringAsFixed(2)}万', - icon: Icons.account_balance_wallet, + icon: LucideIcons.wallet, tone: KpiTone.ok), KpiCard( title: '近30天出库', value: out30.toStringAsFixed(0), - icon: Icons.upload_outlined, + icon: LucideIcons.upload, tone: KpiTone.blue, delta: '件'), ]; @@ -435,7 +448,8 @@ class _ProductDetailScreenState extends ConsumerState { return _statCard( title: '各仓库库存分布', hint: Text('合计 ${total.toStringAsFixed(0)} 件', - style: TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), + style: + TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), body: Column( children: byWh.entries.map((e) { return Padding( @@ -465,7 +479,8 @@ class _ProductDetailScreenState extends ConsumerState { return _statCard( title: '价格历史', hint: Text('进价变更', - style: TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), + style: + TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), body: Column( children: _prices.asMap().entries.map((e) { final i = e.key; @@ -487,16 +502,18 @@ class _ProductDetailScreenState extends ConsumerState { width: 96, child: Text(p.date, style: TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: AppDims.fsSm, color: context.tokens.muted)), ), if (up || down) - Icon(up ? Icons.arrow_drop_up : Icons.arrow_drop_down, + Icon(up ? LucideIcons.chevronUp : LucideIcons.chevronDown, size: 18, color: color), Text('¥${p.price.toStringAsFixed(2)}', style: TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontWeight: FontWeight.w700, color: color)), ], @@ -511,7 +528,8 @@ class _ProductDetailScreenState extends ConsumerState { return _statCard( title: '近期流水', hint: Text('最近 ${_logs.length > 8 ? 8 : _logs.length} 条', - style: TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), + style: + TextStyle(fontSize: AppDims.fsXs, color: context.tokens.muted)), body: Column( children: _logs.take(8).map((l) { final isIn = l.direction == 'in'; @@ -523,7 +541,8 @@ class _ProductDetailScreenState extends ConsumerState { width: 96, child: Text(l.createdAt?.substring(0, 10) ?? '-', style: TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: AppDims.fsSm, color: context.tokens.muted)), ), @@ -538,7 +557,9 @@ class _ProductDetailScreenState extends ConsumerState { '${isIn ? '+' : '-'}${l.quantity.toStringAsFixed(0)}', style: TextStyle( fontWeight: FontWeight.w600, - color: isIn ? context.tokens.success : context.tokens.danger), + color: isIn + ? context.tokens.success + : context.tokens.danger), ), ], ), @@ -575,8 +596,8 @@ class _ProductDetailScreenState extends ConsumerState { )), if (p.images.length < 5) WriteGuard( - child: - _UploadButton(uploading: _uploading, onTap: _pickAndUpload), + child: _UploadButton( + uploading: _uploading, onTap: _pickAndUpload), ), ], ), @@ -621,14 +642,28 @@ class _ProductDetailScreenState extends ConsumerState { spacing: 32, runSpacing: 0, children: [ - SizedBox(width: 200, child: row('编号', p.code.isEmpty ? '-' : p.code)), - SizedBox(width: 200, child: row('系列', p.series?.isEmpty ?? true ? '-' : p.series!)), - SizedBox(width: 200, child: row('规格', p.spec?.isEmpty ?? true ? '-' : p.spec!)), - SizedBox(width: 200, child: row('品牌', p.brand?.isEmpty ?? true ? '-' : p.brand!)), - SizedBox(width: 200, child: row('单位', p.unit.isEmpty ? '-' : p.unit)), + SizedBox( + width: 200, child: row('编号', p.code.isEmpty ? '-' : p.code)), + SizedBox( + width: 200, + child: row('系列', p.series?.isEmpty ?? true ? '-' : p.series!)), + SizedBox( + width: 200, + child: row('规格', p.spec?.isEmpty ?? true ? '-' : p.spec!)), + SizedBox( + width: 200, + child: row('品牌', p.brand?.isEmpty ?? true ? '-' : p.brand!)), + SizedBox( + width: 200, child: row('单位', p.unit.isEmpty ? '-' : p.unit)), if (p.categoryName?.isNotEmpty ?? false) SizedBox(width: 200, child: row('分类', p.categoryName!)), - SizedBox(width: 200, child: row('进价', p.purchasePrice != null && p.purchasePrice! > 0 ? '¥${p.purchasePrice!.toStringAsFixed(2)}' : '-')), + SizedBox( + width: 200, + child: row( + '进价', + p.purchasePrice != null && p.purchasePrice! > 0 + ? '¥${p.purchasePrice!.toStringAsFixed(2)}' + : '-')), if (p.minStock != null && p.minStock! > 0) SizedBox(width: 200, child: row('库存预警', '${p.minStock}')), if (p.originName?.isNotEmpty ?? false) @@ -654,8 +689,7 @@ class _ProductDetailScreenState extends ConsumerState { if (fields == null || fields.isEmpty) return null; return fields.entries .where((e) => e.value != null && e.value.toString().isNotEmpty) - .map((e) => - SizedBox(width: 200, child: row(e.key, e.value.toString()))) + .map((e) => SizedBox(width: 200, child: row(e.key, e.value.toString()))) .toList(); } @@ -672,8 +706,8 @@ class _ProductDetailScreenState extends ConsumerState { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(p.descriptionDocTitle!, - style: const TextStyle( - fontSize: 14, fontWeight: FontWeight.w600)), + style: + const TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), if (p.descriptionDocContent?.isNotEmpty ?? false) ...[ const SizedBox(height: 10), Text(p.descriptionDocContent!, @@ -688,9 +722,8 @@ class _ProductDetailScreenState extends ConsumerState { Widget _buildPriceSection(Product p) { final price = p.salePrice!; - final priceStr = price % 1 == 0 - ? price.toInt().toString() - : price.toStringAsFixed(2); + final priceStr = + price % 1 == 0 ? price.toInt().toString() : price.toStringAsFixed(2); return Card( elevation: 0, shape: RoundedRectangleBorder( @@ -730,8 +763,8 @@ class _ProductDetailScreenState extends ConsumerState { Row( children: [ const Text('描述', - style: TextStyle( - fontSize: 14, fontWeight: FontWeight.w600)), + style: + TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), const Spacer(), if (_descChanged) WriteGuard( @@ -748,8 +781,8 @@ class _ProductDetailScreenState extends ConsumerState { minimumSize: Size.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), - child: - const Text('保存', style: TextStyle(fontSize: 13)), + child: const Text('保存', + style: TextStyle(fontSize: 13)), ), ), ], @@ -761,8 +794,7 @@ class _ProductDetailScreenState extends ConsumerState { minLines: 3, decoration: InputDecoration( hintText: '输入商品描述，例如酒的产地、工艺、口感等...', - hintStyle: TextStyle( - fontSize: 13, color: context.tokens.muted), + hintStyle: TextStyle(fontSize: 13, color: context.tokens.muted), border: OutlineInputBorder( borderRadius: BorderRadius.circular(4), borderSide: BorderSide(color: context.tokens.border)), @@ -792,8 +824,7 @@ class _ProductDetailScreenState extends ConsumerState { crossAxisAlignment: CrossAxisAlignment.start, children: [ const Text('公开链接', - style: - TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), const SizedBox(height: 12), Row( children: [ @@ -802,17 +833,16 @@ class _ProductDetailScreenState extends ConsumerState { style: TextStyle( fontSize: 12, color: context.tokens.primary, - fontFamily: 'monospace')), + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), ), const SizedBox(width: 8), OutlinedButton.icon( onPressed: () { Clipboard.setData(ClipboardData(text: publicUrl)); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('链接已复制')), - ); + showDsToast(context, '链接已复制'); }, - icon: const Icon(Icons.copy, size: 14), + icon: const Icon(LucideIcons.copy, size: 14), label: const Text('复制'), ), ], @@ -850,8 +880,8 @@ class _ImageThumbnail extends StatelessWidget { width: 110, height: 110, color: context.tokens.border, - child: Icon(Icons.broken_image, - color: context.tokens.muted), + child: + Icon(LucideIcons.imageOff, color: context.tokens.muted), ), ), ), @@ -861,19 +891,19 @@ class _ImageThumbnail extends StatelessWidget { right: 4, child: WriteGuard( child: GestureDetector( - onTap: onDelete, - child: Container( - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.black54, - borderRadius: BorderRadius.circular(10), + onTap: onDelete, + child: Container( + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.black54, // ds-ignore: 图片遮罩媒体固定色 + borderRadius: BorderRadius.circular(10), + ), + child: const Icon(LucideIcons.x, + size: 14, color: Colors.white), // ds-ignore: 图片遮罩媒体固定色 ), - child: - const Icon(Icons.close, size: 14, color: Colors.white), ), ), - ), ), ], ), @@ -907,12 +937,12 @@ class _UploadButton extends StatelessWidget { : Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.add_photo_alternate_outlined, + Icon(LucideIcons.imagePlus, size: 28, color: context.tokens.muted), const SizedBox(height: 4), Text('上传图片', - style: TextStyle( - fontSize: 11, color: context.tokens.muted)), + style: + TextStyle(fontSize: 11, color: context.tokens.muted)), ], ), ), @@ -936,12 +966,11 @@ class _QRCodeDialogState extends ConsumerState<_QRCodeDialog> { @override void initState() { super.initState(); - _future = ref - .read(productRepositoryProvider) - .getQRCodeBytes(widget.productId) - ..then((b) { - if (mounted) setState(() => _bytes = b); - }); + _future = + ref.read(productRepositoryProvider).getQRCodeBytes(widget.productId) + ..then((b) { + if (mounted) setState(() => _bytes = b); + }); } void _print() { @@ -986,14 +1015,12 @@ class _QRCodeDialogState extends ConsumerState<_QRCodeDialog> { ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('关闭'), - ), - FilledButton.icon( + DsButton('关闭', onPressed: () => Navigator.of(context).pop()), + DsButton( + '打印', + icon: LucideIcons.printer, + variant: DsBtnVariant.primary, onPressed: _bytes == null ? null : _print, - icon: const Icon(Icons.print, size: 16), - label: const Text('打印'), ), ], ); diff --git a/client/lib/screens/products/products_screen.dart b/client/lib/screens/products/products_screen.dart index dc0bc0b..4631323 100644 --- a/client/lib/screens/products/products_screen.dart +++ b/client/lib/screens/products/products_screen.dart @@ -1,164 +1,379 @@ -import '../../core/utils/dialog_util.dart'; +// screens/products/products_screen.dart — 基础数据（照原型 products.html 重建）。 +// 版式：.head(标题+副标+刷新/新增) + .seg 分段 tab + 各视图(.toolbar+.table+.pager)。 +// tab 集合按用户口径收敛为 5 个：商品档案 / 商品介绍 / 系列 / 规格 / 仓库 +// （商品名称并入档案；产地/保质期/储存方式/香型撤销管理入口，字典后端保留）。 +// 已知差异（记 design/CONTRACT.md）：档案无「分类/状态」列与香型 chips（香型弃用）； +// 档案无「新增商品」（product=序列号铁律：入库每行自动建档）；字典无「关联商品」列（无计数源）。 +import 'dart:async'; + import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../../core/config/app_constants.dart'; import '../../core/responsive/responsive.dart'; -import '../../core/theme/context_tokens.dart'; import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/utils/dialog_util.dart'; +import '../../core/utils/export_util.dart'; import '../../models/warehouse.dart'; -import '../../models/product.dart'; import '../../providers/product_option_provider.dart'; import '../../providers/product_provider.dart'; -import '../../models/product_option.dart' show ProductCategoryOption; -import '../../providers/warehouse_provider.dart'; import '../../providers/shop_provider.dart'; -import '../../widgets/data_table_card.dart'; +import '../../providers/warehouse_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_table.dart'; import '../../widgets/mobile_list_card.dart'; -import '../../widgets/page_scaffold.dart'; -import '../../core/utils/export_util.dart'; +import '../../widgets/product_editor_drawer.dart'; import '../../widgets/write_guard.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; class ProductsScreen extends ConsumerStatefulWidget { - const ProductsScreen({super.key}); + /// 初始 tab（对齐原型 products.html?tab=intro：1=商品介绍）。 + final int initialTab; + const ProductsScreen({super.key, this.initialTab = 0}); @override ConsumerState createState() => _ProductsScreenState(); } class _ProductsScreenState extends ConsumerState { + // ── seg tab（原型 5 个；香型→仓库 为用户口径调整）── + static const _tabs = ['商品档案', '商品介绍', '系列', '规格', '仓库']; + late int _tab = widget.initialTab.clamp(0, _tabs.length - 1); + // 「设为默认」的乐观覆盖：点一下立刻变色，不等后端回包（key→选项 id）。 final Map _optDefaults = {}; final _archiveSearchCtrl = TextEditingController(); - final _nameSearchCtrl = TextEditingController(); + final _introSearchCtrl = TextEditingController(); final _seriesSearchCtrl = TextEditingController(); final _specSearchCtrl = TextEditingController(); - final _originSearchCtrl = TextEditingController(); - final _shelfLifeSearchCtrl = TextEditingController(); - final _storageSearchCtrl = TextEditingController(); - final _descDocSearchCtrl = TextEditingController(); - final _categorySearchCtrl = TextEditingController(); - - int _namePage = 1; - int _namePageSize = 20; - int _seriesPage = 1; - int _seriesPageSize = 20; - int _specPage = 1; - int _specPageSize = 20; - int _originPage = 1; - int _originPageSize = 20; - int _shelfLifePage = 1; - int _shelfLifePageSize = 20; - int _storagePage = 1; - int _storagePageSize = 20; - int _descDocPage = 1; - int _descDocPageSize = 20; - int _categoryPage = 1; - int _categoryPageSize = 20; + final _warehouseSearchCtrl = TextEditingController(); + Timer? _debounce; @override void dispose() { - _nameSearchCtrl.dispose(); + _debounce?.cancel(); + _archiveSearchCtrl.dispose(); + _introSearchCtrl.dispose(); _seriesSearchCtrl.dispose(); _specSearchCtrl.dispose(); - _originSearchCtrl.dispose(); - _shelfLifeSearchCtrl.dispose(); - _storageSearchCtrl.dispose(); - _descDocSearchCtrl.dispose(); - _categorySearchCtrl.dispose(); - _archiveSearchCtrl.dispose(); + _warehouseSearchCtrl.dispose(); super.dispose(); } + void _reload() { + switch (_tab) { + case 0: + ref.read(productListProvider.notifier).reload(); + case 1: + ref.read(productDescriptionDocListProvider.notifier).reload(); + case 2: + ref.read(productSeriesListProvider.notifier).reload(); + case 3: + ref.read(productSpecListProvider.notifier).reload(); + case 4: + ref.read(warehouseListProvider.notifier).reload(); + } + } + + /// 各 tab 的「新增」动作；档案无新增（入库每行自动建独立序列号档案）。 + VoidCallback? get _addAction => switch (_tab) { + 1 => () => _showDescDocDialog( + title: '新增介绍', + onSave: (data) => ref + .read(productDescriptionDocListProvider.notifier) + .create(data), + ), + 2 => () => _showOptionDialog( + title: '新增系列', + hasQuantity: false, + onSave: (data) => + ref.read(productSeriesListProvider.notifier).create(data), + ), + 3 => () => _showOptionDialog( + title: '新增规格', + hasQuantity: true, + onSave: (data) => + ref.read(productSpecListProvider.notifier).create(data), + ), + 4 => () => _showWarehouseDialog(), + _ => null, + }; + + String get _addLabel => switch (_tab) { + 1 => '新增介绍', + 2 => '新增系列', + 3 => '新增规格', + 4 => '新增仓库', + _ => '', + }; + @override Widget build(BuildContext context) { - return PageScaffold( - title: '基础数据', - // 原型 5 个 tab（商品档案/商品介绍/系列/规格/香型）置前； - // 其余字典（商品名称/产地/保质期/储存/仓库）保留在后，不删管理入口。 - tabs: const [ - Tab(text: '商品档案'), - Tab(text: '商品介绍'), - Tab(text: '系列'), - Tab(text: '规格'), - Tab(text: '香型'), - Tab(text: '商品名称'), - Tab(text: '产地'), - Tab(text: '保质期'), - Tab(text: '储存方式'), - Tab(text: '仓库'), + final t = context.tokens; + final mobile = context.isMobile; + final addAction = _addAction; + // 原型 .main{padding:22px 26px}；窄屏保持紧凑 + return Container( + color: t.bg, + padding: + mobile ? EdgeInsets.zero : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // ── 头部（原型 .head{margin-bottom:18px}）── + Container( + color: t.bg, + padding: mobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text('基础数据', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text(_subText(), + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + const Spacer(), + if (!mobile) ...[ + DsButton('刷新', + icon: LucideIcons.refreshCw, onPressed: _reload), + if (addAction != null) ...[ + const SizedBox(width: 10), + WriteGuard( + child: DsButton(_addLabel, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: addAction), + ), + ], + ], + ], + ), + ), + // ── .seg（原型 margin-bottom:14px）── + Padding( + padding: mobile + ? const EdgeInsets.fromLTRB(AppDims.sp4, 0, AppDims.sp4, 12) + : const EdgeInsets.only(bottom: 14), + child: Align( + alignment: Alignment.centerLeft, + child: mobile + ? SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: _seg(), + ) + : _seg(), + ), + ), + Expanded( + child: switch (_tab) { + 0 => _archiveView(), + 1 => _introView(), + 2 => _seriesView(), + 3 => _specView(), + _ => _warehouseView(), + }, + ), + ], + ), + ); + } + + Widget _seg() => DsSeg( + items: _tabs, + index: _tab, + onChanged: (i) => setState(() => _tab = i), + ); + + String _subText() { + switch (_tab) { + case 0: + final total = ref.watch(productListProvider).valueOrNull?.total ?? 0; + return '商品名 → 系列 → 规格 · 共 $total 个'; + case 1: + final n = + ref.watch(productDescriptionDocListProvider).valueOrNull?.length ?? + 0; + return '商品介绍库 · 共 $n 条'; + case 2: + final n = ref.watch(productSeriesListProvider).valueOrNull?.length ?? 0; + return '系列字典 · 共 $n 项'; + case 3: + final n = ref.watch(productSpecListProvider).valueOrNull?.length ?? 0; + return '规格字典 · 共 $n 项'; + default: + final n = ref.watch(warehouseListProvider).valueOrNull?.length ?? 0; + return '仓库档案 · 共 $n 个'; + } + } + + Widget _error(VoidCallback onRetry) { + final t = context.tokens; + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(LucideIcons.cloudOff, size: 40, color: t.muted), + const SizedBox(height: 12), + Text('暂无数据，网络不可用', style: TextStyle(color: t.muted)), + const SizedBox(height: 12), + DsButton('重试', variant: DsBtnVariant.primary, onPressed: onRetry), + ], + ), + ); + } + + /// 视图 toolbar（原型：searchbox 260 + sp + 导出 + 重置）。 + Widget _viewToolbar({ + required TextEditingController ctrl, + required String hint, + required VoidCallback onChanged, + VoidCallback? onExport, + bool mobileAdd = false, + }) { + final mobile = context.isMobile; + final search = DsSearchBox( + controller: ctrl, + hint: hint, + width: mobile ? null : 260, + onChanged: (_) => onChanged(), + ); + final reset = DsButton('重置', small: true, onPressed: () { + ctrl.clear(); + onChanged(); + }); + if (mobile) { + final addAction = _addAction; + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + search, + const SizedBox(height: AppDims.sp2), + Row(children: [ + reset, + const Spacer(), + if (mobileAdd && addAction != null) + WriteGuard( + child: DsButton(_addLabel, + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: addAction), + ), + ]), + ], + ); + } + return Row(children: [ + search, + const Spacer(), + if (onExport != null) ...[ + DsButton('导出', + small: true, icon: LucideIcons.download, onPressed: onExport), + const SizedBox(width: 10), ], - tabViews: [ - _buildArchiveTab(), - _buildDescDocTab(), - _buildSeriesTab(), - _buildSpecTab(), - _buildCategoryTab(), - _buildNameTab(), - _buildOriginTab(), - _buildShelfLifeTab(), - _buildStorageTab(), - _buildWarehousesTab(), + reset, + ]); + } + + Widget _iconBtn(IconData icon, String tip, VoidCallback onTap, + {Color? color}) { + final t = context.tokens; + return Tooltip( + message: tip, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Padding( + padding: const EdgeInsets.all(2), + child: Icon(icon, size: 16, color: color ?? t.muted), + ), + ), + ); + } + + /// 名称双行单元格（.pname + .pcode）。 + Widget _nameCell(String name, String? code) { + final t = context.tokens; + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(name, + style: TextStyle(fontWeight: FontWeight.w600, color: t.heading)), + if ((code ?? '').isNotEmpty) + Padding( + padding: const EdgeInsets.only(top: 2), + child: Text(code!, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ), ], ); } - // ── 商品档案 tab（全量商品表，还原原型头牌） ──────────────────── - Widget _buildArchiveTab() { + // ── 商品档案（archiveView）──────────────────────────────────── + Widget _archiveView() { final async = ref.watch(productListProvider); return async.when( loading: () => const Center(child: CircularProgressIndicator()), error: (e, _) => - _buildError(() => ref.read(productListProvider.notifier).reload()), + _error(() => ref.read(productListProvider.notifier).reload()), data: (result) { final items = result.data; final notifier = ref.read(productListProvider.notifier); - return DataTableCard( - totalCount: result.total, + return DsTable( + total: result.total, page: result.page, pageSize: result.pageSize, - onPageChanged: (p) => notifier.setPage(p), - onPageSizeChanged: (s) => notifier.setPageSize(s), - toolbar: Row( - children: [ - SizedBox( - width: 240, - child: TextField( - controller: _archiveSearchCtrl, - decoration: const InputDecoration( - hintText: '商品名 / 编码 / 拼音，回车搜索', - prefixIcon: Icon(Icons.search, size: 16), - hintStyle: TextStyle(fontSize: 13), - ), - onSubmitted: (v) => notifier.setKeyword(v.trim()), - ), - ), - const SizedBox(width: AppDims.sp2), - OutlinedButton.icon( - onPressed: () => exportExcel( - filename: '商品档案', - headers: ['商品编码', '商品名称', '系列', '规格', '分类', '单位', '默认成本价'], - rows: items - .map((p) => [ - p.code, - p.name, - p.series ?? '', - p.spec ?? '', - p.categoryName ?? '', - p.unit, - p.purchasePrice ?? '', - ]) - .toList(), - ), - icon: const Icon(Icons.download, size: 16), - label: const Text('导出'), - ), - const Spacer(), - ], + onPageChanged: notifier.setPage, + onPageSizeChanged: notifier.setPageSize, + emptyText: '没有匹配的商品 · 试试调整筛选或搜索（入库录单后自动建档）', + toolbar: _viewToolbar( + ctrl: _archiveSearchCtrl, + hint: '商品名 / 拼音 / 编码', + onChanged: () { + _debounce?.cancel(); + _debounce = Timer(AppConstants.searchDebounce, () { + notifier.setKeyword(_archiveSearchCtrl.text.trim()); + }); + }, + onExport: () => exportExcel( + filename: '商品档案', + headers: ['商品编码', '商品名称', '系列', '规格', '单位', '默认成本价'], + rows: items + .map((p) => [ + p.code, + p.name, + p.series ?? '', + p.spec ?? '', + p.unit, + p.purchasePrice ?? '', + ]) + .toList(), + ), ), mobileCards: items .map((p) => MobileListCard( - onTap: () => context.push('/products/${p.id}'), + onTap: () => showProductEditorDrawer(context, + productId: p.id, cost: p.purchasePrice), title: Text(p.name), subtitle: p.code.isEmpty ? null : Text(p.code), fields: [ @@ -166,269 +381,188 @@ class _ProductsScreenState extends ConsumerState { MobileCardField('系列', p.series), if ((p.spec ?? '').isNotEmpty) MobileCardField('规格', p.spec), - if ((p.categoryName ?? '').isNotEmpty) - MobileCardField('分类', p.categoryName), MobileCardField('单位', p.unit.isEmpty ? '-' : p.unit), ], )) .toList(), columns: const [ - DataColumn(label: Text('商品')), - DataColumn(label: Text('系列')), - DataColumn(label: Text('规格')), - DataColumn(label: Text('分类')), - DataColumn(label: Text('单位')), - DataColumn(label: Text('默认成本价')), - DataColumn(label: Text('操作')), + DsColumn('product', '商品'), + DsColumn('series', '系列'), + DsColumn('spec', '规格'), + DsColumn('unit', '单位'), + DsColumn('cost', '默认成本价', numeric: true), + DsColumn('actions', '操作', action: true), ], - rows: items.isEmpty - ? [ - DataRow(cells: [ - DataCell(Text('暂无商品（入库录单后自动建档）', - style: TextStyle(color: context.tokens.muted))), - for (int i = 1; i < 7; i++) const DataCell(SizedBox()), - ]) - ] - : items - .map((p) => DataRow( - onSelectChanged: (_) => context.push('/products/${p.id}'), - cells: [ - DataCell(SizedBox( - width: 200, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(p.name, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.w600)), - if (p.code.isNotEmpty) - Text(p.code, - style: TextStyle( - fontFamily: 'monospace', - fontSize: AppDims.fsXs, - color: context.tokens.muted)), - ], - ), - )), - DataCell(Text((p.series ?? '').isEmpty ? '-' : p.series!)), - DataCell(Text((p.spec ?? '').isEmpty ? '-' : p.spec!)), - DataCell(Text((p.categoryName ?? '').isEmpty - ? '-' - : p.categoryName!)), - DataCell(Text(p.unit.isEmpty ? '-' : p.unit)), - DataCell(Text( - p.purchasePrice != null && p.purchasePrice! > 0 - ? '¥${p.purchasePrice!.toStringAsFixed(2)}' - : '-')), - DataCell(TextButton( - onPressed: () => context.push('/products/${p.id}'), - child: const Text('查看', - style: TextStyle(fontSize: 12)), - )), - ], - )) - .toList(), + rows: items.map((p) { + return DsRow( + onTap: () => showProductEditorDrawer(context, + productId: p.id, cost: p.purchasePrice), + cells: [ + _nameCell(p.name, p.code), + Text((p.series ?? '').isEmpty ? '—' : p.series!), + Text((p.spec ?? '').isEmpty ? '—' : p.spec!), + Text(p.unit.isEmpty ? '—' : p.unit), + Text( + p.purchasePrice != null && p.purchasePrice! > 0 + ? fmtCny(p.purchasePrice!) + : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + _iconBtn( + LucideIcons.eye, + '编辑抽屉', + () => showProductEditorDrawer(context, + productId: p.id, cost: p.purchasePrice)), + const SizedBox(width: 8), + _iconBtn(LucideIcons.pencil, '商品详情', + () => context.push('/products/${p.id}')), + ], + ), + ], + ); + }).toList(), ); }, ); } - // ── 商品名称 tab ─────────────────────────────────────────── - - Widget _buildNameTab() { - final async = ref.watch(productNameListProvider); + // ── 商品介绍（introView）───────────────────────────────────── + Widget _introView() { + final async = ref.watch(productDescriptionDocListProvider); return async.when( loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productNameListProvider.notifier).reload()), + error: (e, _) => _error( + () => ref.read(productDescriptionDocListProvider.notifier).reload()), data: (items) { - final defaultId = _effectiveDefault('default_name_id', - ref.watch(shopInfoProvider).valueOrNull?.defaultNameId); - final keyword = _nameSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty + final t = context.tokens; + final kw = _introSearchCtrl.text.toLowerCase(); + // 原型：搜索介绍标题 / 内容 + final filtered = kw.isEmpty ? items : items .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) + it.title.toLowerCase().contains(kw) || + (it.content?.toLowerCase().contains(kw) ?? false)) .toList(); - final paged = filtered - .skip((_namePage - 1) * _namePageSize) - .take(_namePageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _namePage, - pageSize: _namePageSize, - onPageChanged: (p) => setState(() => _namePage = p), - onPageSizeChanged: (s) => setState(() { - _namePageSize = s; - _namePage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _nameSearchCtrl, - hint: '搜索名称/编号', - onSearchChanged: () => setState(() => _namePage = 1), - onAdd: () => _showOptionDialog( - title: '新建商品名称', - hasQuantity: false, - onSave: (data) => - ref.read(productNameListProvider.notifier).create(data), - ), + return DsTable( + pagerInfoText: '共 ${filtered.length} 条商品介绍', + emptyText: '还没有商品介绍 · 点「新增介绍」创建', + toolbar: _viewToolbar( + ctrl: _introSearchCtrl, + hint: '搜索介绍标题 / 内容', + onChanged: () => setState(() {}), + mobileAdd: true, onExport: () => exportExcel( - filename: '商品名称', - headers: ['编号', '名称', '备注'], + filename: '商品介绍', + headers: ['标题', '内容', '备注'], rows: items - .map((it) => [it.code ?? '', it.name, it.remark ?? '']) + .map((it) => [it.title, it.content ?? '', it.remark ?? '']) .toList(), ), ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_name_id', it.id), - onEdit: () => _showOptionDialog( - title: '编辑商品名称', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productNameListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除名称「${it.name}」？', - () => ref - .read(productNameListProvider.notifier) - .delete(it.id), - ), + mobileCards: filtered + .map((it) => MobileListCard( + title: Text(it.title), + fields: [ + if (it.content?.isNotEmpty == true) + MobileCardField('内容', it.content), + ], + onTap: () => + _editIntro(it.id, it.title, it.content, it.remark), )) .toList(), columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('名称')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')), + DsColumn('title', '标题'), + DsColumn('summary', '内容摘要'), + DsColumn('actions', '操作', action: true), ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_name_id', it.id), - onEdit: () => _showOptionDialog( - title: '编辑商品名称', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productNameListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除名称「${it.name}」？', - () => ref - .read(productNameListProvider.notifier) - .delete(it.id), - ), - )), - ])) - .toList(), + rows: filtered.map((it) { + return DsRow( + onTap: () => _editIntro(it.id, it.title, it.content, it.remark), + cells: [ + Text(it.title, + style: TextStyle( + fontWeight: FontWeight.w600, color: t.heading)), + // 原型 .intro-sum：muted 单行省略 max-width 380 + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 380), + child: Text(it.content ?? '—', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: t.muted)), + ), + WriteGuard( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + _iconBtn( + LucideIcons.pencil, + '编辑', + () => _editIntro( + it.id, it.title, it.content, it.remark)), + const SizedBox(width: 8), + _iconBtn( + LucideIcons.x, + '删除', + () => _confirmDelete( + '删除商品介绍「${it.title}」？', + () => ref + .read(productDescriptionDocListProvider + .notifier) + .delete(it.id))), + ], + ), + ), + ], + ); + }).toList(), ); }, ); } - // ── 系列 tab ────────────────────────────────────────────── + void _editIntro(int id, String title, String? content, String? remark) { + _showDescDocDialog( + title: '编辑介绍', + initial: { + 'title': title, + 'content': content ?? '', + 'remark': remark ?? '' + }, + onSave: (data) => ref + .read(productDescriptionDocListProvider.notifier) + .updateItem(id, data), + ); + } - Widget _buildSeriesTab() { + // ── 系列 / 规格（configView，共用版式）─────────────────────── + Widget _seriesView() { final async = ref.watch(productSeriesListProvider); return async.when( loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productSeriesListProvider.notifier).reload()), + error: (e, _) => + _error(() => ref.read(productSeriesListProvider.notifier).reload()), data: (items) { final defaultId = _effectiveDefault('default_series_id', ref.watch(shopInfoProvider).valueOrNull?.defaultSeriesId); - final keyword = _seriesSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) - .toList(); - final paged = filtered - .skip((_seriesPage - 1) * _seriesPageSize) - .take(_seriesPageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _seriesPage, - pageSize: _seriesPageSize, - onPageChanged: (p) => setState(() => _seriesPage = p), - onPageSizeChanged: (s) => setState(() { - _seriesPageSize = s; - _seriesPage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _seriesSearchCtrl, - hint: '搜索系列/编号', - onSearchChanged: () => setState(() => _seriesPage = 1), - onAdd: () => _showOptionDialog( - title: '新建系列', - hasQuantity: false, - onSave: (data) => - ref.read(productSeriesListProvider.notifier).create(data), - ), - onExport: () => exportExcel( - filename: '商品系列', - headers: ['编号', '系列名称', '备注'], - rows: items - .map((it) => [it.code ?? '', it.name, it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_series_id', it.id), - onEdit: () => _showOptionDialog( + return _configTable( + label: '系列', + searchCtrl: _seriesSearchCtrl, + rows: [ + for (final it in items) + ( + id: it.id, + name: it.name, + code: it.code, + note: it.remark ?? '', + isDefault: it.id == defaultId, + onSetDefault: () => + _setDefaultOption('default_series_id', it.id), + onEdit: () => _showOptionDialog( title: '编辑系列', hasQuantity: false, initial: { @@ -440,240 +574,50 @@ class _ProductsScreenState extends ConsumerState { .read(productSeriesListProvider.notifier) .updateItem(it.id, data), ), - onDelete: () => _confirmDelete( - '删除系列「${it.name}」？', - () => ref - .read(productSeriesListProvider.notifier) - .delete(it.id), - ), - )) - .toList(), - columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('系列名称')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')), + onDelete: () => _confirmDelete( + '删除系列「${it.name}」？', + () => ref + .read(productSeriesListProvider.notifier) + .delete(it.id)), + ), ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_series_id', it.id), - onEdit: () => _showOptionDialog( - title: '编辑系列', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productSeriesListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除系列「${it.name}」？', - () => ref - .read(productSeriesListProvider.notifier) - .delete(it.id), - ), - )), - ])) - .toList(), - ); - }, - ); - } - - // ── 香型 tab（ProductCategory，仅名称） ────────────────────── - Widget _buildCategoryTab() { - final async = ref.watch(productCategoryListProvider); - return async.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productCategoryListProvider.notifier).reload()), - data: (items) { - final keyword = _categorySearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => it.name.toLowerCase().contains(keyword)) - .toList(); - final paged = filtered - .skip((_categoryPage - 1) * _categoryPageSize) - .take(_categoryPageSize) - .toList(); - final notifier = ref.read(productCategoryListProvider.notifier); - - void edit(ProductCategoryOption it) => _showOptionDialog( - title: '编辑香型', - hasQuantity: false, - initial: {'name': it.name}, - onSave: (data) => - notifier.updateItem(it.id, {'name': data['name']}), - ); - List rowActions(ProductCategoryOption it) => - WriteGuard.isReadonly(ref) - ? const [] - : [ - WriteGuard( - child: TextButton( - onPressed: () => edit(it), - child: const Text('编辑', - style: TextStyle(fontSize: 12)), - ), - ), - WriteGuard( - child: TextButton( - onPressed: () => _confirmDelete( - '删除香型「${it.name}」？', - () => notifier.delete(it.id), - ), - child: Text('删除', - style: TextStyle( - fontSize: 12, color: context.tokens.danger)), - ), - ), - ]; - - return DataTableCard( - totalCount: filtered.length, - page: _categoryPage, - pageSize: _categoryPageSize, - onPageChanged: (p) => setState(() => _categoryPage = p), - onPageSizeChanged: (s) => setState(() { - _categoryPageSize = s; - _categoryPage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _categorySearchCtrl, - hint: '搜索香型', - onSearchChanged: () => setState(() => _categoryPage = 1), - onAdd: () => _showOptionDialog( - title: '新建香型', - hasQuantity: false, - onSave: (data) => notifier.create({'name': data['name']}), - ), - onExport: () => exportExcel( - filename: '商品香型', - headers: ['香型名称'], - rows: items.map((it) => [it.name]).toList(), - ), + onExport: () => exportExcel( + filename: '商品系列', + headers: ['编号', '系列名称', '备注'], + rows: items + .map((it) => [it.code ?? '', it.name, it.remark ?? '']) + .toList(), ), - mobileCards: paged - .map((it) => MobileListCard( - title: Text(it.name), - actions: rowActions(it).isEmpty ? null : rowActions(it), - )) - .toList(), - columns: const [ - DataColumn(label: Text('香型名称')), - DataColumn(label: Text('操作')), - ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Row( - mainAxisSize: MainAxisSize.min, - children: rowActions(it))), - ])) - .toList(), ); }, ); } - // ── 规格 tab ────────────────────────────────────────────── - - Widget _buildSpecTab() { + Widget _specView() { final async = ref.watch(productSpecListProvider); return async.when( loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productSpecListProvider.notifier).reload()), + error: (e, _) => + _error(() => ref.read(productSpecListProvider.notifier).reload()), data: (items) { final defaultId = _effectiveDefault('default_spec_id', ref.watch(shopInfoProvider).valueOrNull?.defaultSpecId); - final keyword = _specSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) - .toList(); - final paged = filtered - .skip((_specPage - 1) * _specPageSize) - .take(_specPageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _specPage, - pageSize: _specPageSize, - onPageChanged: (p) => setState(() => _specPage = p), - onPageSizeChanged: (s) => setState(() { - _specPageSize = s; - _specPage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _specSearchCtrl, - hint: '搜索规格/编号', - onSearchChanged: () => setState(() => _specPage = 1), - onAdd: () => _showOptionDialog( - title: '新建规格', - hasQuantity: true, - onSave: (data) => - ref.read(productSpecListProvider.notifier).create(data), - ), - onExport: () => exportExcel( - filename: '商品规格', - headers: ['编号', '规格名称', '单品数量', '备注'], - rows: items - .map((it) => - [it.code ?? '', it.name, it.quantity, it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - quantity: it.quantity, - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_spec_id', it.id), - onEdit: () => _showOptionDialog( + return _configTable( + label: '规格', + searchCtrl: _specSearchCtrl, + rows: [ + for (final it in items) + ( + id: it.id, + name: it.name, + code: it.code, + note: [ + if (it.quantity > 0) '装箱 ${it.quantity}', + if ((it.remark ?? '').isNotEmpty) it.remark!, + ].join(' · '), + isDefault: it.id == defaultId, + onSetDefault: () => _setDefaultOption('default_spec_id', it.id), + onEdit: () => _showOptionDialog( title: '编辑规格', hasQuantity: true, initial: { @@ -686,228 +630,189 @@ class _ProductsScreenState extends ConsumerState { .read(productSpecListProvider.notifier) .updateItem(it.id, data), ), - onDelete: () => _confirmDelete( - '删除规格「${it.name}」？', - () => ref - .read(productSpecListProvider.notifier) - .delete(it.id), - ), - )) - .toList(), - columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('规格名称')), - DataColumn(label: Text('单品数量'), numeric: true), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')), + onDelete: () => _confirmDelete( + '删除规格「${it.name}」？', + () => ref + .read(productSpecListProvider.notifier) + .delete(it.id)), + ), ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell( - Text(it.quantity > 0 ? '${it.quantity}' : '-')), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - isDefault: it.id == defaultId, - onSetDefault: () => - _setDefaultOption('default_spec_id', it.id), - onEdit: () => _showOptionDialog( - title: '编辑规格', - hasQuantity: true, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'quantity': it.quantity, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productSpecListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除规格「${it.name}」？', - () => ref - .read(productSpecListProvider.notifier) - .delete(it.id), - ), - )), - ])) - .toList(), + onExport: () => exportExcel( + filename: '商品规格', + headers: ['编号', '规格名称', '装箱数量', '备注'], + rows: items + .map((it) => + [it.code ?? '', it.name, it.quantity, it.remark ?? '']) + .toList(), + ), ); }, ); } - // ── 公共组件 ────────────────────────────────────────────── - - Widget _buildToolbar({ + /// configView 通表：名称(双行) / 说明 / 操作(设默认⭐ + 笔 + ×)。 + Widget _configTable({ + required String label, required TextEditingController searchCtrl, - required String hint, - required VoidCallback onSearchChanged, - required VoidCallback onAdd, - required VoidCallback onExport, + required List< + ({ + int id, + String name, + String? code, + String note, + bool isDefault, + VoidCallback onSetDefault, + VoidCallback onEdit, + VoidCallback onDelete, + })> + rows, + VoidCallback? onExport, }) { - return Row( - children: [ - if (!WriteGuard.isReadonly(ref)) ...[ - WriteGuard( - child: ElevatedButton.icon( - onPressed: onAdd, - icon: const Icon(Icons.add, size: 16), - label: const Text('新建'), - ), - ), - const SizedBox(width: 8), - ], - OutlinedButton.icon( - onPressed: onExport, - icon: const Icon(Icons.download, size: 16), - label: const Text('导出'), - ), - const Spacer(), - SizedBox( - width: 200, - child: TextField( - controller: searchCtrl, - decoration: InputDecoration( - hintText: hint, - prefixIcon: const Icon(Icons.search, size: 16), - hintStyle: const TextStyle(fontSize: 13), - ), - onChanged: (_) => onSearchChanged(), - ), - ), + final t = context.tokens; + final kw = searchCtrl.text.toLowerCase(); + // 原型 configView：搜索名称 / 说明 + final filtered = kw.isEmpty + ? rows + : rows + .where((r) => + r.name.toLowerCase().contains(kw) || + r.note.toLowerCase().contains(kw) || + (r.code?.toLowerCase().contains(kw) ?? false)) + .toList(); + return DsTable( + pagerInfoText: '共 ${filtered.length} 项$label', + emptyText: '还没有$label · 点「新增$label」创建', + toolbar: _viewToolbar( + ctrl: searchCtrl, + hint: '搜索名称 / 说明', + onChanged: () => setState(() {}), + onExport: onExport, + mobileAdd: true, + ), + mobileCards: filtered + .map((r) => MobileListCard( + title: Text(r.name), + subtitle: (r.code ?? '').isEmpty ? null : Text(r.code!), + trailing: r.isDefault + ? const DsBadge('默认', tone: DsBadgeTone.info) + : null, + fields: [ + if (r.note.isNotEmpty) MobileCardField('说明', r.note), + ], + onTap: r.onEdit, + )) + .toList(), + columns: [ + DsColumn('name', '$label名称'), + const DsColumn('note', '说明'), + const DsColumn('actions', '操作', action: true), ], + rows: filtered.map((r) { + return DsRow( + onTap: r.onEdit, + cells: [ + _nameCell(r.name, r.code), + Text(r.note.isEmpty ? '—' : r.note, + style: TextStyle(color: t.muted)), + WriteGuard( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + // 入库录入默认值（沿用店级 custom_fields 机制） + _iconBtn( + r.isDefault ? LucideIcons.star : LucideIcons.star, + r.isDefault ? '当前默认' : '设为入库默认', + r.isDefault ? () {} : r.onSetDefault, + color: r.isDefault ? t.warn : t.muted), + const SizedBox(width: 8), + _iconBtn(LucideIcons.pencil, '编辑', r.onEdit), + const SizedBox(width: 8), + _iconBtn(LucideIcons.x, '删除', r.onDelete), + ], + ), + ), + ], + ); + }).toList(), ); } - Widget _buildError(VoidCallback onRetry) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton(onPressed: onRetry, child: const Text('重试')), - ], - ), - ); - } - - /// 基础数据：窄屏卡片 - Widget _optionCard({ - required String? code, - required String name, - required String? remark, - int? quantity, - required VoidCallback onEdit, - required VoidCallback onDelete, - bool isDefault = false, - VoidCallback? onSetDefault, - }) { - return MobileListCard( - title: Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (isDefault) - const Padding( - padding: EdgeInsets.only(right: 4), - child: - Icon(Icons.star_rounded, size: 18, color: Color(0xFFFFB300)), - ), - Flexible(child: Text(name)), - ], - ), - subtitle: (code?.isNotEmpty == true) ? Text(code!) : null, - fields: [ - if (quantity != null && quantity > 0) - MobileCardField('单品数量', '$quantity'), - if (remark?.isNotEmpty == true) MobileCardField('备注', remark), - ], - actions: WriteGuard.isReadonly(ref) - ? const [] - : [ - if (onSetDefault != null) + // ── 仓库（configView 版式）────────────────────────────────── + Widget _warehouseView() { + final async = ref.watch(warehouseListProvider); + return async.when( + loading: () => const Center(child: CircularProgressIndicator()), + error: (e, _) => + _error(() => ref.read(warehouseListProvider.notifier).reload()), + data: (warehouses) { + final t = context.tokens; + final kw = _warehouseSearchCtrl.text.toLowerCase(); + final filtered = kw.isEmpty + ? warehouses + : warehouses + .where((w) => + w.name.toLowerCase().contains(kw) || + (w.location?.toLowerCase().contains(kw) ?? false)) + .toList(); + return DsTable( + pagerInfoText: '共 ${filtered.length} 个仓库', + emptyText: '还没有仓库 · 点「新增仓库」创建', + toolbar: _viewToolbar( + ctrl: _warehouseSearchCtrl, + hint: '搜索名称 / 位置', + onChanged: () => setState(() {}), + mobileAdd: true, + ), + mobileCards: filtered + .map((w) => MobileListCard( + title: Text(w.name), + subtitle: + (w.location ?? '').isEmpty ? null : Text(w.location!), + trailing: w.isDefault + ? const DsBadge('默认', tone: DsBadgeTone.ok) + : null, + onTap: () => _showWarehouseDialog(warehouse: w), + )) + .toList(), + columns: const [ + DsColumn('name', '仓库名称'), + DsColumn('location', '位置'), + DsColumn('default', '默认仓库'), + DsColumn('actions', '操作', action: true), + ], + rows: filtered.map((w) { + return DsRow( + onTap: () => _showWarehouseDialog(warehouse: w), + cells: [ + Text(w.name, + style: TextStyle( + fontWeight: FontWeight.w600, color: t.heading)), + Text((w.location ?? '').isEmpty ? '—' : w.location!, + style: TextStyle(color: t.muted)), + w.isDefault + ? const DsBadge('默认', tone: DsBadgeTone.ok) + : Text('—', style: TextStyle(color: t.faint)), WriteGuard( - child: TextButton( - onPressed: isDefault ? null : onSetDefault, - child: Text(isDefault ? '默认' : '设为默认', - style: const TextStyle(fontSize: 13)), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + _iconBtn(LucideIcons.pencil, '编辑', + () => _showWarehouseDialog(warehouse: w)), + const SizedBox(width: 8), + _iconBtn(LucideIcons.x, '删除', + () => _confirmDeleteWarehouse(w)), + ], ), ), - WriteGuard( - child: TextButton( - onPressed: onEdit, - child: const Text('编辑', style: TextStyle(fontSize: 13)), - ), - ), - WriteGuard( - child: TextButton( - onPressed: onDelete, - child: Text('删除', - style: TextStyle(fontSize: 13, color: context.tokens.danger)), - ), - ), - ], + ], + ); + }).toList(), + ); + }, ); } - Widget _actionButtons({ - required VoidCallback onEdit, - required VoidCallback onDelete, - bool isDefault = false, - VoidCallback? onSetDefault, - }) { - return WriteGuard( - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (onSetDefault != null) - IconButton( - tooltip: isDefault ? '当前默认' : '设为入库默认', - visualDensity: VisualDensity.compact, - icon: Icon( - isDefault ? Icons.star_rounded : Icons.star_border_rounded, - size: 20, - color: isDefault - ? const Color(0xFFFFB300) // 明亮金色，醒目区分默认项 - : context.tokens.muted), - onPressed: isDefault ? null : onSetDefault, - ), - TextButton( - onPressed: onEdit, - child: const Text('编辑', style: TextStyle(fontSize: 12)), - ), - TextButton( - onPressed: onDelete, - child: Text('删除', - style: TextStyle(fontSize: 12, color: context.tokens.danger)), - ), - ], - ), - ); - } + // ── 共用逻辑（沿用旧屏：设为默认 / 删除确认 / 三个弹窗）─────── /// 当前生效的默认 id：乐观覆盖优先，否则取店配置（保证点一下立刻变色）。 int? _effectiveDefault(String key, int? fromShop) => @@ -932,8 +837,7 @@ class _ProductsScreenState extends ConsumerState { }); ref.invalidate(shopInfoProvider); if (mounted) { - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('已设为默认'))); + showDsToast(context, '已设为默认'); } } catch (e) { if (mounted) { @@ -944,8 +848,7 @@ class _ProductsScreenState extends ConsumerState { _optDefaults[key] = prev; } }); - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('设置失败：$e'))); + showDsToast(context, '设置失败：$e'); } } } @@ -958,16 +861,10 @@ class _ProductsScreenState extends ConsumerState { title: const Text('确认删除'), content: Text(message), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('删除'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('删除', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -976,735 +873,13 @@ class _ProductsScreenState extends ConsumerState { await onConfirmed(); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('删除失败：$e'), backgroundColor: context.tokens.danger), - ); - } - } - } - } - - // ── 产地 tab ────────────────────────────────────────────── - - Widget _buildOriginTab() { - final async = ref.watch(productOriginListProvider); - return async.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productOriginListProvider.notifier).reload()), - data: (items) { - final keyword = _originSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) - .toList(); - final paged = filtered - .skip((_originPage - 1) * _originPageSize) - .take(_originPageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _originPage, - pageSize: _originPageSize, - onPageChanged: (p) => setState(() => _originPage = p), - onPageSizeChanged: (s) => setState(() { - _originPageSize = s; - _originPage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _originSearchCtrl, - hint: '搜索产地/编号', - onSearchChanged: () => setState(() => _originPage = 1), - onAdd: () => _showOptionDialog( - title: '新建产地', - hasQuantity: false, - onSave: (data) => - ref.read(productOriginListProvider.notifier).create(data), - ), - onExport: () => exportExcel( - filename: '产地', - headers: ['编号', '名称', '备注'], - rows: items - .map((it) => [it.code ?? '', it.name, it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - onEdit: () => _showOptionDialog( - title: '编辑产地', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productOriginListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除产地「${it.name}」？', - () => ref - .read(productOriginListProvider.notifier) - .delete(it.id)), - )) - .toList(), - columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('名称')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')) - ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()) - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - onEdit: () => _showOptionDialog( - title: '编辑产地', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productOriginListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除产地「${it.name}」？', - () => ref - .read(productOriginListProvider.notifier) - .delete(it.id)), - )), - ])) - .toList(), - ); - }, - ); - } - - // ── 保质期 tab ───────────────────────────────────────────── - - Widget _buildShelfLifeTab() { - final async = ref.watch(productShelfLifeListProvider); - return async.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productShelfLifeListProvider.notifier).reload()), - data: (items) { - final keyword = _shelfLifeSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) - .toList(); - final paged = filtered - .skip((_shelfLifePage - 1) * _shelfLifePageSize) - .take(_shelfLifePageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _shelfLifePage, - pageSize: _shelfLifePageSize, - onPageChanged: (p) => setState(() => _shelfLifePage = p), - onPageSizeChanged: (s) => setState(() { - _shelfLifePageSize = s; - _shelfLifePage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _shelfLifeSearchCtrl, - hint: '搜索保质期/编号', - onSearchChanged: () => setState(() => _shelfLifePage = 1), - onAdd: () => _showOptionDialog( - title: '新建保质期', - hasQuantity: false, - onSave: (data) => - ref.read(productShelfLifeListProvider.notifier).create(data), - ), - onExport: () => exportExcel( - filename: '保质期', - headers: ['编号', '名称', '备注'], - rows: items - .map((it) => [it.code ?? '', it.name, it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - onEdit: () => _showOptionDialog( - title: '编辑保质期', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productShelfLifeListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除保质期「${it.name}」？', - () => ref - .read(productShelfLifeListProvider.notifier) - .delete(it.id)), - )) - .toList(), - columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('名称')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')) - ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()) - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - onEdit: () => _showOptionDialog( - title: '编辑保质期', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productShelfLifeListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除保质期「${it.name}」？', - () => ref - .read(productShelfLifeListProvider.notifier) - .delete(it.id)), - )), - ])) - .toList(), - ); - }, - ); - } - - // ── 储存方式 tab ─────────────────────────────────────────── - - Widget _buildStorageTab() { - final async = ref.watch(productStorageListProvider); - return async.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productStorageListProvider.notifier).reload()), - data: (items) { - final keyword = _storageSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => - it.name.toLowerCase().contains(keyword) || - (it.code?.toLowerCase().contains(keyword) ?? false)) - .toList(); - final paged = filtered - .skip((_storagePage - 1) * _storagePageSize) - .take(_storagePageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _storagePage, - pageSize: _storagePageSize, - onPageChanged: (p) => setState(() => _storagePage = p), - onPageSizeChanged: (s) => setState(() { - _storagePageSize = s; - _storagePage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _storageSearchCtrl, - hint: '搜索储存方式/编号', - onSearchChanged: () => setState(() => _storagePage = 1), - onAdd: () => _showOptionDialog( - title: '新建储存方式', - hasQuantity: false, - onSave: (data) => - ref.read(productStorageListProvider.notifier).create(data), - ), - onExport: () => exportExcel( - filename: '储存方式', - headers: ['编号', '名称', '备注'], - rows: items - .map((it) => [it.code ?? '', it.name, it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => _optionCard( - code: it.code, - name: it.name, - remark: it.remark, - onEdit: () => _showOptionDialog( - title: '编辑储存方式', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productStorageListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除储存方式「${it.name}」？', - () => ref - .read(productStorageListProvider.notifier) - .delete(it.id)), - )) - .toList(), - columns: const [ - DataColumn(label: Text('编号')), - DataColumn(label: Text('名称')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')) - ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()) - ]) - ] - : paged - .map((it) => DataRow(cells: [ - DataCell(Text(it.code ?? '-', - style: TextStyle( - fontFamily: 'monospace', - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(it.name, - style: - const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - onEdit: () => _showOptionDialog( - title: '编辑储存方式', - hasQuantity: false, - initial: { - 'code': it.code ?? '', - 'name': it.name, - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productStorageListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除储存方式「${it.name}」？', - () => ref - .read(productStorageListProvider.notifier) - .delete(it.id)), - )), - ])) - .toList(), - ); - }, - ); - } - - // ── 描述文档 tab ─────────────────────────────────────────── - - Widget _buildDescDocTab() { - final async = ref.watch(productDescriptionDocListProvider); - return async.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => _buildError( - () => ref.read(productDescriptionDocListProvider.notifier).reload()), - data: (items) { - final keyword = _descDocSearchCtrl.text.toLowerCase(); - final filtered = keyword.isEmpty - ? items - : items - .where((it) => it.title.toLowerCase().contains(keyword)) - .toList(); - final paged = filtered - .skip((_descDocPage - 1) * _descDocPageSize) - .take(_descDocPageSize) - .toList(); - return DataTableCard( - totalCount: filtered.length, - page: _descDocPage, - pageSize: _descDocPageSize, - onPageChanged: (p) => setState(() => _descDocPage = p), - onPageSizeChanged: (s) => setState(() { - _descDocPageSize = s; - _descDocPage = 1; - }), - toolbar: _buildToolbar( - searchCtrl: _descDocSearchCtrl, - hint: '搜索标题', - onSearchChanged: () => setState(() => _descDocPage = 1), - onAdd: () => _showDescDocDialog( - title: '新建描述文档', - onSave: (data) => ref - .read(productDescriptionDocListProvider.notifier) - .create(data), - ), - onExport: () => exportExcel( - filename: '描述文档', - headers: ['标题', '内容', '备注'], - rows: items - .map((it) => [it.title, it.content ?? '', it.remark ?? '']) - .toList(), - ), - ), - mobileCards: paged - .map((it) => MobileListCard( - title: Text(it.title), - fields: [ - if (it.content?.isNotEmpty == true) - MobileCardField('内容', it.content), - if (it.remark?.isNotEmpty == true) - MobileCardField('备注', it.remark), - ], - actions: [ - TextButton( - onPressed: () => _showDescDocDialog( - title: '编辑描述文档', - initial: { - 'title': it.title, - 'content': it.content ?? '', - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productDescriptionDocListProvider.notifier) - .updateItem(it.id, data), - ), - child: const Text('编辑', style: TextStyle(fontSize: 13)), - ), - TextButton( - onPressed: () => _confirmDelete( - '删除描述文档「${it.title}」？', - () => ref - .read( - productDescriptionDocListProvider.notifier) - .delete(it.id)), - child: Text('删除', - style: TextStyle( - fontSize: 13, color: context.tokens.danger)), - ), - ], - )) - .toList(), - columns: const [ - DataColumn(label: Text('标题')), - DataColumn(label: Text('内容预览')), - DataColumn(label: Text('备注')), - DataColumn(label: Text('操作')) - ], - rows: paged.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无数据', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()) - ]) - ] - : paged.map((it) { - final preview = (it.content ?? '').length > 30 - ? '${it.content!.substring(0, 30)}…' - : (it.content ?? '-'); - return DataRow(cells: [ - DataCell(Text(it.title, - style: const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(preview, - style: TextStyle( - fontSize: 12, color: context.tokens.muted))), - DataCell(Text(it.remark ?? '-')), - DataCell(_actionButtons( - onEdit: () => _showDescDocDialog( - title: '编辑描述文档', - initial: { - 'title': it.title, - 'content': it.content ?? '', - 'remark': it.remark ?? '' - }, - onSave: (data) => ref - .read(productDescriptionDocListProvider.notifier) - .updateItem(it.id, data), - ), - onDelete: () => _confirmDelete( - '删除描述文档「${it.title}」？', - () => ref - .read(productDescriptionDocListProvider.notifier) - .delete(it.id)), - )), - ]); - }).toList(), - ); - }, - ); - } - - Future _showDescDocDialog({ - required String title, - required Future Function(Map) onSave, - Map? initial, - }) async { - final titleCtrl = - TextEditingController(text: initial?['title'] as String? ?? ''); - final contentCtrl = - TextEditingController(text: initial?['content'] as String? ?? ''); - final remarkCtrl = - TextEditingController(text: initial?['remark'] as String? ?? ''); - final formKey = GlobalKey(); - - await showAppDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text(title), - content: SizedBox( - width: context.dialogWidth(400), - child: Form( - key: formKey, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextFormField( - controller: titleCtrl, - decoration: const InputDecoration(labelText: '标题 *（如：酱香型白酒）'), - validator: (v) => - (v == null || v.trim().isEmpty) ? '请输入标题' : null, - ), - const SizedBox(height: 12), - TextFormField( - controller: contentCtrl, - decoration: const InputDecoration(labelText: '内容（商品介绍正文）'), - maxLines: 5, - minLines: 3, - ), - const SizedBox(height: 12), - TextFormField( - controller: remarkCtrl, - decoration: const InputDecoration(labelText: '备注'), - maxLines: 2, - ), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('取消')), - ElevatedButton( - onPressed: () async { - if (!formKey.currentState!.validate()) return; - final data = { - 'title': titleCtrl.text.trim(), - if (contentCtrl.text.isNotEmpty) - 'content': contentCtrl.text.trim(), - if (remarkCtrl.text.isNotEmpty) - 'remark': remarkCtrl.text.trim(), - }; - Navigator.of(ctx).pop(); - try { - await onSave(data); - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('保存失败：$e'), - backgroundColor: context.tokens.danger), - ); - } - } - }, - child: const Text('保存'), - ), - ], - ), - ); - } - - // ── 仓库 tab ────────────────────────────────────────────── - - Widget _buildWarehousesTab() { - final asyncWarehouses = ref.watch(warehouseListProvider); - return asyncWarehouses.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => - _buildError(() => ref.read(warehouseListProvider.notifier).reload()), - data: (warehouses) => DataTableCard( - totalCount: warehouses.length, - page: 1, - pageSize: warehouses.length + 1, - onPageChanged: (_) {}, - onPageSizeChanged: (_) {}, - toolbar: Row( - children: [ - ElevatedButton.icon( - onPressed: () => _showWarehouseDialog(), - icon: const Icon(Icons.add, size: 16), - label: const Text('新建'), - ), - ], - ), - mobileCards: warehouses - .map((w) => MobileListCard( - title: Text(w.name), - subtitle: - w.location?.isNotEmpty == true ? Text(w.location!) : null, - fields: [ - if (w.isDefault) const MobileCardField('默认仓库', '是'), - ], - actions: [ - TextButton( - onPressed: () => _showWarehouseDialog(warehouse: w), - child: const Text('编辑', style: TextStyle(fontSize: 13)), - ), - TextButton( - onPressed: () => _confirmDeleteWarehouse(w), - child: Text('删除', - style: TextStyle( - fontSize: 13, color: context.tokens.danger)), - ), - ], - )) - .toList(), - columns: const [ - DataColumn(label: Text('仓库名称')), - DataColumn(label: Text('位置')), - DataColumn(label: Text('默认仓库')), - DataColumn(label: Text('操作')), - ], - rows: warehouses.isEmpty - ? [ - DataRow(cells: [ - const DataCell(SizedBox()), - DataCell(Text('暂无仓库', - style: TextStyle(color: context.tokens.muted))), - const DataCell(SizedBox()), - const DataCell(SizedBox()), - ]) - ] - : warehouses - .map((w) => DataRow(cells: [ - DataCell(Text(w.name, - style: const TextStyle(fontWeight: FontWeight.w500))), - DataCell(Text(w.location ?? '-')), - DataCell(w.isDefault - ? Icon(Icons.check_circle, - color: context.tokens.success, size: 18) - : const SizedBox()), - DataCell(_actionButtons( - onEdit: () => _showWarehouseDialog(warehouse: w), - onDelete: () => _confirmDeleteWarehouse(w), - )), - ])) - .toList(), - ), - ); - } - - void _showWarehouseDialog({Warehouse? warehouse}) { - showAppDialog( - context: context, - builder: (ctx) => _WarehouseFormDialog( - warehouse: warehouse, - onSaved: () => ref.read(warehouseListProvider.notifier).reload(), - ), - ); - } - - Future _confirmDeleteWarehouse(Warehouse w) async { - final confirmed = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: const Text('确认删除'), - content: Text('确认删除仓库「${w.name}」？'), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('删除'), - ), - ], - ), - ); - if (confirmed == true && mounted) { - try { - await ref.read(warehouseListProvider.notifier).deleteWarehouse(w.id); - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('删除成功'), - backgroundColor: context.tokens.success)); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('删除失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); } } } } + /// 字典项弹窗（原型 ovDict：名称* + 说明；规格多一个装箱数量）。 Future _showOptionDialog({ required String title, required bool hasQuantity, @@ -1734,69 +909,175 @@ class _ProductsScreenState extends ConsumerState { child: Column( mainAxisSize: MainAxisSize.min, children: [ - TextFormField( - controller: codeCtrl, - decoration: const InputDecoration(labelText: '编号（可选）'), - ), - const SizedBox(height: 12), - TextFormField( - controller: nameCtrl, - decoration: const InputDecoration(labelText: '名称 *'), - validator: (v) => - (v == null || v.trim().isEmpty) ? '请输入名称' : null, - ), + DsField('名称', + required: true, + input: TextFormField( + controller: nameCtrl, + decoration: const InputDecoration(hintText: '名称'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '请输入名称' : null, + )), if (hasQuantity) ...[ const SizedBox(height: 12), - TextFormField( - controller: quantityCtrl, - decoration: const InputDecoration(labelText: '单品数量'), - keyboardType: TextInputType.number, - ), + DsField('装箱数量', + input: TextFormField( + controller: quantityCtrl, + decoration: const InputDecoration(hintText: '如 6'), + keyboardType: TextInputType.number, + )), ], const SizedBox(height: 12), - TextFormField( - controller: remarkCtrl, - decoration: const InputDecoration(labelText: '备注'), - maxLines: 2, - ), + DsField('编号（可选）', + input: TextFormField( + controller: codeCtrl, + decoration: const InputDecoration(hintText: '编号'), + )), + const SizedBox(height: 12), + DsField('说明（选填）', + input: TextFormField( + controller: remarkCtrl, + decoration: + const InputDecoration(hintText: '备注说明，如适用品牌 / 用途'), + maxLines: 2, + )), ], ), ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('取消')), - ElevatedButton( - onPressed: () async { - if (!formKey.currentState!.validate()) return; - final data = { - 'name': nameCtrl.text.trim(), - if (codeCtrl.text.isNotEmpty) 'code': codeCtrl.text.trim(), - if (hasQuantity && quantityCtrl.text.isNotEmpty) - 'quantity': int.tryParse(quantityCtrl.text) ?? 0, - if (remarkCtrl.text.isNotEmpty) - 'remark': remarkCtrl.text.trim(), - }; - Navigator.of(ctx).pop(); - try { - await onSave(data); - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('创建失败：$e'), - backgroundColor: context.tokens.danger), - ); - } + DsButton('取消', onPressed: () => Navigator.of(ctx).pop()), + DsButton('保存', variant: DsBtnVariant.primary, onPressed: () async { + if (!formKey.currentState!.validate()) return; + final data = { + 'name': nameCtrl.text.trim(), + if (codeCtrl.text.isNotEmpty) 'code': codeCtrl.text.trim(), + if (hasQuantity && quantityCtrl.text.isNotEmpty) + 'quantity': int.tryParse(quantityCtrl.text) ?? 0, + if (remarkCtrl.text.isNotEmpty) 'remark': remarkCtrl.text.trim(), + }; + Navigator.of(ctx).pop(); + try { + await onSave(data); + } catch (e) { + if (mounted) { + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } - }, - child: const Text('保存'), - ), + } + }), ], ), ); } + + /// 商品介绍弹窗（原型 ovIntro：标题* + 正文 textarea）。 + Future _showDescDocDialog({ + required String title, + required Future Function(Map) onSave, + Map? initial, + }) async { + final titleCtrl = + TextEditingController(text: initial?['title'] as String? ?? ''); + final contentCtrl = + TextEditingController(text: initial?['content'] as String? ?? ''); + final remarkCtrl = + TextEditingController(text: initial?['remark'] as String? ?? ''); + final formKey = GlobalKey(); + + await showAppDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text(title), + content: SizedBox( + width: context.dialogWidth(480), + child: Form( + key: formKey, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + DsField('标题', + required: true, + input: TextFormField( + controller: titleCtrl, + decoration: + const InputDecoration(hintText: '如：酱香经典 · 宴请送礼'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '请输入标题' : null, + )), + const SizedBox(height: 12), + DsField('内容', + input: TextFormField( + controller: contentCtrl, + decoration: const InputDecoration( + hintText: '一句话卖点 + 商品介绍，例如产地、工艺、口感、适用场景…'), + maxLines: 5, + minLines: 3, + )), + const SizedBox(height: 12), + DsField('备注', + input: TextFormField( + controller: remarkCtrl, + decoration: const InputDecoration(hintText: '备注说明'), + maxLines: 2, + )), + ], + ), + ), + ), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop()), + DsButton('保存', variant: DsBtnVariant.primary, onPressed: () async { + if (!formKey.currentState!.validate()) return; + final data = { + 'title': titleCtrl.text.trim(), + if (contentCtrl.text.isNotEmpty) + 'content': contentCtrl.text.trim(), + if (remarkCtrl.text.isNotEmpty) 'remark': remarkCtrl.text.trim(), + }; + Navigator.of(ctx).pop(); + try { + await onSave(data); + } catch (e) { + if (mounted) { + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); + } + } + }), + ], + ), + ); + } + + void _showWarehouseDialog({Warehouse? warehouse}) { + showAppDialog( + context: context, + builder: (ctx) => _WarehouseFormDialog( + warehouse: warehouse, + onSaved: () => ref.read(warehouseListProvider.notifier).reload(), + ), + ); + } + + Future _confirmDeleteWarehouse(Warehouse w) async { + await _confirmDelete('确认删除仓库「${w.name}」？', () async { + await ref.read(warehouseListProvider.notifier).deleteWarehouse(w.id); + if (mounted) { + showDsToast(context, '删除成功', bg: context.tokens.success); + } + }); + } +} + +/// 金额：¥ + 千分位（整数无小数）。 +String fmtCny(double v) { + final s = v == v.roundToDouble() + ? v + .round() + .toString() + .replaceAllMapped(RegExp(r'\B(?=(\d{3})+(?!\d))'), (m) => ',') + : v + .toStringAsFixed(2) + .replaceAllMapped(RegExp(r'\B(?=(\d{3})+(?!\d)\.)'), (m) => ','); + return '¥$s'; } class _WarehouseFormDialog extends ConsumerStatefulWidget { @@ -1852,16 +1133,12 @@ class _WarehouseFormDialogState extends ConsumerState<_WarehouseFormDialog> { if (mounted) { Navigator.of(context).pop(); widget.onSaved(); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(widget.warehouse != null ? '仓库更新成功' : '仓库创建成功'), - backgroundColor: context.tokens.success, - )); + showDsToast(context, widget.warehouse != null ? '仓库更新成功' : '仓库创建成功', + bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('保存失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _saving = false); @@ -1871,7 +1148,7 @@ class _WarehouseFormDialogState extends ConsumerState<_WarehouseFormDialog> { @override Widget build(BuildContext context) { return AlertDialog( - title: Text(widget.warehouse != null ? '编辑仓库' : '新建仓库'), + title: Text(widget.warehouse != null ? '编辑仓库' : '新增仓库'), content: SizedBox( width: context.dialogWidth(400), child: Form( @@ -1879,16 +1156,19 @@ class _WarehouseFormDialogState extends ConsumerState<_WarehouseFormDialog> { child: Column( mainAxisSize: MainAxisSize.min, children: [ - TextFormField( - controller: _nameCtrl, - decoration: const InputDecoration(labelText: '仓库名称'), - validator: (v) => (v == null || v.isEmpty) ? '不能为空' : null, - ), + DsField('仓库名称', + required: true, + input: TextFormField( + controller: _nameCtrl, + decoration: const InputDecoration(hintText: '如：主仓'), + validator: (v) => (v == null || v.isEmpty) ? '不能为空' : null, + )), const SizedBox(height: 12), - TextFormField( - controller: _locationCtrl, - decoration: const InputDecoration(labelText: '位置'), - ), + DsField('位置', + input: TextFormField( + controller: _locationCtrl, + decoration: const InputDecoration(hintText: '如：一层西侧'), + )), const SizedBox(height: 12), CheckboxListTile( title: const Text('设为默认仓库'), @@ -1901,19 +1181,9 @@ class _WarehouseFormDialogState extends ConsumerState<_WarehouseFormDialog> { ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator(strokeWidth: 2)) - : const Text('保存'), - ), + DsButton('取消', onPressed: () => Navigator.of(context).pop()), + DsButton(_saving ? '保存中…' : '保存', + variant: DsBtnVariant.primary, onPressed: _saving ? null : _save), ], ); } diff --git a/client/lib/screens/public/public_product_screen.dart b/client/lib/screens/public/public_product_screen.dart index fa6e323..fa3482e 100644 --- a/client/lib/screens/public/public_product_screen.dart +++ b/client/lib/screens/public/public_product_screen.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:math' as math; import 'package:dio/dio.dart'; import 'package:flutter/gestures.dart'; @@ -49,13 +50,20 @@ class _PublicProductScreenState extends State { } Future _load() async { - setState(() { _loading = true; _error = null; }); + setState(() { + _loading = true; + _error = null; + }); try { final resp = await _dio.get( '${AppConfig.apiBaseUrl}/public/products/${widget.publicId}', ); - final data = (resp.data as Map)['data'] as Map; - setState(() { _data = data; _loading = false; }); + final data = + (resp.data as Map)['data'] as Map; + setState(() { + _data = data; + _loading = false; + }); // 更新浏览器标签标题（Flutter Web 会写 document.title） final name = data['name'] as String? ?? ''; if (name.isNotEmpty) { @@ -64,7 +72,10 @@ class _PublicProductScreenState extends State { ); } } catch (e) { - setState(() { _error = e.toString(); _loading = false; }); + setState(() { + _error = e.toString(); + _loading = false; + }); } } @@ -79,7 +90,9 @@ class _PublicProductScreenState extends State { title: title, hint: hint, onSubmit: (msg) async { - final shopNo = (_data?['shop'] as Map?)?['code'] as String? ?? ''; + final shopNo = + (_data?['shop'] as Map?)?['code'] as String? ?? + ''; final productName = _data?['name'] as String? ?? ''; final productCode = _data?['code'] as String? ?? ''; final productInfo = [ @@ -107,7 +120,9 @@ class _PublicProductScreenState extends State { if (_loading) { return const Scaffold( backgroundColor: _kPaper, - body: Center(child: CircularProgressIndicator(color: _kBurgundy, strokeWidth: 2)), + body: Center( + child: + CircularProgressIndicator(color: _kBurgundy, strokeWidth: 2)), ); } if (_error != null || _data == null) { @@ -120,26 +135,33 @@ class _PublicProductScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - width: 56, height: 56, + width: 56, + height: 56, decoration: BoxDecoration( color: const Color(0xFFFDECEC), shape: BoxShape.circle, ), - child: const Icon(Icons.error_outline, size: 28, color: Color(0xFFD14343)), + child: const Icon(LucideIcons.circleAlert, + size: 28, color: Color(0xFFD14343)), ), const SizedBox(height: 16), const Text('商品不存在或已下架', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: _kInkDeep)), + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + color: _kInkDeep)), const SizedBox(height: 8), const Text('请检查二维码是否完整，或联系出售方确认', - style: TextStyle(fontSize: 13, color: _kTextMid), textAlign: TextAlign.center), + style: TextStyle(fontSize: 13, color: _kTextMid), + textAlign: TextAlign.center), const SizedBox(height: 24), ElevatedButton( onPressed: _load, style: ElevatedButton.styleFrom( backgroundColor: _kBurgundy, foregroundColor: Colors.white, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), ), child: const Text('重试'), ), @@ -151,8 +173,11 @@ class _PublicProductScreenState extends State { } final d = _data!; - final images = (d['images'] as List? ?? []).cast>(); - final imageUrls = images.map((img) => AppConfig.baseUrl + (img['url'] as String)).toList(); + final images = + (d['images'] as List? ?? []).cast>(); + final imageUrls = images + .map((img) => AppConfig.baseUrl + (img['url'] as String)) + .toList(); final name = d['name'] as String? ?? ''; final series = d['series'] as String? ?? ''; final spec = d['spec'] as String? ?? ''; @@ -161,15 +186,17 @@ class _PublicProductScreenState extends State { final description = d['description'] as String? ?? ''; final descriptionTitle = d['description_title'] as String? ?? '商品介绍'; final descriptionKeywords = (d['description_keywords'] as List?) - ?.map((e) => e as String) - .toList() ?? const []; + ?.map((e) => e as String) + .toList() ?? + const []; final salePrice = (d['sale_price'] as num?)?.toDouble() ?? 0.0; final origin = d['origin'] as String? ?? ''; final shelfLife = d['shelf_life'] as String? ?? '无限期（适饮）'; final storage = d['storage'] as String? ?? '阴凉干燥、避光保存'; final shop = d['shop'] as Map?; final batch = d['batch'] as Map?; - final quickSpecs = _parseQuickSpecs(spec, batch?['production_date'] as String?); + final quickSpecs = + _parseQuickSpecs(spec, batch?['production_date'] as String?); final productionDate = batch?['production_date'] as String?; return Scaffold( @@ -182,7 +209,9 @@ class _PublicProductScreenState extends State { slivers: [ // 1. Gallery SliverToBoxAdapter( - child: _HeroGallery(imageUrls: imageUrls, shopName: shop?['name'] as String? ?? ''), + child: _HeroGallery( + imageUrls: imageUrls, + shopName: shop?['name'] as String? ?? ''), ), // 2. Verified ribbon SliverToBoxAdapter( @@ -268,7 +297,8 @@ class _PublicProductScreenState extends State { final items = <({String value, String unit, String label})>[]; // Alcohol degree: 53度 / 53° / 53%vol - final degReg = RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false); + final degReg = + RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false); final degM = degReg.firstMatch(spec); if (degM != null) { items.add((value: degM.group(1)!, unit: '°', label: '酒精度')); @@ -344,7 +374,8 @@ class _HeroGalleryState extends State<_HeroGallery> { // Golden halo glow (behind product) Center( child: Container( - width: 240, height: 240, + width: 240, + height: 240, decoration: BoxDecoration( shape: BoxShape.circle, gradient: RadialGradient( @@ -369,18 +400,26 @@ class _HeroGalleryState extends State<_HeroGallery> { child: Image.network( urls[i], fit: BoxFit.contain, - errorBuilder: (_, __, ___) => _EmptyGalleryContent(shopName: widget.shopName), + errorBuilder: (_, __, ___) => + _EmptyGalleryContent(shopName: widget.shopName), ), ), ), // Top gradient scrim Positioned( - top: 0, left: 0, right: 0, height: 64, + top: 0, + left: 0, + right: 0, + height: 64, child: DecoratedBox( decoration: BoxDecoration( gradient: LinearGradient( - begin: Alignment.topCenter, end: Alignment.bottomCenter, - colors: [Colors.black.withValues(alpha: 0.45), Colors.transparent], + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Colors.black.withValues(alpha: 0.45), + Colors.transparent + ], ), ), ), @@ -388,43 +427,50 @@ class _HeroGalleryState extends State<_HeroGallery> { // "点击放大" hint (top right) if (urls.isNotEmpty) Positioned( - top: 52, right: 14, + top: 52, + right: 14, child: _GlassChip( child: const Row( mainAxisSize: MainAxisSize.min, children: [ - Icon(Icons.zoom_in, size: 12, color: Colors.white), + Icon(LucideIcons.zoomIn, size: 12, color: Colors.white), SizedBox(width: 4), - Text('点击放大', style: TextStyle(fontSize: 11, color: Colors.white)), + Text('点击放大', + style: TextStyle(fontSize: 11, color: Colors.white)), ], ), ), ), // Bottom: dots + page counter Positioned( - bottom: 16, left: 0, right: 0, + bottom: 16, + left: 0, + right: 0, child: Row( children: [ const SizedBox(width: 16), // Dots - ...List.generate(math.max(urls.length, 1), (i) => AnimatedContainer( - duration: const Duration(milliseconds: 200), - width: i == _current ? 18 : 6, - height: 6, - margin: const EdgeInsets.only(right: 5), - decoration: BoxDecoration( - color: i == _current - ? Colors.white.withValues(alpha: 0.95) - : Colors.white.withValues(alpha: 0.30), - borderRadius: BorderRadius.circular(999), - ), - )), + ...List.generate( + math.max(urls.length, 1), + (i) => AnimatedContainer( + duration: const Duration(milliseconds: 200), + width: i == _current ? 18 : 6, + height: 6, + margin: const EdgeInsets.only(right: 5), + decoration: BoxDecoration( + color: i == _current + ? Colors.white.withValues(alpha: 0.95) + : Colors.white.withValues(alpha: 0.30), + borderRadius: BorderRadius.circular(999), + ), + )), const Spacer(), if (urls.length > 1) Text( '${_current + 1} / ${urls.length}', style: const TextStyle( - fontSize: 11, color: Color(0x88FFFFFF), + fontSize: 11, + color: Color(0x88FFFFFF), fontFeatures: [FontFeature.tabularFigures()], letterSpacing: 0.5, ), @@ -436,7 +482,9 @@ class _HeroGalleryState extends State<_HeroGallery> { // Thumbnail strip if (urls.length > 1) Positioned( - bottom: 44, left: 0, right: 0, + bottom: 44, + left: 0, + right: 0, child: Container( height: 52, padding: const EdgeInsets.symmetric(horizontal: 14), @@ -451,7 +499,8 @@ class _HeroGalleryState extends State<_HeroGallery> { curve: Curves.easeInOut), child: AnimatedContainer( duration: const Duration(milliseconds: 180), - width: 44, height: 44, + width: 44, + height: 44, decoration: BoxDecoration( borderRadius: BorderRadius.circular(4), border: Border.all( @@ -463,7 +512,8 @@ class _HeroGalleryState extends State<_HeroGallery> { ), child: ClipRRect( borderRadius: BorderRadius.circular(3), - child: Image.network(urls[i], fit: BoxFit.cover, + child: Image.network(urls[i], + fit: BoxFit.cover, errorBuilder: (_, __, ___) => const SizedBox()), ), ), @@ -493,14 +543,18 @@ class _EmptyGalleryContent extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Container( - width: 64, height: 64, + width: 64, + height: 64, decoration: BoxDecoration( color: const Color(0xFF0F3057), borderRadius: BorderRadius.circular(12), ), child: Center( child: Text(initial, - style: const TextStyle(color: Colors.white70, fontSize: 28, fontWeight: FontWeight.w700)), + style: const TextStyle( + color: Colors.white70, + fontSize: 28, + fontWeight: FontWeight.w700)), ), ), const SizedBox(height: 12), @@ -554,13 +608,14 @@ class _VerifiedRibbon extends StatelessWidget { child: Row( children: [ Container( - width: 28, height: 28, + width: 28, + height: 28, decoration: BoxDecoration( color: _kSuccessLight, shape: BoxShape.circle, border: Border.all(color: const Color(0xFFB4E2C5)), ), - child: const Icon(Icons.check, size: 15, color: _kSuccess), + child: const Icon(LucideIcons.check, size: 15, color: _kSuccess), ), const SizedBox(width: 12), Expanded( @@ -572,7 +627,8 @@ class _VerifiedRibbon extends StatelessWidget { TextSpan( text: detail, style: const TextStyle( - fontWeight: FontWeight.w600, color: Color(0xFF353C48)), + fontWeight: FontWeight.w600, + color: Color(0xFF353C48)), ), ], )) @@ -598,7 +654,7 @@ class _VerifiedRibbon extends StatelessWidget { ), ), ), - const Icon(Icons.chevron_right, size: 18, color: _kTextMid), + const Icon(LucideIcons.chevronRight, size: 18, color: _kTextMid), ], ), ); @@ -613,9 +669,8 @@ class _PriceBadge extends StatelessWidget { @override Widget build(BuildContext context) { - final priceStr = price % 1 == 0 - ? price.toInt().toString() - : price.toStringAsFixed(2); + final priceStr = + price % 1 == 0 ? price.toInt().toString() : price.toStringAsFixed(2); return Container( padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), decoration: const BoxDecoration( @@ -624,8 +679,7 @@ class _PriceBadge extends StatelessWidget { ), child: Row( children: [ - const Text('建议零售价', - style: TextStyle(fontSize: 13, color: _kTextMid)), + const Text('建议零售价', style: TextStyle(fontSize: 13, color: _kTextMid)), const Spacer(), Text( '¥$priceStr', @@ -647,8 +701,11 @@ class _PriceBadge extends StatelessWidget { class _TitleBlock extends StatelessWidget { final String name, brand, series, spec, unit; const _TitleBlock({ - required this.name, required this.brand, required this.series, - required this.spec, required this.unit, + required this.name, + required this.brand, + required this.series, + required this.spec, + required this.unit, }); @override @@ -675,17 +732,25 @@ class _TitleBlock extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Container(width: 16, height: 1, color: _kBurgundy.withValues(alpha: 0.7)), + Container( + width: 16, + height: 1, + color: _kBurgundy.withValues(alpha: 0.7)), const SizedBox(width: 10), Text( separatorText, style: const TextStyle( - fontSize: 11, letterSpacing: 0.28, - color: _kBurgundy, fontWeight: FontWeight.w600, + fontSize: 11, + letterSpacing: 0.28, + color: _kBurgundy, + fontWeight: FontWeight.w600, ), ), const SizedBox(width: 10), - Container(width: 16, height: 1, color: _kBurgundy.withValues(alpha: 0.7)), + Container( + width: 16, + height: 1, + color: _kBurgundy.withValues(alpha: 0.7)), ], ), if (separatorText.isNotEmpty) const SizedBox(height: 14), @@ -694,8 +759,10 @@ class _TitleBlock extends StatelessWidget { name, textAlign: TextAlign.center, style: const TextStyle( - fontSize: 38, fontWeight: FontWeight.w700, - letterSpacing: 0.08, color: _kInkDeep, + fontSize: 38, + fontWeight: FontWeight.w700, + letterSpacing: 0.08, + color: _kInkDeep, height: 1.15, ), ), @@ -706,8 +773,10 @@ class _TitleBlock extends StatelessWidget { _keySpec(spec), textAlign: TextAlign.center, style: const TextStyle( - fontSize: 17, fontWeight: FontWeight.w500, - color: _kBurgundy, letterSpacing: 0.04, + fontSize: 17, + fontWeight: FontWeight.w500, + color: _kBurgundy, + letterSpacing: 0.04, ), ), ], @@ -718,7 +787,9 @@ class _TitleBlock extends StatelessWidget { specLine, textAlign: TextAlign.center, style: const TextStyle( - fontSize: 13, color: _kTextMid, letterSpacing: 0.03, + fontSize: 13, + color: _kTextMid, + letterSpacing: 0.03, ), ), ], @@ -726,7 +797,8 @@ class _TitleBlock extends StatelessWidget { const SizedBox(height: 16), Wrap( alignment: WrapAlignment.center, - spacing: 8, runSpacing: 6, + spacing: 8, + runSpacing: 6, children: [ if (series.isNotEmpty) _TitleTag(label: series, style: _TitleTagStyle.burgundy), @@ -743,7 +815,8 @@ class _TitleBlock extends StatelessWidget { // Extract "53° · 酱香型白酒" from spec String _keySpec(String spec) { final parts = []; - final degM = RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false).firstMatch(spec); + final degM = RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false) + .firstMatch(spec); if (degM != null) parts.add('${degM.group(1)!}°'); final xiangM = RegExp(r'([清浓酱兼馥凤]香(?:型(?:白酒)?)?)').firstMatch(spec); if (xiangM != null) parts.add(xiangM.group(1)!); @@ -753,7 +826,8 @@ class _TitleBlock extends StatelessWidget { String _buildSpecLine(String spec, String unit, String series) { // Remove parts already captured in _keySpec var s = spec - .replaceAll(RegExp(r'\d+(?:\.\d+)?\s*(?:度|°|%vol)', caseSensitive: false), '') + .replaceAll( + RegExp(r'\d+(?:\.\d+)?\s*(?:度|°|%vol)', caseSensitive: false), '') .replaceAll(RegExp(r'[清浓酱兼馥凤]香(?:型(?:白酒)?)?'), '') .replaceAll(RegExp(r'^[·\s]+|[·\s]+$'), '') .trim(); @@ -787,10 +861,14 @@ class _TitleTag extends StatelessWidget { } return Container( padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4), - decoration: BoxDecoration(color: bg, borderRadius: BorderRadius.circular(4)), + decoration: + BoxDecoration(color: bg, borderRadius: BorderRadius.circular(4)), child: Text(label, - style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, - color: fg, letterSpacing: 0.06)), + style: TextStyle( + fontSize: 11, + fontWeight: FontWeight.w600, + color: fg, + letterSpacing: 0.06)), ); } } @@ -827,8 +905,10 @@ class _QuickSpecs extends StatelessWidget { text: TextSpan( text: it.value, style: const TextStyle( - fontSize: 22, fontWeight: FontWeight.w700, - color: _kInkDeep, height: 1, + fontSize: 22, + fontWeight: FontWeight.w700, + color: _kInkDeep, + height: 1, fontFeatures: [FontFeature.tabularFigures()], ), children: it.unit.isNotEmpty @@ -836,8 +916,9 @@ class _QuickSpecs extends StatelessWidget { TextSpan( text: it.unit, style: const TextStyle( - fontSize: 10, fontWeight: FontWeight.w500, - color: _kTextMid), + fontSize: 10, + fontWeight: FontWeight.w500, + color: _kTextMid), ) ] : null, @@ -887,28 +968,35 @@ class _DescriptionSection extends StatelessWidget { Text( body, style: const TextStyle( - fontSize: 14, color: _kInkSoft, height: 1.85, letterSpacing: 0.02), + fontSize: 14, + color: _kInkSoft, + height: 1.85, + letterSpacing: 0.02), textAlign: TextAlign.justify, ), const SizedBox(height: 16), Wrap( - spacing: 8, runSpacing: 6, - children: keywords.map((kw) => Container( - padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4), - decoration: BoxDecoration( - color: const Color(0xFFF5F3EF), - border: Border.all(color: _kBorderSub), - borderRadius: BorderRadius.circular(999), - ), - child: Text(kw, style: const TextStyle( - fontSize: 11, color: _kTextMid)), - )).toList(), + spacing: 8, + runSpacing: 6, + children: keywords + .map((kw) => Container( + padding: const EdgeInsets.symmetric( + horizontal: 10, vertical: 4), + decoration: BoxDecoration( + color: const Color(0xFFF5F3EF), + border: Border.all(color: _kBorderSub), + borderRadius: BorderRadius.circular(999), + ), + child: Text(kw, + style: + const TextStyle(fontSize: 11, color: _kTextMid)), + )) + .toList(), ), ], ), ); } - } // ── Authenticity Card ───────────────────────────────────────────────── @@ -962,8 +1050,7 @@ class _AuthenticityCard extends StatelessWidget { _AuthRow(label: '入库日期', value: inStockDate), const SizedBox(height: 14), ], - if (qty > 0) - _AuthRow(label: '批次数量', value: '$qty 瓶'), + if (qty > 0) _AuthRow(label: '批次数量', value: '$qty 瓶'), ], ), ), @@ -997,11 +1084,14 @@ class _AuthRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(label, - style: const TextStyle(fontSize: 10, color: _kTextMid, letterSpacing: 0.05)), + style: const TextStyle( + fontSize: 10, color: _kTextMid, letterSpacing: 0.05)), const SizedBox(height: 3), Text(value, style: TextStyle( - fontSize: 13, color: _kInkSoft, fontWeight: FontWeight.w500, + fontSize: 13, + color: _kInkSoft, + fontWeight: FontWeight.w500, fontFamily: mono ? 'monospace' : null, letterSpacing: mono ? 0.5 : 0, )), @@ -1016,7 +1106,8 @@ class _AuthStamp extends StatelessWidget { @override Widget build(BuildContext context) { return SizedBox( - width: 84, height: 84, + width: 84, + height: 84, child: CustomPaint(painter: _StampPainter()), ); } @@ -1040,7 +1131,8 @@ class _StampPainter extends CustomPainter { canvas.drawCircle(center, innerR, ringPaint); // Circular text "防伪验证 · VERIFIED · " - _drawCircularText(canvas, '防 伪 验 证 · V E R I F I E D · ', center, innerR - 7); + _drawCircularText( + canvas, '防 伪 验 证 · V E R I F I E D · ', center, innerR - 7); // Center: checkmark final checkPaint = Paint() @@ -1060,8 +1152,10 @@ class _StampPainter extends CustomPainter { text: const TextSpan( text: '已验证', style: TextStyle( - fontSize: 8.5, fontWeight: FontWeight.w700, - color: _kBurgundy, letterSpacing: 1.0, + fontSize: 8.5, + fontWeight: FontWeight.w700, + color: _kBurgundy, + letterSpacing: 1.0, ), ), textDirection: TextDirection.ltr, @@ -1069,7 +1163,8 @@ class _StampPainter extends CustomPainter { tp.paint(canvas, Offset(cx - tp.width / 2, cy + 10)); } - void _drawCircularText(Canvas canvas, String text, Offset center, double radius) { + void _drawCircularText( + Canvas canvas, String text, Offset center, double radius) { final charCount = text.length; final angleStep = (2 * math.pi) / charCount; const startAngle = -math.pi / 2; @@ -1082,8 +1177,10 @@ class _StampPainter extends CustomPainter { text: TextSpan( text: text[i], style: const TextStyle( - fontSize: 6.5, color: _kBurgundy, - fontWeight: FontWeight.w600, letterSpacing: 0, + fontSize: 6.5, + color: _kBurgundy, + fontWeight: FontWeight.w600, + letterSpacing: 0, ), ), textDirection: TextDirection.ltr, @@ -1102,9 +1199,9 @@ class _StampPainter extends CustomPainter { class _ParamsCard extends StatelessWidget { final String publicId, spec, brand, series, unit; final String? productionDate; - final String origin; // 空串表示无产地数据，不显示该行 + final String origin; // 空串表示无产地数据，不显示该行 final String shelfLife; // 后端已回填默认值 - final String storage; // 后端已回填默认值 + final String storage; // 后端已回填默认值 const _ParamsCard({ required this.publicId, required this.spec, @@ -1120,8 +1217,10 @@ class _ParamsCard extends StatelessWidget { @override Widget build(BuildContext context) { // Parse alcohol and volume from spec - final degM = RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false).firstMatch(spec); - final mlM = RegExp(r'(\d+(?:\.\d+)?)\s*ml', caseSensitive: false).firstMatch(spec); + final degM = RegExp(r'(\d+(?:\.\d+)?)\s*(?:度|°|%vol)', caseSensitive: false) + .firstMatch(spec); + final mlM = + RegExp(r'(\d+(?:\.\d+)?)\s*ml', caseSensitive: false).firstMatch(spec); final xiangM = RegExp(r'([清浓酱兼馥凤]香(?:型(?:白酒)?)?)').firstMatch(spec); final rows = <({String label, String value, bool mono})>[ @@ -1129,11 +1228,14 @@ class _ParamsCard extends StatelessWidget { if (brand.isNotEmpty) (label: '品牌', value: brand, mono: false), if (series.isNotEmpty) (label: '系列', value: series, mono: false), if (xiangM != null) (label: '香型', value: xiangM.group(1)!, mono: false), - if (degM != null) (label: '酒精度', value: '${degM.group(1)!}% vol', mono: false), - if (mlM != null) (label: '净含量', value: '${mlM.group(1)!} ml', mono: false), + if (degM != null) + (label: '酒精度', value: '${degM.group(1)!}% vol', mono: false), + if (mlM != null) + (label: '净含量', value: '${mlM.group(1)!} ml', mono: false), if (spec.isNotEmpty) (label: '规格', value: spec, mono: false), if (origin.isNotEmpty) (label: '产地', value: origin, mono: false), - if (productionDate != null) (label: '生产日期', value: productionDate!, mono: false), + if (productionDate != null) + (label: '生产日期', value: productionDate!, mono: false), (label: '保质期', value: shelfLife, mono: false), (label: '储存方式', value: storage, mono: false), ]; @@ -1165,13 +1267,18 @@ class _ParamsCard extends StatelessWidget { SizedBox( width: 72, child: Text(r.label, - style: const TextStyle(fontSize: 12, color: _kTextMid, letterSpacing: 0.02)), + style: const TextStyle( + fontSize: 12, + color: _kTextMid, + letterSpacing: 0.02)), ), const SizedBox(width: 16), Expanded( child: Text(r.value, style: TextStyle( - fontSize: 13, color: _kInkSoft, fontWeight: FontWeight.w500, + fontSize: 13, + color: _kInkSoft, + fontWeight: FontWeight.w500, fontFamily: r.mono ? 'monospace' : null, letterSpacing: r.mono ? 0.5 : 0.01, )), @@ -1198,12 +1305,17 @@ class _SectionHeader extends StatelessWidget { Widget build(BuildContext context) { return Row( children: [ - Container(width: 3, height: 16, color: _kBurgundy, + Container( + width: 3, + height: 16, + color: _kBurgundy, margin: const EdgeInsets.only(right: 10)), Text(title, style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.w700, - color: _kInkDeep, letterSpacing: 0.06)), + fontSize: 16, + fontWeight: FontWeight.w700, + color: _kInkDeep, + letterSpacing: 0.06)), ], ); } @@ -1242,7 +1354,8 @@ class _ShopCard extends StatelessWidget { Row( children: [ Container( - width: 52, height: 52, + width: 52, + height: 52, decoration: BoxDecoration( color: const Color(0xFF0A1F3B), borderRadius: BorderRadius.circular(10), @@ -1250,7 +1363,9 @@ class _ShopCard extends StatelessWidget { child: Center( child: Text(avatarText, style: const TextStyle( - color: Colors.white, fontSize: 16, fontWeight: FontWeight.w700, + color: Colors.white, + fontSize: 16, + fontWeight: FontWeight.w700, letterSpacing: 0.04)), ), ), @@ -1259,13 +1374,17 @@ class _ShopCard extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(name, style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.w600, color: _kInkDeep, - letterSpacing: 0.04)), + Text(name, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + color: _kInkDeep, + letterSpacing: 0.04)), if (code.isNotEmpty) ...[ const SizedBox(height: 2), Text('门店编号 $code', - style: const TextStyle(fontSize: 12, color: _kTextMid)), + style: + const TextStyle(fontSize: 12, color: _kTextMid)), ], ], ), @@ -1275,44 +1394,54 @@ class _ShopCard extends StatelessWidget { const SizedBox(height: 16), Container(height: 1, color: _kBorderSub), const SizedBox(height: 14), - if (address.isNotEmpty) _ShopInfoRow(icon: Icons.location_on_outlined, text: address), - if (phone.isNotEmpty) _ShopInfoRow(icon: Icons.phone_outlined, text: phone), + if (address.isNotEmpty) + _ShopInfoRow(icon: LucideIcons.mapPin, text: address), + if (phone.isNotEmpty) + _ShopInfoRow(icon: LucideIcons.phone, text: phone), _ShopInfoRow( - icon: Icons.access_time_outlined, + icon: LucideIcons.clock, text: '营业时间 ${hours.isNotEmpty ? hours : "09:30 – 22:00"}', ), const SizedBox(height: 20), SizedBox( - width: double.infinity, height: 44, + width: double.infinity, + height: 44, child: ElevatedButton( onPressed: code.isNotEmpty - ? () => context.push( - '/shop/$code?shopName=${Uri.encodeComponent(name)}') + ? () => context + .push('/shop/$code?shopName=${Uri.encodeComponent(name)}') : null, style: ElevatedButton.styleFrom( backgroundColor: const Color(0xFF0A1F3B), foregroundColor: Colors.white, elevation: 0, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), ), child: const Text('查看本店其他商品 →', - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, letterSpacing: 0.04)), + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: 0.04)), ), ), if (wechatId.isNotEmpty) ...[ const SizedBox(height: 10), SizedBox( - width: double.infinity, height: 40, + width: double.infinity, + height: 40, child: OutlinedButton.icon( onPressed: () => _showWechatDialog(context, wechatId), style: OutlinedButton.styleFrom( foregroundColor: _kInkDeep, side: const BorderSide(color: _kBorder, width: 1.5), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), ), - icon: const Icon(Icons.person_outline, size: 16), + icon: const Icon(LucideIcons.user, size: 16), label: const Text('添加门店微信', - style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500)), + style: + TextStyle(fontSize: 13, fontWeight: FontWeight.w500)), ), ), ], @@ -1326,19 +1455,23 @@ void _showWechatDialog(BuildContext context, String wechatId) { showDialog( context: context, builder: (_) => AlertDialog( - title: const Text('门店微信号', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), + title: const Text('门店微信号', + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), content: Column( mainAxisSize: MainAxisSize.min, children: [ - const Icon(Icons.wechat, size: 48, color: Color(0xFF07C160)), + const Icon(LucideIcons.messageCircle, + size: 48, color: Color(0xFF07C160)), const SizedBox(height: 12), SelectableText( wechatId, - style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, letterSpacing: 0.5), + style: const TextStyle( + fontSize: 18, fontWeight: FontWeight.w600, letterSpacing: 0.5), textAlign: TextAlign.center, ), const SizedBox(height: 8), - const Text('长按上方微信号可复制', style: TextStyle(fontSize: 12, color: _kTextMid)), + const Text('长按上方微信号可复制', + style: TextStyle(fontSize: 12, color: _kTextMid)), ], ), actions: [ @@ -1367,7 +1500,8 @@ class _ShopInfoRow extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Text(text, - style: const TextStyle(fontSize: 13, color: _kInkSoft, height: 1.5)), + style: const TextStyle( + fontSize: 13, color: _kInkSoft, height: 1.5)), ), ], ), @@ -1393,7 +1527,8 @@ class _Footer extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - width: 20, height: 20, + width: 20, + height: 20, decoration: BoxDecoration( gradient: const LinearGradient( begin: Alignment.topLeft, @@ -1403,14 +1538,18 @@ class _Footer extends StatelessWidget { borderRadius: BorderRadius.circular(5), boxShadow: [ BoxShadow( - color: const Color(0xFF2563AC).withValues(alpha: 0.30), - blurRadius: 4, offset: const Offset(0, 2)), + color: const Color(0xFF2563AC).withValues(alpha: 0.30), + blurRadius: 4, + offset: const Offset(0, 2)), ], ), child: const Center( child: Text('岩', - style: TextStyle(color: Colors.white, fontSize: 11, - fontWeight: FontWeight.w800, letterSpacing: -0.5)), + style: TextStyle( + color: Colors.white, + fontSize: 11, + fontWeight: FontWeight.w800, + letterSpacing: -0.5)), ), ), const SizedBox(width: 8), @@ -1421,7 +1560,9 @@ class _Footer extends StatelessWidget { children: [ TextSpan( text: '岩美酒库管理系统', - style: TextStyle(fontWeight: FontWeight.w600, color: Color(0xFF353C48)), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF353C48)), ), TextSpan(text: ' 提供'), ], @@ -1456,9 +1597,11 @@ class _FooterTextLink extends StatelessWidget { Widget build(BuildContext context) { final active = url != null || onTap != null; return GestureDetector( - onTap: onTap ?? (url != null - ? () => launchUrl(Uri.parse(url!), mode: LaunchMode.externalApplication) - : null), + onTap: onTap ?? + (url != null + ? () => launchUrl(Uri.parse(url!), + mode: LaunchMode.externalApplication) + : null), child: Text(text, style: TextStyle( fontSize: 11, @@ -1489,7 +1632,8 @@ class _FeedbackDialog extends StatefulWidget { final String title; final String hint; final Future Function(String) onSubmit; - const _FeedbackDialog({required this.title, required this.hint, required this.onSubmit}); + const _FeedbackDialog( + {required this.title, required this.hint, required this.onSubmit}); @override State<_FeedbackDialog> createState() => _FeedbackDialogState(); @@ -1511,7 +1655,11 @@ class _FeedbackDialogState extends State<_FeedbackDialog> { setState(() => _submitting = true); try { await widget.onSubmit(_ctrl.text.trim()); - if (mounted) setState(() { _done = true; _submitting = false; }); + if (mounted) + setState(() { + _done = true; + _submitting = false; + }); } catch (_) { if (mounted) setState(() => _submitting = false); } @@ -1525,7 +1673,7 @@ class _FeedbackDialogState extends State<_FeedbackDialog> { content: const Column( mainAxisSize: MainAxisSize.min, children: [ - Icon(Icons.check_circle_outline, size: 48, color: _kSuccess), + Icon(LucideIcons.circleCheck, size: 48, color: _kSuccess), SizedBox(height: 12), Text('提交成功，感谢您的反馈！', style: TextStyle(fontSize: 14, color: _kInkDeep)), @@ -1563,10 +1711,13 @@ class _FeedbackDialogState extends State<_FeedbackDialog> { ElevatedButton( onPressed: _submitting ? null : _submit, style: ElevatedButton.styleFrom( - backgroundColor: _kBurgundy, foregroundColor: Colors.white), + backgroundColor: _kBurgundy, foregroundColor: Colors.white), child: _submitting - ? const SizedBox(width: 16, height: 16, - child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)) + ? const SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, color: Colors.white)) : const Text('提交'), ), ], diff --git a/client/lib/screens/public/public_shop_products_screen.dart b/client/lib/screens/public/public_shop_products_screen.dart index 6438c87..dbba49b 100644 --- a/client/lib/screens/public/public_shop_products_screen.dart +++ b/client/lib/screens/public/public_shop_products_screen.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; @@ -25,8 +26,7 @@ class PublicShopProductsScreen extends StatefulWidget { _PublicShopProductsScreenState(); } -class _PublicShopProductsScreenState - extends State { +class _PublicShopProductsScreenState extends State { final _dio = Dio(BaseOptions( connectTimeout: const Duration(seconds: 10), receiveTimeout: const Duration(seconds: 15), @@ -83,8 +83,8 @@ class _PublicShopProductsScreenState queryParameters: {'page': _page, 'page_size': 20}, ); final body = resp.data as Map; - final list = (body['data'] as List? ?? []) - .cast>(); + final list = + (body['data'] as List? ?? []).cast>(); final total = (body['total'] as num?)?.toInt() ?? 0; if (!mounted) return; @@ -108,8 +108,7 @@ class _PublicShopProductsScreenState @override Widget build(BuildContext context) { - final title = - widget.shopName.isNotEmpty ? widget.shopName : '本店商品'; + final title = widget.shopName.isNotEmpty ? widget.shopName : '本店商品'; return Scaffold( backgroundColor: _kPaperDeep, @@ -118,16 +117,14 @@ class _PublicShopProductsScreenState elevation: 0, surfaceTintColor: Colors.transparent, leading: IconButton( - icon: const Icon(Icons.arrow_back_ios_new, size: 18), + icon: const Icon(LucideIcons.arrowLeft, size: 18), color: _kInkDeep, onPressed: () => context.pop(), ), title: Text( title, style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - color: _kInkDeep), + fontSize: 16, fontWeight: FontWeight.w600, color: _kInkDeep), ), centerTitle: true, bottom: PreferredSize( @@ -142,8 +139,7 @@ class _PublicShopProductsScreenState Widget _buildBody() { if (_loading) { return const Center( - child: CircularProgressIndicator( - color: _kBurgundy, strokeWidth: 2)); + child: CircularProgressIndicator(color: _kBurgundy, strokeWidth: 2)); } if (_error != null && _items.isEmpty) { return Center( @@ -157,7 +153,7 @@ class _PublicShopProductsScreenState height: 56, decoration: const BoxDecoration( color: Color(0xFFFDECEC), shape: BoxShape.circle), - child: const Icon(Icons.error_outline, + child: const Icon(LucideIcons.circleAlert, size: 28, color: Color(0xFFD14343)), ), const SizedBox(height: 16), @@ -187,10 +183,9 @@ class _PublicShopProductsScreenState child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.inventory_2_outlined, size: 48, color: _kTextMid), + Icon(LucideIcons.box, size: 48, color: _kTextMid), SizedBox(height: 12), - Text('暂无上架商品', - style: TextStyle(fontSize: 15, color: _kTextMid)), + Text('暂无上架商品', style: TextStyle(fontSize: 15, color: _kTextMid)), ], ), ); @@ -210,8 +205,7 @@ class _PublicShopProductsScreenState sliver: SliverToBoxAdapter( child: Text( '共 $_total 件商品', - style: const TextStyle( - fontSize: 12, color: _kTextMid), + style: const TextStyle(fontSize: 12, color: _kTextMid), ), ), ), @@ -219,12 +213,10 @@ class _PublicShopProductsScreenState padding: const EdgeInsets.all(12), sliver: SliverGrid( delegate: SliverChildBuilderDelegate( - (context, index) => - _ProductCard(item: _items[index]), + (context, index) => _ProductCard(item: _items[index]), childCount: _items.length, ), - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, crossAxisSpacing: 10, mainAxisSpacing: 10, @@ -247,8 +239,7 @@ class _PublicShopProductsScreenState padding: EdgeInsets.all(20), child: Center( child: Text('已展示全部商品', - style: TextStyle( - fontSize: 12, color: _kTextMid))), + style: TextStyle(fontSize: 12, color: _kTextMid))), ), ), ], @@ -275,8 +266,8 @@ class _ProductCard extends StatelessWidget { final qtyStr = qtyNum == qtyNum.roundToDouble() ? qtyNum.toInt().toString() : qtyNum.toString(); - final images = (item['images'] as List? ?? []) - .cast>(); + final images = + (item['images'] as List? ?? []).cast>(); final imageUrl = images.isNotEmpty ? AppConfig.baseUrl + (images.first['url'] as String) : null; @@ -308,8 +299,7 @@ class _ProductCard extends StatelessWidget { ? Image.network( imageUrl, fit: BoxFit.cover, - errorBuilder: (_, __, ___) => - _PlaceholderImg(), + errorBuilder: (_, __, ___) => _PlaceholderImg(), ) : _PlaceholderImg(), ), @@ -317,8 +307,7 @@ class _ProductCard extends StatelessWidget { // 商品信息 Expanded( child: Padding( - padding: - const EdgeInsets.fromLTRB(8, 6, 8, 8), + padding: const EdgeInsets.fromLTRB(8, 6, 8, 8), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -338,8 +327,7 @@ class _ProductCard extends StatelessWidget { subtitle, maxLines: 1, overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontSize: 11, color: _kTextMid), + style: const TextStyle(fontSize: 11, color: _kTextMid), ), ], const Spacer(), @@ -391,7 +379,7 @@ class _PlaceholderImg extends StatelessWidget { return Container( color: _kPaperDeep, child: const Center( - child: Icon(Icons.wine_bar_outlined, size: 40, color: _kBorder), + child: Icon(LucideIcons.wine, size: 40, color: _kBorder), ), ); } diff --git a/client/lib/screens/settings/settings_screen.dart b/client/lib/screens/settings/settings_screen.dart index 6a73885..b36f63e 100644 --- a/client/lib/screens/settings/settings_screen.dart +++ b/client/lib/screens/settings/settings_screen.dart @@ -1,32 +1,43 @@ -import 'dart:async'; -import '../../core/utils/dialog_util.dart'; +// screens/settings/settings_screen.dart — 系统设置（照原型 settings.html 重建）。 +// 布局：.head + .settings grid(左 .subnav 200px + 右面板卡)。子导航 5 项 = +// 原型 4（门店信息/用户管理/授权兑换券/偏好设置）+ 保留真实功能「编号规则」。 +// 用户管理面板 = 预览表 + 「管理全部用户」→ /settings/users 独立页（原型 users.html）。 +// 原「系统参数」假设置（本地 state 不落后端）已按用户口径删除。 import 'package:file_picker/file_picker.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:go_router/go_router.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; +import 'package:url_launcher/url_launcher.dart'; + import '../../core/auth/auth_state.dart'; -import '../../widgets/write_guard.dart'; -import '../../core/config/app_config.dart'; import '../../core/config/app_info.dart'; import '../../core/config/license_copy.dart'; import '../../core/responsive/responsive.dart'; -import '../../core/theme/context_tokens.dart'; -import '../../core/theme/app_tokens.dart'; +import '../../core/theme/app_dims.g.dart'; import '../../core/theme/app_tokens.g.dart'; +import '../../core/theme/context_tokens.dart'; import '../../core/theme/theme_controller.dart'; -import '../../widgets/kpi_card.dart'; +import '../../core/utils/clock.dart'; +import '../../core/utils/dialog_util.dart'; import '../../models/number_rule.dart'; -import '../../models/user.dart'; +import '../../models/shop.dart'; import '../../providers/license_provider.dart'; import '../../providers/number_rule_provider.dart'; -import '../../providers/user_provider.dart'; import '../../providers/shop_provider.dart'; -import '../../models/shop.dart'; +import '../../providers/user_provider.dart'; +import '../../providers/warehouse_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_menu.dart'; +import '../../widgets/ds/ds_table.dart'; +import '../../widgets/write_guard.dart'; +import 'users_screen.dart' show userRoleBadge, userStatusBadge; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; class SettingsScreen extends ConsumerStatefulWidget { - /// 初始选中的 Tab（0=酒行信息 … 4=授权 … 5=数据管理）。 + /// 初始面板：{shop:0, users:1, number:2, license:3, pref:4} final int initialTab; const SettingsScreen({super.key, this.initialTab = 0}); @@ -35,1553 +46,933 @@ class SettingsScreen extends ConsumerStatefulWidget { } class _SettingsScreenState extends ConsumerState { - // System params local state (UI only, no backend yet) - String _sysName = '酒库管理系统'; - String _sysCurrency = '人民币（CNY）'; - String _sysDateFormat = 'YYYY-MM-DD'; - String _sysTimezone = 'Asia/Shanghai (UTC+8)'; - bool _requireStockInApproval = true; - bool _requireStockOutApproval = true; - bool _allowOverstock = false; - - @override - Widget build(BuildContext context) { - return DefaultTabController( - length: 5, - initialIndex: widget.initialTab >= 5 ? 0 : widget.initialTab, - child: Column( - children: [ - Container( - color: context.tokens.surface, - child: TabBar( - isScrollable: true, - labelColor: context.tokens.primary, - unselectedLabelColor: context.tokens.muted, - indicatorColor: context.tokens.primary, - indicatorWeight: 2, - labelStyle: - const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), - tabs: const [ - Tab(text: '酒行信息'), - Tab(text: '用户管理'), - Tab(text: '编号规则'), - Tab(text: '系统参数'), - Tab(text: '授权'), - ], - ), - ), - const Divider(height: 1), - Expanded( - child: TabBarView( - children: [ - _buildShopInfoTab(), - _buildUsersTab(), - _buildNumberRulesTab(), - _buildSystemParamsTab(), - _buildLicenseTab(), - ], - ), - ), - ], - ), - ); - } - - Widget _buildShopInfoTab() { - final asyncShop = ref.watch(shopInfoProvider); - final currentUser = ref.watch(authStateProvider).user; - final isAdmin = - currentUser?.role == 'admin' || currentUser?.role == 'superadmin'; - - return asyncShop.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton( - onPressed: () => ref.invalidate(shopInfoProvider), - child: const Text('重试'), - ), - ], - ), - ), - data: (shop) => SingleChildScrollView( - padding: const EdgeInsets.all(24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('酒行信息', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const SizedBox(height: 4), - Text('门店的基本信息，仅管理员可编辑', - style: TextStyle(fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 16), - Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Logo 预览行 - Row( - children: [ - _ShopLogoPreview(logoUrl: shop.logoUrl, shopName: shop.name, size: 64), - const SizedBox(width: 16), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(shop.name.isNotEmpty ? shop.name : '—', - style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const SizedBox(height: 4), - Text(shop.code.isNotEmpty ? shop.code : '—', - style: TextStyle(fontSize: 13, color: context.tokens.muted)), - ], - ), - ], - ), - const Divider(height: 24), - _ShopInfoRow( - label: '门店地址', - value: shop.address.isNotEmpty ? shop.address : '—'), - const Divider(height: 16), - _ShopInfoRow( - label: '联系电话', - value: shop.phone.isNotEmpty ? shop.phone : '—'), - const Divider(height: 16), - _ShopInfoRow( - label: '负责人', - value: - shop.managerName.isNotEmpty ? shop.managerName : '—'), - const Divider(height: 16), - _ShopInfoRow( - label: '微信号', - value: shop.wechatId.isNotEmpty ? shop.wechatId : '—'), - ], - ), - ), - ), - if (isAdmin) ...[ - const SizedBox(height: 16), - ElevatedButton.icon( - onPressed: () => _showEditShopDialog(context, shop), - icon: const Icon(Icons.edit_outlined, size: 16), - label: const Text('编辑信息'), - ), - ], - ], - ), - ), - ); - } - - void _showEditShopDialog(BuildContext context, ShopInfo shop) { - showAppDialog( - context: context, - builder: (ctx) => _ShopEditDialog( - shop: shop, - onSaved: () => ref.invalidate(shopInfoProvider), - ), - ); - } - - Widget _buildUsersTab() { - final asyncUsers = ref.watch(userListProvider); - return Column( - children: [ - Container( - height: 52, - color: context.tokens.surface, - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Row( - children: [ - WriteGuard( - child: ElevatedButton.icon( - onPressed: () => _showAddUserDialog(context), - icon: const Icon(Icons.person_add, size: 16), - label: const Text('新增用户'), - ), - ), - ], - ), - ), - const Divider(height: 1), - Expanded( - child: asyncUsers.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton( - onPressed: () => ref.read(userListProvider.notifier).reload(), - child: const Text('重试'), - ), - ], - ), - ), - data: (users) => SingleChildScrollView( - child: DataTable( - headingRowColor: WidgetStateProperty.all(context.tokens.thBg), - columns: const [ - DataColumn(label: Text('姓名')), - DataColumn(label: Text('用户名')), - DataColumn(label: Text('角色')), - DataColumn(label: Text('状态')), - DataColumn(label: Text('操作')), - ], - rows: users - .map((u) => DataRow(cells: [ - DataCell(Row( - mainAxisSize: MainAxisSize.min, - children: [ - CircleAvatar( - radius: 14, - backgroundColor: - context.tokens.primary.withOpacity(0.15), - child: Text( - (u.realName ?? u.username) - .substring(0, 1), - style: TextStyle( - fontSize: 12, - color: context.tokens.primary, - fontWeight: FontWeight.w600), - ), - ), - const SizedBox(width: 8), - Text(u.realName ?? u.username), - ], - )), - DataCell(Text(u.username, - style: const TextStyle( - fontFamily: 'monospace', fontSize: 12))), - DataCell(_RoleBadge(u.roleLabel)), - DataCell(Switch( - value: u.isActive, - onChanged: (v) => ref - .read(userListProvider.notifier) - .updateUser(u.id, {'is_active': v}), - materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, - )), - DataCell(Row( - mainAxisSize: MainAxisSize.min, - children: WriteGuard.isReadonly(ref) - ? const [] - : [ - WriteGuard( - child: TextButton( - onPressed: () => - _showEditUserDialog(context, u), - child: const Text('编辑', - style: TextStyle(fontSize: 12)), - ), - ), - WriteGuard( - child: TextButton( - onPressed: () => - _showResetPasswordDialog(context, u), - child: const Text('重置密码', - style: TextStyle(fontSize: 12)), - ), - ), - ], - )), - ])) - .toList(), - ), - ), - ), - ), - ], - ); - } - - // ── 授权 Tab ────────────────────────────────────────────── - Widget _buildLicenseTab() { - final licenseAsync = ref.watch(licenseProvider); - return SingleChildScrollView( - padding: const EdgeInsets.all(24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('授权信息', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const SizedBox(height: 4), - Text('当前门店的授权状态与设备绑定', - style: TextStyle(fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 16), - Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: licenseAsync.when( - loading: () => const _ParamRow(label: '授权状态', value: '加载中…'), - error: (_, __) => - const _ParamRow(label: '授权状态', value: '暂无授权信息'), - data: (lic) => _buildLicenseContent(lic), - ), - ), - ), - const SizedBox(height: 16), - // 过期降级说明 - _buildExpiryNotes(), - const SizedBox(height: 16), - // 激活码输入区 - _buildActivationCard(), - ], - ), - ); - } - - Widget _buildLicenseContent(LicenseInfo? lic) { - if (lic == null) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const _ParamRow(label: '授权状态', value: '未激活'), - const SizedBox(height: 12), - OutlinedButton.icon( - onPressed: _showRenewLicenseDialog, - icon: const Icon(Icons.card_membership, size: 16), - label: const Text('续费 / 获取授权码'), - ), - ], - ); - } - - final Color phaseColor = LicenseCopy.phaseColor(lic.phase); - final String phaseText = LicenseCopy.statusText(lic); - - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _ParamRow(label: '授权类型', value: lic.typeLabel), - Padding( - padding: const EdgeInsets.symmetric(vertical: 8), - child: Row( - children: [ - SizedBox( - width: 180, - child: Text('授权状态', - style: TextStyle( - fontSize: 14, color: context.tokens.muted)), - ), - Text(phaseText, - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, - color: phaseColor)), - ], - ), - ), - if (lic.expiresAt != null) - _ParamRow( - label: '到期时间', - value: DateFormat('yyyy-MM-dd').format(lic.expiresAt!)) - else - const _ParamRow(label: '到期时间', value: '永久有效'), - _ParamRow(label: '设备上限', value: '${lic.maxDevices} 台'), - const SizedBox(height: 12), - OutlinedButton.icon( - onPressed: _showRenewLicenseDialog, - icon: const Icon(Icons.card_membership, size: 16), - label: const Text('续费 / 升级授权'), - ), - ], - ); - } - - Widget _buildExpiryNotes() { - return Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Icon(Icons.info_outline, - size: 16, color: context.tokens.muted), - const SizedBox(width: 6), - const Text('过期说明', - style: - TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), - ], - ), - const SizedBox(height: 4), - Text('授权到期后会分阶段降级，请在到期前及时续费', - style: - TextStyle(fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 12), - for (final note in LicenseCopy.degradationNotes()) - Padding( - padding: const EdgeInsets.symmetric(vertical: 4), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top: 6, right: 8), - child: Icon(Icons.circle, - size: 5, color: context.tokens.muted), - ), - Expanded( - child: Text(note, - style: const TextStyle( - fontSize: 13, height: 1.5)), - ), - ], - ), - ), - ], - ), - ), - ); - } - - Widget _buildActivationCard() { - return Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('兑换激活码', - style: - TextStyle(fontSize: 14, fontWeight: FontWeight.w600)), - const SizedBox(height: 8), - Text('输入购买或活动获得的激活码，时长将叠加到当前授权之后', - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 12), - Row( - children: [ - Expanded( - child: TextField( - controller: _licenseKeyCtrl, - decoration: const InputDecoration( - hintText: 'JIUKU-XXXX-XXXX', - isDense: true, - border: OutlineInputBorder(), - contentPadding: - EdgeInsets.symmetric(horizontal: 12, vertical: 10), - ), - style: const TextStyle(fontSize: 13), - ), - ), - if (!WriteGuard.isReadonly(ref)) ...[ - const SizedBox(width: 8), - ElevatedButton( - onPressed: _isActivating ? null : _activateLicense, - child: _isActivating - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator(strokeWidth: 2)) - : const Text('兑换'), - ), - ], - ], - ), - ], - ), - ), - ); - } - - late final TextEditingController _licenseKeyCtrl = - TextEditingController(); - bool _isActivating = false; - - Future _activateLicense() async { - final key = _licenseKeyCtrl.text.trim(); - if (key.isEmpty) return; - setState(() => _isActivating = true); - try { - final repo = ref.read(licenseRepositoryProvider); - await repo.activate(key); - _licenseKeyCtrl.clear(); - await ref.read(licenseProvider.notifier).reload(); - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('兑换成功，授权已更新'), backgroundColor: context.tokens.success), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(e.toString()), - backgroundColor: context.tokens.danger), - ); - } - } finally { - if (mounted) setState(() => _isActivating = false); - } - } - - void _showRenewLicenseDialog() { - showAppDialog( - context: context, - builder: (ctx) => AlertDialog( - title: const Text('续费 / 升级授权'), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('请联系我们获取续费报价：'), - const SizedBox(height: 12), - SelectableText('📧 ${AppInfo.email}', - style: const TextStyle(fontSize: 13)), - ], - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('关闭'), - ), - ElevatedButton( - onPressed: () async { - await Clipboard.setData(ClipboardData(text: AppInfo.email)); - if (ctx.mounted) { - Navigator.pop(ctx); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('邮箱已复制到剪贴板')), - ); - } - }, - child: const Text('复制邮箱'), - ), - ], - ), - ); - } - - Widget _buildNumberRulesTab() { - final asyncRules = ref.watch(numberRuleListProvider); - return asyncRules.when( - loading: () => const Center(child: CircularProgressIndicator()), - error: (e, _) => Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), - const SizedBox(height: 12), - Text('暂无数据，网络不可用', - style: TextStyle(color: context.tokens.muted)), - const SizedBox(height: 12), - ElevatedButton( - onPressed: () => - ref.read(numberRuleListProvider.notifier).reload(), - child: const Text('重试'), - ), - ], - ), - ), - data: (rules) => SingleChildScrollView( - padding: const EdgeInsets.all(24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('编号规则配置', - style: - TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const SizedBox(height: 4), - Text('配置各类单据的自动编号规则，修改后对新建单据生效', - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 16), - Card( - child: DataTable( - headingRowColor: - WidgetStateProperty.all(context.tokens.thBg), - columns: const [ - DataColumn(label: Text('单据类型')), - DataColumn(label: Text('前缀')), - DataColumn(label: Text('日期格式')), - DataColumn(label: Text('下一编号示例')), - DataColumn(label: Text('当前序号'), numeric: true), - DataColumn(label: Text('操作')), - ], - rows: rules - .map((r) => DataRow(cells: [ - DataCell(Text(r.typeLabel, - style: const TextStyle( - fontWeight: FontWeight.w500))), - DataCell(Container( - padding: const EdgeInsets.symmetric( - horizontal: 8, vertical: 2), - decoration: BoxDecoration( - color: context.tokens.primary.withOpacity(0.1), - borderRadius: BorderRadius.circular(3), - ), - child: Text(r.prefix, - style: TextStyle( - color: context.tokens.primary, - fontFamily: 'monospace', - fontSize: 13, - fontWeight: FontWeight.w600)), - )), - DataCell(Text(r.dateFormat, - style: TextStyle( - fontSize: 12, - color: context.tokens.muted))), - DataCell(Text(r.exampleNo, - style: const TextStyle( - fontFamily: 'monospace', fontSize: 12))), - DataCell(Text('${r.currentNo}')), - DataCell(WriteGuard( - child: TextButton( - onPressed: () => - _showNumberRuleDialog(context, r), - child: const Text('编辑', - style: TextStyle(fontSize: 12))))), - ])) - .toList(), - ), - ), - ], - ), - ), - ); - } - - void _showNumberRuleDialog(BuildContext context, NumberRule rule) { - final prefixCtrl = TextEditingController(text: rule.prefix); - final currentNoCtrl = - TextEditingController(text: '${rule.currentNo}'); - showAppDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('编辑编号规则 — ${rule.typeLabel}'), - content: SizedBox( - width: context.dialogWidth(360), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextField( - controller: prefixCtrl, - decoration: const InputDecoration(labelText: '前缀'), - ), - const SizedBox(height: 12), - TextField( - controller: currentNoCtrl, - decoration: const InputDecoration(labelText: '当前序号'), - keyboardType: TextInputType.number, - ), - ], - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('取消')), - ElevatedButton( - onPressed: () async { - Navigator.of(ctx).pop(); - try { - await ref - .read(numberRuleListProvider.notifier) - .updateRule(rule.id, { - 'prefix': prefixCtrl.text.trim(), - 'current_no': int.tryParse(currentNoCtrl.text) ?? rule.currentNo, - }); - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('编号规则已更新'), - backgroundColor: context.tokens.success), - ); - } - } catch (e) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('更新失败：$e'), - backgroundColor: context.tokens.danger), - ); - } - } - }, - child: const Text('保存'), - ), - ], - ), - ); - } - - Widget _buildSystemParamsTab() { - return SingleChildScrollView( - padding: const EdgeInsets.all(24), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Text('系统参数', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const SizedBox(height: 16), - const _ThemePickerCard(), - const SizedBox(height: 16), - Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('基本设置', - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: context.tokens.primaryDark)), - const Divider(height: 24), - _ParamRow( - label: '系统名称', - value: _sysName, - onEdit: () => _showEditParamDialog('系统名称', _sysName, - (v) => setState(() => _sysName = v)), - ), - _ParamRow( - label: '货币单位', - value: _sysCurrency, - onEdit: () => _showEditParamDialog('货币单位', _sysCurrency, - (v) => setState(() => _sysCurrency = v)), - ), - _ParamRow( - label: '日期格式', - value: _sysDateFormat, - onEdit: () => _showEditParamDialog('日期格式', _sysDateFormat, - (v) => setState(() => _sysDateFormat = v)), - ), - _ParamRow( - label: '时区', - value: _sysTimezone, - onEdit: () => _showEditParamDialog('时区', _sysTimezone, - (v) => setState(() => _sysTimezone = v)), - ), - const SizedBox(height: 16), - Text('审核设置', - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: context.tokens.primaryDark)), - const Divider(height: 24), - _ParamRow( - label: '入库单需要审核', - value: _requireStockInApproval ? '是' : '否', - switchValue: _requireStockInApproval, - onSwitchChanged: (v) => - setState(() => _requireStockInApproval = v), - ), - _ParamRow( - label: '出库单需要审核', - value: _requireStockOutApproval ? '是' : '否', - switchValue: _requireStockOutApproval, - onSwitchChanged: (v) => - setState(() => _requireStockOutApproval = v), - ), - _ParamRow( - label: '允许超量出库', - value: _allowOverstock ? '是' : '否', - switchValue: _allowOverstock, - onSwitchChanged: (v) => - setState(() => _allowOverstock = v), - ), - ], - ), - ), - ), - const SizedBox(height: 12), - Row( - children: [ - ElevatedButton( - onPressed: () { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('设置已保存'), - backgroundColor: context.tokens.success)); - }, - child: const Text('保存设置'), - ), - const SizedBox(width: 8), - OutlinedButton( - onPressed: () => setState(() { - _sysName = '酒库管理系统'; - _sysCurrency = '人民币（CNY）'; - _sysDateFormat = 'YYYY-MM-DD'; - _sysTimezone = 'Asia/Shanghai (UTC+8)'; - _requireStockInApproval = true; - _requireStockOutApproval = true; - _allowOverstock = false; - }), - child: const Text('重置默认'), - ), - ], - ), - ], - ), - ); - } - - - void _showEditParamDialog( - String label, String current, ValueChanged onSave) { - final ctrl = TextEditingController(text: current); - showAppDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('修改$label'), - content: SizedBox( - width: context.dialogWidth(320), - child: TextField( - controller: ctrl, - autofocus: true, - decoration: InputDecoration(labelText: label), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: const Text('取消')), - ElevatedButton( - onPressed: () { - final v = ctrl.text.trim(); - if (v.isNotEmpty) onSave(v); - Navigator.of(ctx).pop(); - }, - child: const Text('确定'), - ), - ], - ), - ); - } - - void _showAddUserDialog(BuildContext context) { - showAppDialog( - context: context, - builder: (ctx) => _UserFormDialog( - onSaved: () => ref.read(userListProvider.notifier).reload(), - ), - ); - } - - void _showEditUserDialog(BuildContext context, AppUser user) { - showAppDialog( - context: context, - builder: (ctx) => _UserFormDialog( - user: user, - onSaved: () => ref.read(userListProvider.notifier).reload(), - ), - ); - } - - void _showResetPasswordDialog(BuildContext context, AppUser user) { - showAppDialog( - context: context, - builder: (ctx) => _ResetPasswordDialog(user: user), - ); - } -} - -// ── 新增/编辑用户弹窗 ───────────────────────────────────── -class _UserFormDialog extends ConsumerStatefulWidget { - final AppUser? user; - final VoidCallback onSaved; - const _UserFormDialog({this.user, required this.onSaved}); - - @override - ConsumerState<_UserFormDialog> createState() => _UserFormDialogState(); -} - -class _UserFormDialogState extends ConsumerState<_UserFormDialog> { - final _formKey = GlobalKey(); - late final TextEditingController _usernameCtrl; - late final TextEditingController _realNameCtrl; - late final TextEditingController _phoneCtrl; - late final TextEditingController _passwordCtrl; - late String _role; - bool _saving = false; - - bool get _isEdit => widget.user != null; - - @override - void initState() { - super.initState(); - _usernameCtrl = TextEditingController(text: widget.user?.username ?? ''); - _realNameCtrl = TextEditingController(text: widget.user?.realName ?? ''); - _phoneCtrl = TextEditingController(text: widget.user?.phone ?? ''); - _passwordCtrl = TextEditingController(); - _role = widget.user?.role ?? 'operator'; - } - - @override - void dispose() { - _usernameCtrl.dispose(); - _realNameCtrl.dispose(); - _phoneCtrl.dispose(); - _passwordCtrl.dispose(); - super.dispose(); - } - - Future _save() async { - if (!_formKey.currentState!.validate()) return; - setState(() => _saving = true); - try { - final notifier = ref.read(userListProvider.notifier); - if (_isEdit) { - await notifier.updateUser(widget.user!.id, { - 'real_name': _realNameCtrl.text.trim(), - 'phone': _phoneCtrl.text.trim(), - 'role': _role, - }); - } else { - await notifier.createUser({ - 'username': _usernameCtrl.text.trim(), - 'password': _passwordCtrl.text, - 'real_name': _realNameCtrl.text.trim(), - 'phone': _phoneCtrl.text.trim(), - 'role': _role, - }); - } - if (mounted) { - Navigator.of(context).pop(); - widget.onSaved(); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(_isEdit ? '用户更新成功' : '用户创建成功'), - backgroundColor: context.tokens.success, - )); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('保存失败：$e'), - backgroundColor: context.tokens.danger, - )); - } - } finally { - if (mounted) setState(() => _saving = false); - } - } - - @override - Widget build(BuildContext context) { - return AlertDialog( - title: Text(_isEdit ? '编辑用户' : '新增用户'), - content: SizedBox( - width: context.dialogWidth(400), - child: Form( - key: _formKey, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - if (!_isEdit) - TextFormField( - controller: _usernameCtrl, - decoration: const InputDecoration(labelText: '用户名'), - validator: (v) => (v == null || v.isEmpty) ? '不能为空' : null, - ), - if (!_isEdit) const SizedBox(height: 12), - TextFormField( - controller: _realNameCtrl, - decoration: const InputDecoration(labelText: '姓名'), - ), - const SizedBox(height: 12), - TextFormField( - controller: _phoneCtrl, - decoration: const InputDecoration(labelText: '手机号'), - ), - const SizedBox(height: 12), - if (!_isEdit) ...[ - TextFormField( - controller: _passwordCtrl, - obscureText: true, - decoration: const InputDecoration(labelText: '初始密码'), - validator: (v) => (v == null || v.isEmpty) ? '不能为空' : null, - ), - const SizedBox(height: 12), - ], - DropdownButtonFormField( - value: _role, - items: const [ - DropdownMenuItem(value: 'superadmin', child: Text('超级管理员')), - DropdownMenuItem(value: 'admin', child: Text('管理员')), - DropdownMenuItem(value: 'operator', child: Text('操作员')), - DropdownMenuItem(value: 'readonly', child: Text('只读')), - ], - onChanged: (v) => setState(() => _role = v ?? 'operator'), - decoration: const InputDecoration(labelText: '角色'), - ), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, height: 16, - child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)) - : const Text('保存'), - ), - ], - ); - } -} - -// ── 重置密码弹窗 ────────────────────────────────────────── -class _ResetPasswordDialog extends ConsumerStatefulWidget { - final AppUser user; - const _ResetPasswordDialog({required this.user}); - - @override - ConsumerState<_ResetPasswordDialog> createState() => _ResetPasswordDialogState(); -} - -class _ResetPasswordDialogState extends ConsumerState<_ResetPasswordDialog> { - final _ctrl = TextEditingController(); - bool _saving = false; - - @override - void dispose() { - _ctrl.dispose(); - super.dispose(); - } - - Future _save() async { - if (_ctrl.text.isEmpty) return; - setState(() => _saving = true); - try { - await ref.read(userListProvider.notifier).resetPassword(widget.user.id, _ctrl.text); - if (mounted) { - Navigator.of(context).pop(); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('密码已重置'), - backgroundColor: context.tokens.success, - )); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('重置失败：$e'), - backgroundColor: context.tokens.danger, - )); - } - } finally { - if (mounted) setState(() => _saving = false); - } - } - - @override - Widget build(BuildContext context) { - return AlertDialog( - title: Text('重置密码 — ${widget.user.username}'), - content: SizedBox( - width: context.dialogWidth(360), - child: TextField( - controller: _ctrl, - obscureText: true, - decoration: const InputDecoration(labelText: '新密码'), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, height: 16, - child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)) - : const Text('确认重置'), - ), - ], - ); - } -} - -class _RoleBadge extends StatelessWidget { - final String role; - const _RoleBadge(this.role); + static const _navs = [ + // 图标对齐原型 subnav sprite：i-ic44=house / i-ic45=user-plus / + // i-ic07=trending-up / i-ic46=contrast（编号规则为 app 专属项，用 hash） + (LucideIcons.house, '门店信息'), + (LucideIcons.userPlus, '用户管理'), + (LucideIcons.hash, '编号规则'), + (LucideIcons.trendingUp, '授权兑换券'), + (LucideIcons.contrast, '偏好设置'), + ]; + late int _panel = widget.initialTab.clamp(0, _navs.length - 1); @override Widget build(BuildContext context) { final t = context.tokens; - final (Color fg, Color bg) = switch (role) { - '超级管理员' => (t.danger, t.dangerBg), - '管理员' => (t.primary, t.infoSoft), - '操作员' => (t.success, t.okSoft), - _ => (t.muted, t.infoSoft), - }; - return StatusPill(label: role, color: fg, background: bg); - } -} - -class _ParamRow extends StatelessWidget { - final String label; - final String value; - final bool? switchValue; - final ValueChanged? onSwitchChanged; - final VoidCallback? onEdit; - - const _ParamRow({ - required this.label, - required this.value, - this.switchValue, - this.onSwitchChanged, - this.onEdit, - }); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 8), - child: Row( + final mobile = context.isMobile; + return Container( + color: t.bg, + padding: + mobile ? EdgeInsets.zero : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SizedBox( - width: 180, - child: Text(label, - style: TextStyle( - fontSize: 14, color: context.tokens.muted)), - ), - if (switchValue != null) - Switch( - value: switchValue!, - onChanged: onSwitchChanged, - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - ) - else - Text(value, - style: const TextStyle( - fontSize: 14, fontWeight: FontWeight.w500)), - const Spacer(), - if (onEdit != null) - TextButton( - onPressed: onEdit, - child: const Text('修改', style: TextStyle(fontSize: 12)), + // ── 头部（原型 .head）── + Padding( + padding: mobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text('系统设置', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text('门店配置 · 用户与授权 · 个性化偏好', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ], ), + ), + if (mobile) + Padding( + padding: + const EdgeInsets.fromLTRB(AppDims.sp4, 0, AppDims.sp4, 12), + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: DsSeg( + items: [for (final n in _navs) n.$2], + index: _panel, + onChanged: (i) => setState(() => _panel = i), + ), + ), + ), + Expanded( + child: mobile + ? SingleChildScrollView( + padding: const EdgeInsets.fromLTRB( + AppDims.sp4, 0, AppDims.sp4, AppDims.sp4), + child: _panelBody(), + ) + : Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _subnav(t), + const SizedBox(width: 22), + Expanded( + child: SingleChildScrollView(child: _panelBody()), + ), + ], + ), + ), + ], + ), + ); + } + + /// 原型 .subnav：200px surface r-lg pad8；项高 40 gap10；on=brand50/primary/600。 + Widget _subnav(dynamic t) { + return Container( + width: 200, + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var i = 0; i < _navs.length; i++) + InkWell( + onTap: () => setState(() => _panel = i), + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 40, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + color: i == _panel ? t.brand50 : null, + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + Icon(_navs[i].$1, + size: 16, color: i == _panel ? t.primary : t.muted), + const SizedBox(width: 10), + Text(_navs[i].$2, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: + i == _panel ? FontWeight.w600 : FontWeight.w400, + color: i == _panel ? t.primary : t.text)), + ]), + ), + ), + ], + ), + ); + } + + Widget _panelBody() => switch (_panel) { + 0 => const _StoreInfoPanel(), + 1 => _usersPanel(), + 2 => _numberPanel(), + 3 => const _LicensePanel(), + 4 => const _PrefPanel(), + _ => const SizedBox(), + }; + + // ── 面板 2：用户管理（预览表 + 独立页入口）────────────────── + Widget _usersPanel() { + final t = context.tokens; + final async = ref.watch(userListProvider); + return _SettingsCard( + title: '用户管理', + desc: '管理门店成员与权限角色', + trailing: DsButton('管理全部用户', + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => context.push('/settings/users')), + child: async.when( + loading: () => const Padding( + padding: EdgeInsets.all(24), + child: Center(child: CircularProgressIndicator())), + error: (e, _) => Text('加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + data: (users) { + final preview = users.take(4).toList(); + return DsTable( + shrinkWrap: true, + emptyText: '暂无成员', + columns: const [ + DsColumn('user', '用户'), + DsColumn('role', '角色'), + DsColumn('status', '状态'), + DsColumn('actions', '操作', action: true), + ], + rows: preview.map((u) { + return DsRow(cells: [ + Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + u.realName?.isNotEmpty == true + ? u.realName! + : u.username, + style: TextStyle( + fontWeight: FontWeight.w600, color: t.heading)), + Padding( + padding: const EdgeInsets.only(top: 2), + child: Text(u.username, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ), + ], + ), + userRoleBadge(u.role), + userStatusBadge(u.isActive), + InkWell( + onTap: () => context.push('/settings/users'), + child: Icon(LucideIcons.pencil, size: 16, color: t.muted), + ), + ]); + }).toList(), + ); + }, + ), + ); + } + + // ── 面板 3：编号规则（保留真实功能，DsTable 版式）──────────── + Widget _numberPanel() { + final t = context.tokens; + final async = ref.watch(numberRuleListProvider); + return _SettingsCard( + title: '编号规则', + desc: '单据编号的前缀 / 日期格式 / 序号', + child: async.when( + loading: () => const Padding( + padding: EdgeInsets.all(24), + child: Center(child: CircularProgressIndicator())), + error: (e, _) => Row(children: [ + Text('加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + const SizedBox(width: 10), + DsButton('重试', + small: true, + onPressed: () => + ref.read(numberRuleListProvider.notifier).reload()), + ]), + data: (rules) => DsTable( + shrinkWrap: true, + emptyText: '暂无编号规则', + columns: const [ + DsColumn('type', '单据类型'), + DsColumn('prefix', '前缀'), + DsColumn('date', '日期格式'), + DsColumn('example', '下一编号示例'), + DsColumn('no', '当前序号', numeric: true), + DsColumn('actions', '操作', action: true), + ], + rows: rules.map((r) { + return DsRow(cells: [ + Text(r.typeLabel, + style: + TextStyle(fontWeight: FontWeight.w600, color: t.heading)), + Text(r.prefix, + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text(r.dateFormat, + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: AppDims.fsSm, + color: t.muted)), + Text(r.exampleNo, + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + Text('${r.currentNo}', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + WriteGuard( + child: InkWell( + onTap: () => _editRule(r), + child: Icon(LucideIcons.pencil, size: 16, color: t.muted), + ), + ), + ]); + }).toList(), + ), + ), + ); + } + + void _editRule(NumberRule r) { + final prefixCtrl = TextEditingController(text: r.prefix); + final noCtrl = TextEditingController(text: '${r.currentNo}'); + showAppDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('编辑规则 · ${r.typeLabel}'), + content: SizedBox( + width: ctx.dialogWidth(360), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('前缀', + style: TextStyle( + fontSize: AppDims.fsSm, color: ctx.tokens.muted)), + const SizedBox(height: 6), + DsInput(controller: prefixCtrl), + const SizedBox(height: 14), + Text('当前序号', + style: TextStyle( + fontSize: AppDims.fsSm, color: ctx.tokens.muted)), + const SizedBox(height: 6), + DsInput(controller: noCtrl, keyboardType: TextInputType.number), + ], + ), + ), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop()), + DsButton('保存', variant: DsBtnVariant.primary, onPressed: () async { + Navigator.of(ctx).pop(); + try { + await ref.read(numberRuleListProvider.notifier).updateRule(r.id, { + 'prefix': prefixCtrl.text.trim(), + 'current_no': int.tryParse(noCtrl.text) ?? r.currentNo, + }); + if (mounted) { + showDsToast(context, '规则已更新 ✓', bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); + } + } + }), ], ), ); } } - -// ── 外观主题选择 ────────────────────────────────────────── -class _ThemePickerCard extends ConsumerWidget { - const _ThemePickerCard(); - - // (key, 名称, 说明) - static const List<(String, String, String)> _themes = [ - ('a', '经典蓝', '浅色 · 默认'), - ('b', '琥珀', '深色'), - ('c', '酒窖', '暖色'), - ]; - - @override - Widget build(BuildContext context, WidgetRef ref) { - final current = ref.watch(themeControllerProvider); - return Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('外观主题', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const SizedBox(height: 4), - Text('切换配色方案，立即生效并记住选择', - style: TextStyle(fontSize: 13, color: context.tokens.muted)), - const SizedBox(height: 16), - Wrap( - spacing: 12, - runSpacing: 12, - children: [ - for (final (key, name, desc) in _themes) - _ThemeSwatch( - preview: appTokensOf(key), - name: name, - desc: desc, - selected: current == key, - onTap: () => - ref.read(themeControllerProvider.notifier).set(key), - ), - ], - ), - ], - ), - ), - ); - } -} - -class _ThemeSwatch extends StatelessWidget { - final AppTokens preview; - final String name; +/// 原型右侧 .card：surface / 1px border / r-lg / padding 22 24 / mb18； +/// h2 17 heading + desc 12 muted（可带右上角按钮）。 +class _SettingsCard extends StatelessWidget { + final String title; final String desc; - final bool selected; - final VoidCallback onTap; - const _ThemeSwatch({ - required this.preview, - required this.name, - required this.desc, - required this.selected, - required this.onTap, - }); + final Widget child; + final Widget? trailing; + const _SettingsCard( + {required this.title, + required this.desc, + required this.child, + this.trailing}); @override Widget build(BuildContext context) { - return InkWell( - borderRadius: BorderRadius.circular(10), - onTap: onTap, - child: Container( - width: 150, - padding: const EdgeInsets.all(10), - decoration: BoxDecoration( - color: context.tokens.surface, - border: Border.all( - color: selected ? context.tokens.primary : context.tokens.border, - width: selected ? 2 : 1, - ), - borderRadius: BorderRadius.circular(10), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // 微缩预览：用该主题真实 token 渲染一小块 chrome - Container( - height: 46, - padding: const EdgeInsets.all(6), - decoration: BoxDecoration( - color: preview.page, - borderRadius: BorderRadius.circular(6), - border: Border.all(color: preview.border), - ), - child: Row( + final t = context.tokens; + return Container( + margin: const EdgeInsets.only(bottom: 18), + padding: const EdgeInsets.fromLTRB(24, 22, 24, 22), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Row(children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - width: 22, - height: 34, - decoration: BoxDecoration( - color: preview.surface, - borderRadius: BorderRadius.circular(3), - border: Border.all(color: preview.border), - ), - ), - const SizedBox(width: 6), - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 36, - height: 6, - decoration: BoxDecoration( - color: preview.primary, - borderRadius: BorderRadius.circular(3))), - const SizedBox(height: 5), - Container( - width: 24, - height: 5, - decoration: BoxDecoration( - color: preview.muted, - borderRadius: BorderRadius.circular(3))), - ], - ), - ), + Text(title, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(height: 3), + Text(desc, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), ], ), ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(name, - style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w600)), - Text(desc, - style: TextStyle( - fontSize: 11, color: context.tokens.muted)), - ], - ), - ), - if (selected) - Icon(Icons.check_circle, - size: 18, color: context.tokens.primary), - ], - ), - ], - ), - ), - ); - } -} - -// ── 门店 Logo 预览 ──────────────────────────────────────── -class _ShopLogoPreview extends StatelessWidget { - final String logoUrl; - final String shopName; - final double size; - const _ShopLogoPreview({required this.logoUrl, required this.shopName, this.size = 64}); - - @override - Widget build(BuildContext context) { - final radius = BorderRadius.circular(size * 0.19); - if (logoUrl.isNotEmpty) { - final fullUrl = logoUrl.startsWith('http') ? logoUrl : '${AppConfig.apiBaseUrl.replaceAll('/api/v1', '')}$logoUrl'; - return ClipRRect( - borderRadius: radius, - child: Image.network( - fullUrl, - width: size, - height: size, - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => _initial(radius), - ), - ); - } - return _initial(radius); - } - - Widget _initial(BorderRadius radius) { - final initial = shopName.isNotEmpty ? shopName.characters.first : '店'; - return Container( - width: size, - height: size, - decoration: BoxDecoration( - color: const Color(0xFF0F3057), - borderRadius: radius, - ), - alignment: Alignment.center, - child: Text( - initial, - style: TextStyle( - color: Colors.white, - fontSize: size * 0.5, - fontWeight: FontWeight.w600, - ), - ), - ); - } -} - -// ── 酒行信息行 ──────────────────────────────────────────── -class _ShopInfoRow extends StatelessWidget { - final String label; - final String value; - const _ShopInfoRow({required this.label, required this.value}); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 6), - child: Row( - children: [ - SizedBox( - width: 88, - child: Text(label, - style: TextStyle( - fontSize: 14, color: context.tokens.muted)), - ), - Expanded( - child: Text(value, - style: const TextStyle( - fontSize: 14, fontWeight: FontWeight.w500)), - ), + if (trailing != null) trailing!, + ]), + const SizedBox(height: 16), + child, ], ), ); } } -// ── 编辑酒行信息弹窗 ───────────────────────────────────── -class _ShopEditDialog extends ConsumerStatefulWidget { - final ShopInfo shop; - final VoidCallback onSaved; - const _ShopEditDialog({required this.shop, required this.onSaved}); +// ── 面板 1：门店信息（内联表单）────────────────────────────── +class _StoreInfoPanel extends ConsumerStatefulWidget { + const _StoreInfoPanel(); @override - ConsumerState<_ShopEditDialog> createState() => _ShopEditDialogState(); + ConsumerState<_StoreInfoPanel> createState() => _StoreInfoPanelState(); } -class _ShopEditDialogState extends ConsumerState<_ShopEditDialog> { - late final TextEditingController _nameCtrl; - late final TextEditingController _addressCtrl; - late final TextEditingController _phoneCtrl; - late final TextEditingController _managerCtrl; - late final TextEditingController _wechatCtrl; +class _StoreInfoPanelState extends ConsumerState<_StoreInfoPanel> { + final _nameCtrl = TextEditingController(); + final _phoneCtrl = TextEditingController(); + final _wechatCtrl = TextEditingController(); + final _addressCtrl = TextEditingController(); + ShopInfo? _loaded; bool _saving = false; bool _uploadingLogo = false; - @override - void initState() { - super.initState(); - _nameCtrl = TextEditingController(text: widget.shop.name); - _addressCtrl = TextEditingController(text: widget.shop.address); - _phoneCtrl = TextEditingController(text: widget.shop.phone); - _managerCtrl = TextEditingController(text: widget.shop.managerName); - _wechatCtrl = TextEditingController(text: widget.shop.wechatId); - } - @override void dispose() { _nameCtrl.dispose(); - _addressCtrl.dispose(); _phoneCtrl.dispose(); - _managerCtrl.dispose(); _wechatCtrl.dispose(); + _addressCtrl.dispose(); super.dispose(); } - Future _uploadLogo() async { - final result = await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['jpg', 'jpeg', 'png'], - withData: true, - ); - if (result == null || result.files.isEmpty) return; - final file = result.files.first; - if (file.bytes == null) return; - setState(() => _uploadingLogo = true); - try { - await ref.read(shopRepositoryProvider).uploadLogo(file.bytes!, file.name); - ref.invalidate(shopInfoProvider); - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('Logo 已更新'), - backgroundColor: context.tokens.success, - )); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('上传失败：$e'), - backgroundColor: context.tokens.danger, - )); - } - } finally { - if (mounted) setState(() => _uploadingLogo = false); - } + void _fill(ShopInfo shop) { + _loaded = shop; + _nameCtrl.text = shop.name; + _phoneCtrl.text = shop.phone; + _wechatCtrl.text = shop.wechatId; + _addressCtrl.text = shop.address; } Future _save() async { + final shop = _loaded; + if (shop == null) return; setState(() => _saving = true); try { await ref.read(shopRepositoryProvider).updateInfo({ 'name': _nameCtrl.text.trim(), 'address': _addressCtrl.text.trim(), 'phone': _phoneCtrl.text.trim(), - 'manager_name': _managerCtrl.text.trim(), + 'manager_name': shop.managerName, 'wechat_id': _wechatCtrl.text.trim(), + if (shop.logoUrl.isNotEmpty) 'logo_url': shop.logoUrl, + 'custom_fields': shop.customFields, }); + ref.invalidate(shopInfoProvider); if (mounted) { - Navigator.of(context).pop(); - widget.onSaved(); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('信息已更新'), - backgroundColor: context.tokens.success, - )); + showDsToast(context, '门店信息已保存 ✓', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('保存失败：$e'), - backgroundColor: context.tokens.danger, - )); + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _saving = false); } } + Future _uploadLogo() async { + final result = await FilePicker.platform.pickFiles( + type: FileType.image, + withData: true, + ); + final file = result?.files.firstOrNull; + if (file == null || file.bytes == null || !mounted) return; + setState(() => _uploadingLogo = true); + try { + await ref.read(shopRepositoryProvider).uploadLogo(file.bytes!, file.name); + ref.invalidate(shopInfoProvider); + if (mounted) { + showDsToast(context, 'Logo 已更新 ✓', bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '上传失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _uploadingLogo = false); + } + } + @override Widget build(BuildContext context) { - return AlertDialog( - title: const Text('编辑酒行信息'), - content: SizedBox( - width: context.dialogWidth(400), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - // Logo 上传行 - Row( + final t = context.tokens; + final async = ref.watch(shopInfoProvider); + final role = ref.watch(authStateProvider.select((s) => s.user?.role)); + final canEdit = (role == 'admin' || role == 'superadmin') && + !WriteGuard.isReadonly(ref) && + // 授权过期 >7 天同样禁编辑（后端 LicenseGuard 会 403，这里不误导） + !WriteGuard.licenseBlocked(ref); + + return _SettingsCard( + title: '门店信息', + desc: '用于单据抬头、对账与多端展示', + child: async.when( + loading: () => const Padding( + padding: EdgeInsets.all(24), + child: Center(child: CircularProgressIndicator())), + error: (e, _) => Text('加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + data: (shop) { + if (_loaded?.code != shop.code || _loaded?.name != shop.name) { + _fill(shop); + } + return ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 620), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - _ShopLogoPreview( - logoUrl: ref.watch(shopInfoProvider).valueOrNull?.logoUrl ?? widget.shop.logoUrl, - shopName: _nameCtrl.text, - size: 56, - ), - const SizedBox(width: 12), - OutlinedButton.icon( - onPressed: _uploadingLogo ? null : _uploadLogo, - icon: _uploadingLogo - ? const SizedBox(width: 14, height: 14, child: CircularProgressIndicator(strokeWidth: 2)) - : const Icon(Icons.upload_outlined, size: 16), - label: const Text('更换 Logo'), - ), + // 原型 .form-grid 2 列 gap16 + _formRow([ + _field( + '门店名称', DsInput(controller: _nameCtrl, enabled: canEdit)), + _field( + '门店编号', + DsInput( + controller: TextEditingController(text: shop.code), + enabled: false), + hint: '系统分配，不可修改', + ), + ]), + _formRow([ + _field('联系电话', + DsInput(controller: _phoneCtrl, enabled: canEdit)), + _field( + '微信', + DsInput( + controller: _wechatCtrl, + enabled: canEdit, + hintText: '微信号 / 客服微信')), + ]), + _field( + '门店地址', + DsInput( + controller: _addressCtrl, + enabled: canEdit, + hintText: '省 / 市 / 详细地址')), + const SizedBox(height: 14), + // Logo（现有能力保留） + Row(children: [ + Container( + width: 46, + height: 46, + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: shop.logoUrl.isNotEmpty + ? Image.network(shop.logoUrl, + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => + Icon(LucideIcons.image, color: t.faint)) + : Icon(LucideIcons.image, size: 18, color: t.faint), + ), + const SizedBox(width: 12), + if (canEdit) + DsButton(_uploadingLogo ? '上传中…' : '更换 Logo', + small: true, + icon: LucideIcons.upload, + onPressed: _uploadingLogo ? null : _uploadLogo), + ]), + const SizedBox(height: 18), + if (canEdit) + Row(children: [ + DsButton(_saving ? '保存中…' : '保存', + variant: DsBtnVariant.primary, + onPressed: _saving ? null : _save), + const SizedBox(width: 10), + DsButton('撤销', onPressed: () { + _fill(shop); + setState(() {}); + showDsToast(context, '已撤销修改'); + }), + ]), ], ), - const SizedBox(height: 16), - TextField( - controller: _nameCtrl, - decoration: const InputDecoration(labelText: '门店名称'), - ), - const SizedBox(height: 12), - TextField( - controller: _addressCtrl, - decoration: const InputDecoration(labelText: '门店地址'), - ), - const SizedBox(height: 12), - TextField( - controller: _phoneCtrl, - decoration: const InputDecoration(labelText: '联系电话'), - ), - const SizedBox(height: 12), - TextField( - controller: _managerCtrl, - decoration: const InputDecoration(labelText: '负责人'), - ), - const SizedBox(height: 12), - TextField( - controller: _wechatCtrl, - decoration: const InputDecoration( - labelText: '微信号（可选）', - hintText: '填写后顾客扫码可查看', - ), - ), + ); + }, + ), + ); + } + + Widget _formRow(List fields) => Padding( + padding: const EdgeInsets.only(bottom: 14), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (var i = 0; i < fields.length; i++) ...[ + if (i > 0) const SizedBox(width: 16), + Expanded(child: fields[i]), + ], ], ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: _saving ? null : _save, - child: _saving - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('保存'), - ), + ); + + Widget _field(String label, Widget input, {String? hint}) { + final t = context.tokens; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 6), + input, + if (hint != null) + Padding( + padding: const EdgeInsets.only(top: 4), + child: Row(children: [ + // 原型 i-ic03 = lock（系统分配，不可修改） + Icon(LucideIcons.lock, size: 12, color: t.faint), + const SizedBox(width: 4), + Text(hint, + style: TextStyle(fontSize: AppDims.fsXs, color: t.faint)), + ]), + ), ], ); } } + +// ── 面板 4：授权兑换券 ─────────────────────────────────────── +class _LicensePanel extends ConsumerStatefulWidget { + const _LicensePanel(); + + @override + ConsumerState<_LicensePanel> createState() => _LicensePanelState(); +} + +class _LicensePanelState extends ConsumerState<_LicensePanel> { + final _voucherCtrl = TextEditingController(); + bool _redeeming = false; + + @override + void dispose() { + _voucherCtrl.dispose(); + super.dispose(); + } + + Future _redeem() async { + final code = _voucherCtrl.text.trim(); + if (code.isEmpty) { + showDsToast(context, '请输入兑换券短码'); + return; + } + setState(() => _redeeming = true); + try { + await ref.read(licenseRepositoryProvider).activate(code); + ref.invalidate(licenseProvider); + _voucherCtrl.clear(); + if (mounted) { + showDsToast(context, '兑换成功，已续期 ✓', bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '兑换失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _redeeming = false); + } + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final lic = ref.watch(licenseProvider).valueOrNull; + final expires = lic?.expiresAt != null + ? DateFormat('yyyy-MM-dd').format(lic!.expiresAt!) + : '—'; + // 剩余天数走可注入时钟（golden 确定化），不用 model 内的 DateTime.now() + final days = lic?.expiresAt != null + ? lic!.expiresAt!.difference(appNow()).inDays.clamp(0, 99999) + : null; + + return _SettingsCard( + title: '授权兑换券', + desc: '本系统以「时长兑换券」授权，输入兑换券短码即可续期，无需订阅', + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // 原型 .lic 统计条：bg 底 / border / r-md / pad 18 20 + Container( + padding: const EdgeInsets.fromLTRB(20, 18, 20, 18), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + _stat(t, '授权到期日', expires), + const SizedBox(width: 24), + _stat(t, '剩余天数', days != null ? '剩余 $days 天' : '—', warn: true), + const Spacer(), + Container( + width: 46, + height: 46, + decoration: BoxDecoration( + color: t.okSoft, + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: + Icon(LucideIcons.shieldCheck, size: 22, color: t.success), + ), + ]), + ), + const SizedBox(height: 16), + // 兑换（原型 .redeem：input + 按钮，max 520） + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 520), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('兑换券短码', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 6), + DsInput( + controller: _voucherCtrl, + hintText: '输入兑换券短码', + ), + ], + ), + ), + const SizedBox(width: 10), + WriteGuard( + child: DsButton(_redeeming ? '兑换中…' : '兑换续期', + variant: DsBtnVariant.primary, + onPressed: _redeeming ? null : _redeem), + ), + ], + ), + ), + const SizedBox(height: 14), + Row(children: [ + Text('没有兑换券？', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + InkWell( + onTap: () => launchUrl(Uri.parse('${AppInfo.website}/#pricing')), + child: Text('购买授权时长 →', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.primary)), + ), + ]), + const SizedBox(height: 16), + // 过期降级说明（现有能力保留） + Container( + padding: const EdgeInsets.all(14), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.borderSubtle), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('到期后的降级规则', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.heading)), + const SizedBox(height: 6), + for (final note in LicenseCopy.degradationNotes()) + Padding( + padding: const EdgeInsets.only(top: 3), + child: Text('· $note', + style: + TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ], + ), + ), + ], + ), + ); + } + + Widget _stat(dynamic t, String label, String value, {bool warn = false}) => + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 4), + Text(value, + style: TextStyle( + fontSize: 24, + fontWeight: FontWeight.w700, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: warn ? t.warn : t.heading)), + ], + ); +} + +// ── 面板 5：偏好设置（主题三卡 + 默认仓库）─────────────────── +class _PrefPanel extends ConsumerWidget { + const _PrefPanel(); + + // (key, 名称, 说明)——原型 tcard 文案 + static const _themes = [ + ('a', 'A 经典蓝', '浅色 · 默认'), + ('b', 'B 琥珀', '深色'), + ('c', 'C 酒窖', '暖浅色'), + ]; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final t = context.tokens; + final current = ref.watch(themeControllerProvider); + final warehouses = ref.watch(warehouseListProvider).valueOrNull ?? const []; + final defaultWh = warehouses.where((w) => w.isDefault).firstOrNull; + + return _SettingsCard( + title: '偏好设置', + desc: '主题与默认值，仅影响当前账号在本端的体验', + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('主题选择', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 8), + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 620), + child: context.isMobile + ? Column(children: [ + for (final th in _themes) + Padding( + padding: const EdgeInsets.only(bottom: 10), + child: _tcard(context, ref, th, current == th.$1), + ), + ]) + : Row(children: [ + for (var i = 0; i < _themes.length; i++) ...[ + if (i > 0) const SizedBox(width: 14), + Expanded( + child: _tcard(context, ref, _themes[i], + current == _themes[i].$1)), + ], + ]), + ), + const SizedBox(height: 18), + Text('默认仓库', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 6), + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 300), + child: Builder( + builder: (bctx) => WriteGuard( + child: InkWell( + onTap: () async { + final v = await showDsMenu(bctx, items: [ + for (final w in warehouses) + DsMenuItem( + value: w.id, label: w.name, selected: w.isDefault), + ]); + if (v == null) return; + try { + await ref + .read(warehouseListProvider.notifier) + .updateWarehouse(v, {'is_default': true}); + if (bctx.mounted) { + showDsToast(bctx, '默认仓库已更新 ✓'); + } + } catch (e) { + if (bctx.mounted) { + showDsToast(bctx, '设置失败：$e'); + } + } + }, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 38, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + Expanded( + child: Text(defaultWh?.name ?? '选择默认仓库…', + style: TextStyle( + fontSize: AppDims.fsBody, + color: + defaultWh != null ? t.text : t.faint))), + Icon(LucideIcons.chevronDown, size: 14, color: t.faint), + ]), + ), + ), + ), + ), + ), + ], + ), + ); + } + + /// 原型 .tcard：1.5px 边 r-lg pad14；选中 primary 边 + brand50 ring； + /// swatch 高 54 四色等分（primary/primary-dark/bg/accent）+ 名称/说明 + 勾。 + Widget _tcard(BuildContext context, WidgetRef ref, + (String, String, String) theme, bool on) { + final t = context.tokens; + final preview = appTokensOf(theme.$1); + return InkWell( + onTap: () { + ref.read(themeControllerProvider.notifier).set(theme.$1); + showDsToast(context, '已切换为 ${theme.$2} 主题'); + }, + borderRadius: BorderRadius.circular(AppDims.rLg), + child: Container( + padding: const EdgeInsets.all(14), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: on ? t.primary : t.border, width: 1.5), + borderRadius: BorderRadius.circular(AppDims.rLg), + boxShadow: on ? [BoxShadow(color: t.brand50, spreadRadius: 3)] : null, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // .swatch 高54 四色等分 + ClipRRect( + borderRadius: BorderRadius.circular(AppDims.rSm), + child: SizedBox( + height: 54, + child: Row(children: [ + Expanded(child: Container(color: preview.primary)), + Expanded(child: Container(color: preview.primaryDark)), + Expanded(child: Container(color: preview.page)), + Expanded(child: Container(color: preview.accent)), + ]), + ), + ), + const SizedBox(height: 8), + Row(children: [ + Expanded( + child: Text(theme.$2, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.heading)), + ), + if (on) Icon(LucideIcons.check, size: 14, color: t.primary), + ]), + Text(theme.$3, + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted)), + ], + ), + ), + ); + } +} diff --git a/client/lib/screens/settings/users_screen.dart b/client/lib/screens/settings/users_screen.dart new file mode 100644 index 0000000..4f6feef --- /dev/null +++ b/client/lib/screens/settings/users_screen.dart @@ -0,0 +1,657 @@ +// screens/settings/users_screen.dart — 用户管理独立页（照原型 users.html 重建）。 +// head + KPI 4 卡（无图标）+ toolbar（搜索 + 角色筛选）+ 表格（头像/角色徽章/ +// 启停）+ 新增/编辑弹窗（角色 2×2 单选卡 + 状态开关 + 重置密码）。 +// 角色口径按后端四级：superadmin/admin/operator/readonly（原型三处不一致已拉平）。 +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/utils/clock.dart'; +import '../../core/utils/dialog_util.dart'; +import '../../models/user.dart'; +import '../../providers/user_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_kpi.dart'; +import '../../widgets/ds/ds_menu.dart'; +import '../../widgets/ds/ds_table.dart'; +import '../../widgets/mobile_list_card.dart'; +import '../../widgets/write_guard.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; + +/// 角色徽章（atoms 对色：超管=danger / 管理员=info / 操作员=ok / 只读=warn）。 +DsBadge userRoleBadge(String role) { + final label = switch (role) { + 'superadmin' => '超级管理员', + 'admin' => '管理员', + 'operator' => '操作员', + 'readonly' => '只读', + _ => role, + }; + final tone = switch (role) { + 'superadmin' => DsBadgeTone.danger, + 'admin' => DsBadgeTone.info, + 'operator' => DsBadgeTone.ok, + 'readonly' => DsBadgeTone.warn, + _ => DsBadgeTone.muted, + }; + return DsBadge(label, tone: tone); +} + +/// 状态徽章（b-启用=success / b-停用=border-subtle/muted）。 +DsBadge userStatusBadge(bool active) => active + ? const DsBadge('启用', tone: DsBadgeTone.ok) + : const DsBadge('停用', tone: DsBadgeTone.muted); + +class UsersScreen extends ConsumerStatefulWidget { + const UsersScreen({super.key}); + + @override + ConsumerState createState() => _UsersScreenState(); +} + +class _UsersScreenState extends ConsumerState { + final _searchCtrl = TextEditingController(); + String _roleFilter = '全部角色'; + + static const _roleFilters = ['全部角色', '超级管理员', '管理员', '操作员', '只读']; + + @override + void dispose() { + _searchCtrl.dispose(); + super.dispose(); + } + + void _snack(String msg, {bool err = false}) { + showDsToast(context, msg, + bg: err ? context.tokens.danger : context.tokens.success); + } + + /// 原型最近登录：今天 HH:mm / 昨天 HH:mm / MM-DD HH:mm / — + String _fmtLast(String? iso) { + if (iso == null || iso.isEmpty) return '—'; + final d = DateTime.tryParse(iso)?.toLocal(); + if (d == null) return '—'; + final now = appNow(); + final today = DateTime(now.year, now.month, now.day); + final day = DateTime(d.year, d.month, d.day); + final hm = DateFormat('HH:mm').format(d); + if (day == today) return '今天 $hm'; + if (day == today.subtract(const Duration(days: 1))) return '昨天 $hm'; + return '${DateFormat('MM-dd').format(d)} $hm'; + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + final async = ref.watch(userListProvider); + + return async.when( + loading: () => const Center(child: CircularProgressIndicator()), + error: (e, _) => Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(LucideIcons.cloudOff, size: 40, color: t.muted), + const SizedBox(height: 12), + Text('暂无数据，网络不可用', style: TextStyle(color: t.muted)), + const SizedBox(height: 12), + DsButton('重试', + variant: DsBtnVariant.primary, + onPressed: () => ref.read(userListProvider.notifier).reload()), + ], + ), + ), + data: (users) { + final kw = _searchCtrl.text.trim().toLowerCase(); + final filtered = users.where((u) { + if (_roleFilter != '全部角色' && u.roleLabel != _roleFilter) { + return false; + } + if (kw.isEmpty) return true; + return (u.realName ?? '').toLowerCase().contains(kw) || + u.username.toLowerCase().contains(kw); + }).toList(); + + return Container( + color: t.bg, + padding: mobile + ? EdgeInsets.zero + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // ── 头部 ── + Padding( + padding: mobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text('用户管理', + style: TextStyle( + fontSize: AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.heading)), + const SizedBox(width: AppDims.sp3), + Padding( + padding: const EdgeInsets.only(bottom: 2), + child: Text('门店成员与权限角色', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.muted)), + ), + const Spacer(), + if (!mobile) + WriteGuard( + child: DsButton('新增用户', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => _openUser()), + ), + ], + ), + ), + // ── KPI 4 卡（原型无图标无环比，.v 26/700/mono）── + Padding( + padding: mobile + ? const EdgeInsets.fromLTRB(AppDims.sp4, 0, AppDims.sp4, 12) + : const EdgeInsets.only(bottom: 18), + child: _kpis(users, mobile), + ), + // ── 表格（toolbar 内嵌搜索 + 角色筛选）── + Expanded( + child: DsTable( + pagerInfoText: '共 ${filtered.length} 名成员', + emptyText: '没有匹配的成员', + toolbar: _toolbar(mobile), + mobileCards: filtered.map(_userCard).toList(), + columns: const [ + DsColumn('user', '用户'), + DsColumn('role', '角色'), + DsColumn('status', '状态'), + DsColumn('last', '最近登录'), + DsColumn('actions', '操作', action: true), + ], + rows: filtered.map((u) { + return DsRow( + onTap: () => _openUser(u), + cells: [ + _userCell(u), + userRoleBadge(u.role), + userStatusBadge(u.isActive), + Text(_fmtLast(u.lastLoginAt), + style: TextStyle( + fontSize: AppDims.fsSm, color: t.muted)), + WriteGuard( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + WriteGuard( + child: _iconBtn(LucideIcons.pencil, '编辑', + () => _openUser(u)), + ), + const SizedBox(width: 8), + WriteGuard( + child: _iconBtn( + u.isActive + ? LucideIcons.userX + : LucideIcons.userCheck, + u.isActive ? '停用' : '启用', + () => _toggleActive(u)), + ), + ], + ), + ), + ], + ); + }).toList(), + ), + ), + ], + ), + ); + }, + ); + } + + Widget _kpis(List users, bool mobile) { + final total = users.length; + final active = users.where((u) => u.isActive).length; + final admins = + users.where((u) => u.role == 'admin' || u.role == 'superadmin').length; + final readonly = users.where((u) => u.role == 'readonly').length; + final cards = [ + DsKpi(title: '成员总数', value: '$total'), + DsKpi(title: '启用中', value: '$active'), + DsKpi(title: '管理员', value: '$admins'), + DsKpi(title: '只读账号', value: '$readonly'), + ]; + if (mobile) { + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: IntrinsicHeight( + child: Row(children: [ + for (var i = 0; i < cards.length; i++) ...[ + if (i > 0) const SizedBox(width: AppDims.sp3), + SizedBox(width: 140, child: cards[i]), + ], + ]), + ), + ); + } + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var i = 0; i < cards.length; i++) ...[ + if (i > 0) const SizedBox(width: 14), + Expanded(child: cards[i]), + ], + ], + ), + ); + } + + Widget _toolbar(bool mobile) { + final search = DsSearchBox( + controller: _searchCtrl, + hint: '搜索姓名 / 账号', + width: mobile ? null : 300, + onChanged: (_) => setState(() {}), + ); + final roleChip = DsChip( + label: '角色', + value: _roleFilter == '全部角色' ? null : _roleFilter, + onTap: () async { + final v = await showDsMenu(context, items: [ + for (final r in _roleFilters) + DsMenuItem(value: r, label: r, selected: r == _roleFilter), + ]); + if (v != null) setState(() => _roleFilter = v); + }, + onClear: () => setState(() => _roleFilter = '全部角色'), + ); + if (mobile) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + search, + const SizedBox(height: AppDims.sp2), + Row(children: [ + roleChip, + const Spacer(), + WriteGuard( + child: DsButton('新增', + small: true, + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + onPressed: () => _openUser()), + ), + ]), + ], + ); + } + return Row(children: [search, const Spacer(), roleChip]); + } + + /// 原型 .uname：34×34 圆头像（brand50/primary 首字）+ 姓名 + 账号 mono。 + Widget _userCell(AppUser u) { + final t = context.tokens; + final name = u.realName?.isNotEmpty == true ? u.realName! : u.username; + return Row(mainAxisSize: MainAxisSize.min, children: [ + Container( + width: 34, + height: 34, + alignment: Alignment.center, + decoration: BoxDecoration(color: t.brand50, shape: BoxShape.circle), + child: Text(name.characters.first, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w700, + color: t.primary)), + ), + const SizedBox(width: 11), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(name, + style: TextStyle(fontWeight: FontWeight.w600, color: t.heading)), + Text(u.username, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.muted, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ], + ), + ]); + } + + Widget _iconBtn(IconData icon, String tip, VoidCallback onTap) { + final t = context.tokens; + return Tooltip( + message: tip, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Padding( + padding: const EdgeInsets.all(2), + child: Icon(icon, size: 16, color: t.muted), + ), + ), + ); + } + + Widget _userCard(AppUser u) { + return MobileListCard( + title: Text(u.realName?.isNotEmpty == true ? u.realName! : u.username), + subtitle: Text(u.username), + trailing: userRoleBadge(u.role), + fields: [ + MobileCardField('状态', u.isActive ? '启用' : '停用'), + MobileCardField('最近登录', _fmtLast(u.lastLoginAt)), + ], + onTap: () => _openUser(u), + ); + } + + Future _toggleActive(AppUser u) async { + try { + await ref + .read(userListProvider.notifier) + .updateUser(u.id, {'is_active': !u.isActive}); + if (mounted) + _snack(u.isActive ? '已停用 · ${u.username}' : '已启用 · ${u.username}'); + } catch (e) { + if (mounted) _snack('操作失败：$e', err: true); + } + } + + void _openUser([AppUser? user]) { + showAppDialog( + context: context, + builder: (ctx) => _UserFormDialog( + user: user, + onSaved: () => ref.read(userListProvider.notifier).reload(), + ), + ); + } +} + +// ── 新增/编辑用户弹窗（原型 #ov：mgrid 2 列 + 角色 2×2 rcard + 状态 switch）── +class _UserFormDialog extends ConsumerStatefulWidget { + final AppUser? user; + final VoidCallback onSaved; + const _UserFormDialog({this.user, required this.onSaved}); + + @override + ConsumerState<_UserFormDialog> createState() => _UserFormDialogState(); +} + +class _UserFormDialogState extends ConsumerState<_UserFormDialog> { + final _formKey = GlobalKey(); + late final TextEditingController _nameCtrl; + late final TextEditingController _userCtrl; + final _passCtrl = TextEditingController(); + late String _role = widget.user?.role ?? 'operator'; + late bool _active = widget.user?.isActive ?? true; + bool _saving = false; + + // 原型 .rcard 四级角色 + 描述 + static const _roles = [ + ('superadmin', '超级管理员', '最高权限 · 含系统参数与数据管理'), + ('admin', '管理员', '全部业务权限 + 用户与授权管理'), + ('operator', '操作员', '日常入库出库与查询'), + ('readonly', '只读', '仅查看，禁所有写操作'), + ]; + + @override + void initState() { + super.initState(); + _nameCtrl = TextEditingController(text: widget.user?.realName ?? ''); + _userCtrl = TextEditingController(text: widget.user?.username ?? ''); + } + + @override + void dispose() { + _nameCtrl.dispose(); + _userCtrl.dispose(); + _passCtrl.dispose(); + super.dispose(); + } + + Future _save() async { + if (!_formKey.currentState!.validate()) return; + setState(() => _saving = true); + final isEdit = widget.user != null; + final data = { + 'real_name': _nameCtrl.text.trim(), + 'username': _userCtrl.text.trim(), + 'role': _role, + 'is_active': _active, + if (!isEdit) 'password': _passCtrl.text, + }; + try { + final notifier = ref.read(userListProvider.notifier); + if (isEdit) { + await notifier.updateUser(widget.user!.id, data); + } else { + await notifier.createUser(data); + } + if (mounted) { + Navigator.of(context).pop(); + widget.onSaved(); + showDsToast(context, isEdit ? '用户已更新 ✓' : '用户已创建 ✓', + bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _saving = false); + } + } + + Future _resetPassword() async { + final ctrl = TextEditingController(); + final ok = await showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('重置密码 · ${widget.user!.username}'), + content: SizedBox( + width: ctx.dialogWidth(320), + child: DsField('新密码', + input: TextField( + controller: ctrl, + obscureText: true, + decoration: const InputDecoration(hintText: '至少 8 位'), + )), + ), + actions: [ + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('重置', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop(true)), + ], + ), + ); + if (ok != true || !mounted) return; + if (ctrl.text.length < 8) { + showDsToast(context, '密码至少 8 位'); + return; + } + try { + await ref + .read(userListProvider.notifier) + .resetPassword(widget.user!.id, ctrl.text); + if (mounted) { + showDsToast(context, '密码已重置 ✓', bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '重置失败：$e', bg: context.tokens.danger); + } + } + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final isEdit = widget.user != null; + return Dialog( + child: Container( + width: context.dialogWidth(520), + padding: const EdgeInsets.all(22), + child: Form( + key: _formKey, + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(isEdit ? '编辑用户' : '新增用户', + style: const TextStyle( + fontSize: 18, fontWeight: FontWeight.w600)), + const SizedBox(height: 18), + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded( + child: DsField('姓名', + required: true, + input: TextFormField( + controller: _nameCtrl, + decoration: const InputDecoration(hintText: '例如 李采购'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '不能为空' : null, + )), + ), + const SizedBox(width: 14), + Expanded( + child: DsField('登录账号', + required: true, + input: TextFormField( + controller: _userCtrl, + decoration: + const InputDecoration(hintText: '字母 / 数字'), + validator: (v) => + (v == null || v.trim().isEmpty) ? '不能为空' : null, + )), + ), + ]), + if (!isEdit) ...[ + const SizedBox(height: 14), + DsField('初始密码', + required: true, + input: TextFormField( + controller: _passCtrl, + obscureText: true, + decoration: + const InputDecoration(hintText: '至少 8 位，成员首次登录可改'), + validator: (v) => + (v == null || v.length < 8) ? '至少 8 位' : null, + )), + ], + const SizedBox(height: 16), + Text('角色', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 8), + // 原型 .roles 2×2 单选卡 + Column(children: [ + for (var row = 0; row < 2; row++) + Padding( + padding: EdgeInsets.only(bottom: row == 0 ? 10 : 0), + child: Row(children: [ + for (var col = 0; col < 2; col++) ...[ + if (col > 0) const SizedBox(width: 10), + Expanded(child: _roleCard(_roles[row * 2 + col])), + ], + ]), + ), + ]), + const SizedBox(height: 16), + Row(children: [ + Text('账号状态', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(width: 12), + Switch( + value: _active, + onChanged: (v) => setState(() => _active = v), + ), + Text(_active ? '启用' : '停用', + style: + TextStyle(fontSize: AppDims.fsBody, color: t.text)), + ]), + const SizedBox(height: 20), + Row(children: [ + if (isEdit) + TextButton( + onPressed: _resetPassword, + child: const Text('重置密码'), + ), + const Spacer(), + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text('取消'), + ), + const SizedBox(width: 8), + ElevatedButton( + onPressed: _saving ? null : _save, + child: _saving + ? const SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: + Colors.white)) // ds-ignore: primary 底白字加载圈 + : const Text('保存'), + ), + ]), + ], + ), + ), + ), + ), + ); + } + + /// 原型 .rcard：1.5px 边 r-md pad 12；选中 primary 边 + brand50 ring。 + Widget _roleCard((String, String, String) role) { + final t = context.tokens; + final on = _role == role.$1; + return InkWell( + onTap: () => setState(() => _role = role.$1), + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: on ? t.primary : t.border, width: 1.5), + borderRadius: BorderRadius.circular(AppDims.rMd), + boxShadow: on ? [BoxShadow(color: t.brand50, spreadRadius: 3)] : null, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(role.$2, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: on ? t.primary : t.heading)), + const SizedBox(height: 3), + Text(role.$3, + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted)), + ], + ), + ), + ); + } +} diff --git a/client/lib/screens/shared/order_form_shell.dart b/client/lib/screens/shared/order_form_shell.dart new file mode 100644 index 0000000..94142ab --- /dev/null +++ b/client/lib/screens/shared/order_form_shell.dart @@ -0,0 +1,963 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/app_tokens.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/utils/date_util.dart'; +import '../../widgets/wheel_date_picker.dart'; +import '../../core/theme/app_fonts.dart'; + +/// 录单页整体版式（对齐原型 stock-in.html：`.page-head` + `.form-wrap` + `.form-foot`）。 +/// +/// 出库 / 入库两屏共用此壳：固定顶部页头、可滚动的表单主区（提示条 + 单据信息 + +/// 商品明细）、固定底部合计栏。窄屏自动收窄内边距、页头/底栏动作切到 [mobileActions]。 +class OrderFormShell extends StatelessWidget { + final String title; + final Widget? statusBadge; + final VoidCallback onBack; + + /// 桌面页头 / 底栏动作（同一组按钮两处呈现，对齐原型 desk 组）。 + final List deskActions; + + /// 窄屏页头动作（主操作 + 溢出菜单）。 + final List mobileActions; + + final Widget? notice; + final Widget docHead; + final Widget detailHead; + final Widget detail; + final String rowsLabel; // 明细 N 行 + final String totalText; // 已格式化 ¥ + final bool loading; + + const OrderFormShell({ + super.key, + required this.title, + required this.onBack, + required this.deskActions, + required this.mobileActions, + required this.docHead, + required this.detailHead, + required this.detail, + required this.rowsLabel, + required this.totalText, + this.statusBadge, + this.notice, + this.loading = false, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + return Scaffold( + backgroundColor: t.bg, + body: Column( + children: [ + // ── 页头（.page-head）── + Padding( + padding: mobile + ? const EdgeInsets.fromLTRB(8, 13, 16, 10) + : const EdgeInsets.fromLTRB(18, 16, 26, 14), + child: Row( + children: [ + IconButton( + icon: Icon(LucideIcons.chevronLeft, size: 22, color: t.muted), + onPressed: onBack, + tooltip: '返回', + visualDensity: VisualDensity.compact, + ), + const SizedBox(width: 6), + Text(title, + style: TextStyle( + fontSize: mobile ? AppDims.fsH2 : AppDims.fsH1, + fontWeight: FontWeight.w700, + color: t.title)), + if (statusBadge != null) ...[ + const SizedBox(width: 12), + statusBadge!, + ], + const Spacer(), + if (mobile) + ...mobileActions + else + Wrap(spacing: 10, children: deskActions), + ], + ), + ), + // ── 表单主区（.form-wrap，可滚动）── + Expanded( + child: loading + ? const Center(child: CircularProgressIndicator()) + : SingleChildScrollView( + padding: mobile + ? const EdgeInsets.fromLTRB(16, 0, 16, 14) + : const EdgeInsets.fromLTRB(26, 0, 26, 18), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (notice != null) notice!, + docHead, + const SizedBox(height: 4), + detailHead, + detail, + ], + ), + ), + ), + // ── 底部合计栏（.form-foot）── + Container( + padding: mobile + ? const EdgeInsets.symmetric(horizontal: 16, vertical: 12) + : const EdgeInsets.symmetric(horizontal: 26, vertical: 13), + decoration: BoxDecoration( + color: t.surface, + border: Border(top: BorderSide(color: t.border)), + ), + child: Row( + children: [ + Text(rowsLabel, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const Spacer(), + Text('合计金额 ', + style: TextStyle(fontSize: AppDims.fsBody, color: t.muted)), + Text(totalText, + style: TextStyle( + fontSize: 24, + color: t.accent, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontWeight: FontWeight.w700, + letterSpacing: 0.3)), + if (!mobile) ...[ + const SizedBox(width: 16), + Wrap(spacing: 10, children: deskActions), + ], + ], + ), + ), + ], + ), + ); + } +} + +/// 单据信息卡（.dochead）：可折叠，标题行 + 收起态摘要 + 4 列字段网格 + 备注。 +class DocHeadCard extends StatefulWidget { + final List fields; // 4 个 DocField + final Widget remark; + final String summary; // 折叠态摘要（仓库 · 往来单位 · 日期） + const DocHeadCard({ + super.key, + required this.fields, + required this.remark, + required this.summary, + }); + + @override + State createState() => _DocHeadCardState(); +} + +class _DocHeadCardState extends State { + bool _folded = false; + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + return Container( + margin: const EdgeInsets.only(top: 0, bottom: 14), + padding: + EdgeInsets.symmetric(horizontal: 18, vertical: _folded ? 13 : 16), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Row( + children: [ + Text('单据信息', + style: TextStyle( + fontSize: AppDims.fsTitle, + fontWeight: FontWeight.w600, + color: t.heading)), + if (_folded) ...[ + const SizedBox(width: 18), + Expanded( + child: Text(widget.summary, + overflow: TextOverflow.ellipsis, + style: + TextStyle(fontSize: AppDims.fsBody, color: t.muted)), + ), + ] else + const Spacer(), + InkWell( + onTap: () => setState(() => _folded = !_folded), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 4, vertical: 2), + child: Row(mainAxisSize: MainAxisSize.min, children: [ + Text(_folded ? '展开' : '收起', + style: + TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(width: 5), + Icon( + _folded + ? LucideIcons.chevronDown + : LucideIcons.chevronUp, + size: 14, + color: t.muted), + ]), + ), + ), + ], + ), + if (!_folded) ...[ + const SizedBox(height: 14), + if (mobile) + Column( + children: [ + for (final f in widget.fields) + Padding( + padding: const EdgeInsets.only(bottom: 14), child: f), + ], + ) + else + LayoutBuilder(builder: (context, c) { + const gap = 14.0; + final w = (c.maxWidth - gap * 3) / 4; + return Wrap( + spacing: gap, + runSpacing: gap, + children: [ + for (final f in widget.fields) SizedBox(width: w, child: f), + ], + ); + }), + const SizedBox(height: 14), + widget.remark, + ], + ], + ), + ); + } +} + +/// 单据信息里单个字段（label + 必填星 + 控件），对齐 `.field`。 +class DocField extends StatelessWidget { + final String label; + final bool required; + final Widget child; + const DocField( + {super.key, + required this.label, + required this.child, + this.required = false}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row(children: [ + Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + if (required) + Text(' *', + style: TextStyle(fontSize: AppDims.fsSm, color: t.danger)), + ]), + const SizedBox(height: 6), + child, + ], + ); + } +} + +/// 只读值框（.ro-val）：入库员/出库员等只读展示。 +class RoValue extends StatelessWidget { + final String text; + const RoValue(this.text, {super.key}); + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Container( + height: 38, + alignment: Alignment.centerLeft, + padding: const EdgeInsets.symmetric(horizontal: 11), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.borderSubtle), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: + Text(text, style: TextStyle(fontSize: AppDims.fsBody, color: t.text)), + ); + } +} + +/// 明细区标题行（.detail-head）：标题 + 键盘提示 + 右侧动作。 +class DetailHead extends StatelessWidget { + final List actions; + const DetailHead({super.key, required this.actions}); + + static String modKey() => + (defaultTargetPlatform == TargetPlatform.macOS && !kIsWeb) ? '⌘' : 'Ctrl'; + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final mobile = context.isMobile; + final mod = modKey(); + return Padding( + padding: const EdgeInsets.only(bottom: 10), + child: Row( + children: [ + Text('商品明细', + style: TextStyle( + fontSize: AppDims.fsTitle, + fontWeight: FontWeight.w600, + color: t.heading)), + if (!mobile) ...[ + const SizedBox(width: 12), + Flexible( + child: Wrap( + crossAxisAlignment: WrapCrossAlignment.center, + spacing: 6, + children: [ + const _Kbd('Enter'), + _hintTxt(t, '下一格 · 末格自动加行 ·'), + _Kbd('$mod D'), + _hintTxt(t, '复制行 ·'), + _Kbd('$mod Enter'), + _hintTxt(t, '提交'), + ], + ), + ), + ], + const Spacer(), + ...actions, + ], + ), + ); + } + + Widget _hintTxt(AppTokens t, String s) => + Text(s, style: TextStyle(fontSize: AppDims.fsSm, color: t.faint)); +} + +class _Kbd extends StatelessWidget { + final String label; + const _Kbd(this.label); + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Container( + padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rSm), + ), + child: Text(label, + style: TextStyle( + fontSize: AppDims.fsXs, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.muted)), + ); + } +} + +/// 明细网格列描述（表头 + 宽度 + 对齐 + 必填星）。 +class GridCol { + final String key; + final String label; + final double? width; // null → 占满剩余（grow） + final bool num; + final bool req; + const GridCol(this.key, this.label, + {this.width, this.num = false, this.req = false}); +} + +/// 明细网格表（.grid）：粘性表头 + 行 + 底部「添加商品」。 +/// 列内容由 [cellBuilder] 按 (rowIndex, colKey) 提供，两屏各自实现。 +class OrderGridTable extends StatelessWidget { + final List columns; + final int rowCount; + final Widget Function(int rowIndex, String colKey) cellBuilder; + final bool Function(int rowIndex) rowHasError; + final VoidCallback? onAddRow; + const OrderGridTable({ + super.key, + required this.columns, + required this.rowCount, + required this.cellBuilder, + required this.rowHasError, + this.onAddRow, + }); + + double get _minWidth { + double fixed = 0; + int grows = 0; + for (final c in columns) { + if (c.width != null) { + fixed += c.width!; + } else { + grows++; + } + } + return fixed + grows * 180; + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Container( + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + clipBehavior: Clip.antiAlias, + child: LayoutBuilder(builder: (context, c) { + final overflow = c.maxWidth < _minWidth; + final width = overflow ? _minWidth : c.maxWidth; + final table = SizedBox( + width: width, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _header(t), + for (var i = 0; i < rowCount; i++) _row(t, i), + ], + ), + ); + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + overflow + ? SingleChildScrollView( + scrollDirection: Axis.horizontal, child: table) + : table, + if (onAddRow != null) _addRow(t), + ], + ); + }), + ); + } + + Widget _cellWrap(GridCol col, Widget child) { + final aligned = Align( + alignment: col.num ? Alignment.centerRight : Alignment.centerLeft, + child: child, + ); + if (col.width != null) return SizedBox(width: col.width, child: aligned); + return Expanded(child: aligned); + } + + Widget _header(AppTokens t) { + return Container( + color: t.thBg, + padding: const EdgeInsets.symmetric(vertical: 10), + child: Row( + children: [ + for (final col in columns) + _cellWrap( + col, + Padding( + padding: const EdgeInsets.symmetric(horizontal: 10), + child: Text.rich( + TextSpan( + children: [ + TextSpan(text: col.label), + if (col.req) + TextSpan(text: ' *', style: TextStyle(color: t.danger)), + ], + ), + textAlign: col.num ? TextAlign.right : TextAlign.left, + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.muted, + fontWeight: FontWeight.w600), + ), + ), + ), + ], + ), + ); + } + + Widget _row(AppTokens t, int i) { + final err = rowHasError(i); + return Container( + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle)), + boxShadow: err + ? [ + BoxShadow( + color: t.danger, + offset: const Offset(3, 0), + spreadRadius: -2) + ] + : null, + ), + child: IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + for (final col in columns) + _cellWrap( + col, + Padding( + padding: EdgeInsets.symmetric( + horizontal: col.key == 'act' ? 0 : 6, vertical: 4), + child: cellBuilder(i, col.key), + ), + ), + ], + ), + ), + ); + } + + Widget _addRow(AppTokens t) { + return InkWell( + onTap: onAddRow, + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11), + decoration: BoxDecoration( + border: Border(top: BorderSide(color: t.borderSubtle))), + child: Row(children: [ + Icon(LucideIcons.plus, size: 16, color: t.primary), + const SizedBox(width: 8), + Text('添加商品', + style: TextStyle( + fontSize: AppDims.fsBody, + color: t.primary, + fontWeight: FontWeight.w600)), + const SizedBox(width: 8), + Text('末格 Enter 自动加行', + style: TextStyle( + fontSize: AppDims.fsXs, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.faint)), + ]), + ), + ); + } +} + +/// 网格内文本输入（.gci）：透明、32 高、聚焦描边。数值列右对齐等宽。 +class GciField extends StatelessWidget { + final TextEditingController controller; + final FocusNode? focusNode; + final bool num; + final bool money; + final String hint; + final bool hasError; + final bool enabled; + final ValueChanged? onChanged; + final VoidCallback? onEnter; // Enter 推进下一格 + final bool Function({required bool backward})? onTab; + const GciField({ + super.key, + required this.controller, + this.focusNode, + this.num = false, + this.money = false, + this.hint = '', + this.hasError = false, + this.enabled = true, + this.onChanged, + this.onEnter, + this.onTab, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Focus( + focusNode: focusNode, + onKeyEvent: (node, e) { + if (e is! KeyDownEvent) return KeyEventResult.ignored; + if (e.logicalKey == LogicalKeyboardKey.tab) { + final back = HardwareKeyboard.instance.isShiftPressed; + final handled = onTab?.call(backward: back) ?? false; + return handled ? KeyEventResult.handled : KeyEventResult.ignored; + } + return KeyEventResult.ignored; + }, + child: Builder(builder: (context) { + return TextField( + controller: controller, + enabled: enabled, + textAlign: num ? TextAlign.right : TextAlign.left, + keyboardType: + num ? const TextInputType.numberWithOptions(decimal: true) : null, + inputFormatters: num + ? [FilteringTextInputFormatter.allow(RegExp(r'^\d*\.?\d{0,2}'))] + : null, + onChanged: onChanged, + onSubmitted: (_) => onEnter?.call(), + style: TextStyle( + fontSize: AppDims.fsBody, + color: t.text, + fontFamily: num ? 'monospace' : null), + cursorColor: t.primary, + decoration: InputDecoration( + isCollapsed: true, + contentPadding: + const EdgeInsets.symmetric(horizontal: 8, vertical: 8), + hintText: hint, + hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), + prefixText: money ? '¥' : null, + prefixStyle: TextStyle(fontSize: AppDims.fsBody, color: t.muted), + filled: false, + border: _b(Colors.transparent), + enabledBorder: _b(hasError ? t.danger : Colors.transparent), + focusedBorder: _b(t.primary), + ), + ); + }), + ); + } + + OutlineInputBorder _b(Color c) => OutlineInputBorder( + borderRadius: BorderRadius.circular(5), + borderSide: BorderSide(color: c), + ); +} + +/// 只读单元格文本（.ro）：系列/规格/成本价等出库只读列。 +class RoCell extends StatelessWidget { + final String text; + final bool num; + final Color? color; + const RoCell(this.text, {super.key, this.num = false, this.color}); + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8), + child: Text(text.isEmpty ? '—' : text, + textAlign: num ? TextAlign.right : TextAlign.left, + style: TextStyle( + fontSize: AppDims.fsBody, + color: color ?? (text.isEmpty ? t.faint : t.muted), + fontFamily: num ? 'monospace' : null)), + ); + } +} + +/// 金额单元格（.amt）：正常等宽粗体；[pending] 时橙色「待定价」。 +class AmountCell extends StatelessWidget { + final double amount; + final bool pending; + const AmountCell({super.key, required this.amount, this.pending = false}); + @override + Widget build(BuildContext context) { + final t = context.tokens; + if (pending) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + child: Text('待定价', + textAlign: TextAlign.right, + style: TextStyle( + fontSize: AppDims.fsBody, + color: t.warn, + fontWeight: FontWeight.w600)), + ); + } + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + child: Text('¥${amount.toStringAsFixed(2)}', + textAlign: TextAlign.right, + style: TextStyle( + fontSize: AppDims.fsBody, + color: t.heading, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontWeight: FontWeight.w600)), + ); + } +} + +/// 行操作图标组（.gact-in）：展开(可选)/复制/删除。 +class RowActions extends StatelessWidget { + final bool? expanded; // null → 不显示展开 + final VoidCallback? onToggleExpand; + final bool expandHighlight; + final VoidCallback onCopy; + final VoidCallback? onDelete; + const RowActions({ + super.key, + this.expanded, + this.onToggleExpand, + this.expandHighlight = false, + required this.onCopy, + this.onDelete, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + if (expanded != null) + _icon( + expanded! ? LucideIcons.chevronUp : LucideIcons.chevronDown, + expandHighlight ? t.primary : t.muted, + onToggleExpand, + '选填项', + ), + _icon(LucideIcons.copy, t.muted, onCopy, '复制本行'), + _icon(LucideIcons.trash2, onDelete == null ? t.faint : t.muted, + onDelete, '删除'), + ], + ); + } + + // 紧凑图标按钮：24×24 命中区，不走 IconButton 的 48px 触摸目标（会撑破窄操作列）。 + Widget _icon(IconData ic, Color color, VoidCallback? onTap, String tip) => + Tooltip( + message: tip, + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(4), + child: SizedBox( + width: 24, + height: 24, + child: Icon(ic, size: 16, color: color), + ), + ), + ); +} + +/// 内联日期格（.datefield / .gci-date）：点选或 Enter 打开日历，值等宽显示。 +class DsDateCell extends StatefulWidget { + final String? value; // yyyy-MM-dd + final ValueChanged onChanged; + final FocusNode? focusNode; + final bool cell; // true=.gci-date 网格样式；false=.datefield 独立样式 + final bool hasError; + final bool enabled; + final VoidCallback? onPicked; // 选完推进下一格 + final bool Function({required bool backward})? onTab; + const DsDateCell({ + super.key, + required this.value, + required this.onChanged, + this.focusNode, + this.cell = false, + this.hasError = false, + this.enabled = true, + this.onPicked, + this.onTab, + }); + + @override + State createState() => _DsDateCellState(); +} + +class _DsDateCellState extends State { + // 浮层锚定到字段下方（对齐原型 datewheel.js：pop.style.top = field.bottom + 4）， + // 非居中弹窗，无遮罩——点字段外任意处收起（TapRegion.onTapOutside）。 + final _link = LayerLink(); + OverlayEntry? _entry; + bool get _open => _entry != null; + + @override + void dispose() { + _removeOverlay(); + super.dispose(); + } + + void _toggle() { + if (_open) { + _close(); + } else { + _openOverlay(); + } + } + + void _openOverlay() { + if (_open || !widget.enabled) return; + final init = parseYmd(widget.value) ?? DateTime.now(); + _entry = OverlayEntry( + builder: (_) => Positioned( + width: 248, + child: CompositedTransformFollower( + link: _link, + showWhenUnlinked: false, + targetAnchor: Alignment.bottomLeft, + followerAnchor: Alignment.topLeft, + offset: const Offset(0, 4), + child: TapRegion( + onTapOutside: (_) => _close(), + child: WheelDatePanel( + initial: init, + onCommit: (d) { + widget.onChanged(formatYmd(d)); + _close(); + widget.onPicked?.call(); + }, + ), + ), + ), + ), + ); + Overlay.of(context).insert(_entry!); + setState(() {}); + } + + void _close() { + _removeOverlay(); + if (mounted) setState(() {}); + } + + void _removeOverlay() { + _entry?.remove(); + _entry = null; + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final has = widget.value != null && widget.value!.isNotEmpty; + final height = widget.cell ? 32.0 : 38.0; + return CompositedTransformTarget( + link: _link, + child: Focus( + focusNode: widget.focusNode, + onKeyEvent: (node, e) { + if (e is! KeyDownEvent) return KeyEventResult.ignored; + final k = e.logicalKey; + if (k == LogicalKeyboardKey.enter || + k == LogicalKeyboardKey.numpadEnter || + k == LogicalKeyboardKey.space) { + _toggle(); + return KeyEventResult.handled; + } + if (k == LogicalKeyboardKey.escape) { + if (_open) { + _close(); + return KeyEventResult.handled; + } + return KeyEventResult.ignored; + } + if (k == LogicalKeyboardKey.tab) { + final back = HardwareKeyboard.instance.isShiftPressed; + if (_open) _close(); + final handled = widget.onTab?.call(backward: back) ?? false; + return handled ? KeyEventResult.handled : KeyEventResult.ignored; + } + return KeyEventResult.ignored; + }, + child: Builder(builder: (context) { + final active = Focus.of(context).hasFocus || _open; + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: widget.enabled + ? () { + widget.focusNode?.requestFocus(); + _toggle(); + } + : null, + child: Container( + height: height, + padding: const EdgeInsets.symmetric(horizontal: 10), + decoration: BoxDecoration( + color: widget.cell + ? (active ? t.surface : Colors.transparent) + : t.surface, + border: Border.all( + color: widget.hasError + ? t.danger + : (active + ? t.primary + : (widget.cell ? Colors.transparent : t.border)), + ), + borderRadius: + BorderRadius.circular(widget.cell ? 5 : AppDims.rMd), + ), + child: Row(children: [ + Expanded( + child: Text( + has ? widget.value! : '选择日期', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsBody, + color: has ? t.text : t.faint, + fontFamily: has ? 'monospace' : null), + ), + ), + Icon(LucideIcons.calendar, size: 15, color: t.faint), + ]), + ), + ); + }), + ), + ); + } +} + +// ── 键盘流：跨格推进 / 回退 ───────────────────────────────────────────────── +/// 从 [fromField] 之后找本行第一个空的必填格聚焦；本行满足则找后续行； +/// 末行末格则 [onAddRow]（新行自动聚焦首格）。对齐原型 advance()。 +void advanceFocus({ + required int rowIndex, + required String fromField, + required int rowCount, + required List fields, // 可聚焦字段顺序 + required bool Function(String field) isRequired, + required bool Function(int row, String field) isEmpty, + required void Function(int row, String field) focusCell, + required VoidCallback onAddRow, +}) { + final start = fields.indexOf(fromField) + 1; + for (var k = start; k < fields.length; k++) { + if (isRequired(fields[k]) && isEmpty(rowIndex, fields[k])) { + focusCell(rowIndex, fields[k]); + return; + } + } + for (var i = rowIndex + 1; i < rowCount; i++) { + for (final f in fields) { + if (isRequired(f) && isEmpty(i, f)) { + focusCell(i, f); + return; + } + } + } + if (rowIndex == rowCount - 1) { + onAddRow(); + } else { + focusCell(rowIndex + 1, fields.first); + } +} + +/// 回退到上一格（本行前一格，或上一行末格）。对齐原型 retreat()。 +void retreatFocus({ + required int rowIndex, + required String fromField, + required List fields, + required void Function(int row, String field) focusCell, +}) { + final k = fields.indexOf(fromField) - 1; + if (k >= 0) { + focusCell(rowIndex, fields[k]); + } else if (rowIndex > 0) { + focusCell(rowIndex - 1, fields.last); + } +} diff --git a/client/lib/screens/shell/app_shell.dart b/client/lib/screens/shell/app_shell.dart index c27d486..88e43e0 100644 --- a/client/lib/screens/shell/app_shell.dart +++ b/client/lib/screens/shell/app_shell.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/utils/dialog_util.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -21,6 +22,8 @@ import '../../widgets/network_retry_button.dart'; import '../../widgets/theme_picker_pill.dart'; import '../../widgets/notification_bell.dart'; import '../../widgets/app_status_bar.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/ds_toast.dart'; /// 侧栏导航项（含其 StatefulShellRoute 分支序号 = router 中的 branch index）。 class _NavItem { @@ -40,19 +43,19 @@ class _NavGroup { // 分支序号必须与 router StatefulShellRoute 的 branch 顺序一致（勿改顺序）。 const _navGroups = <_NavGroup>[ _NavGroup('单据', [ - _NavItem(Icons.file_download_outlined, '入库管理', 0), - _NavItem(Icons.file_upload_outlined, '出库管理', 1), + _NavItem(LucideIcons.download, '入库管理', 0), + _NavItem(LucideIcons.upload, '出库管理', 1), ]), _NavGroup('经营', [ - _NavItem(Icons.inventory_2_outlined, '库存管理', 2), - _NavItem(Icons.receipt_long_outlined, '财务管理', 3), - _NavItem(Icons.people_alt_outlined, '往来单位', 4), - _NavItem(Icons.grid_view_outlined, '基础数据', 5), + _NavItem(LucideIcons.box, '库存管理', 2), + _NavItem(LucideIcons.receiptText, '财务管理', 3), + _NavItem(LucideIcons.users, '往来单位', 4), + _NavItem(LucideIcons.layoutGrid, '基础数据', 5), ]), _NavGroup('系统', [ - _NavItem(Icons.devices_outlined, '设备管理', 6), - _NavItem(Icons.settings_outlined, '系统设置', 7), - _NavItem(Icons.info_outline, '关于我们', 8), + _NavItem(LucideIcons.monitorSmartphone, '设备管理', 6), + _NavItem(LucideIcons.settings, '系统设置', 7), + _NavItem(LucideIcons.info, '关于我们', 8), ]), ]; @@ -80,8 +83,7 @@ class AppShell extends ConsumerStatefulWidget { } class _AppShellState extends ConsumerState { - final String _loginTime = - DateFormat('HH:mm:ss').format(AppStatusBar.clock()); + final String _loginTime = DateFormat('HH:mm:ss').format(AppStatusBar.clock()); bool _forceDialogShown = false; bool _licenseDialogShown = false; final GlobalKey _scaffoldKey = GlobalKey(); @@ -97,8 +99,8 @@ class _AppShellState extends ConsumerState { if (rb == null || overlay == null) return; final topLeft = rb.localToGlobal(Offset.zero, ancestor: overlay); final items = >[ - _userMenuItem('profile', Icons.manage_accounts_outlined, '个人设置', t), - _userMenuItem('logout', Icons.logout, '退出登录', t), + _userMenuItem('profile', LucideIcons.userCog, '个人设置', t), + _userMenuItem('logout', LucideIcons.logOut, '退出登录', t), ]; // 菜单弹到按钮上方：top = 按钮顶 − 菜单估高 − 间隙（菜单项 40 + 上下 padding 8*2） const itemH = 40.0; @@ -143,9 +145,7 @@ class _AppShellState extends ConsumerState { // 全局轻提示（写请求被后端 403 拒绝等）：统一在此弹出并清空。 ref.listen(apiMessageProvider, (prev, next) { if (next == null || next.isEmpty) return; - ScaffoldMessenger.of(context) - ..clearSnackBars() - ..showSnackBar(SnackBar(content: Text(next))); + showDsToast(context, next); ref.read(apiMessageProvider.notifier).state = null; }); final isOnline = ref.watch(connectivityProvider); @@ -170,8 +170,8 @@ class _AppShellState extends ConsumerState { Expanded( child: Column( children: [ - ..._buildBanners( - context, isOnline, updateInfo, updateNotifier, licenseInfo), + ..._buildBanners(context, isOnline, updateInfo, + updateNotifier, licenseInfo), Expanded(child: widget.navigationShell), if (!isMobile) AppStatusBar(loginTime: _loginTime), ], @@ -196,7 +196,8 @@ class _AppShellState extends ConsumerState { color: t.topBg, border: Border(bottom: BorderSide(color: t.topBorder)), ), - padding: EdgeInsets.only(top: topInset, left: isMobile ? 6 : 18, right: 14), + padding: + EdgeInsets.only(top: topInset, left: isMobile ? 6 : 18, right: 14), child: Row( children: [ // 左组（占满剩余空间，靠左）：把右组（主题器+铃）挤到最右 @@ -205,7 +206,7 @@ class _AppShellState extends ConsumerState { children: [ if (isMobile) ...[ IconButton( - icon: Icon(Icons.menu, color: t.topFg), + icon: Icon(LucideIcons.menu, color: t.topFg), tooltip: '菜单', onPressed: () => _scaffoldKey.currentState?.openDrawer(), ), @@ -250,7 +251,7 @@ class _AppShellState extends ConsumerState { child: Row( mainAxisSize: MainAxisSize.min, children: const [ - Icon(Icons.visibility_outlined, size: 13, color: AppChrome.onAccent), + Icon(LucideIcons.eye, size: 13, color: AppChrome.onAccent), SizedBox(width: 4), Text('只读', style: TextStyle( @@ -311,7 +312,8 @@ class _AppShellState extends ConsumerState { Widget _buildSideUser(BuildContext context, AuthUser user) { final t = context.tokens; - final shopName = ref.watch(shopInfoProvider).valueOrNull?.name ?? user.shopNo; + final shopName = + ref.watch(shopInfoProvider).valueOrNull?.name ?? user.shopNo; return Column( children: [ Container( @@ -399,11 +401,10 @@ class _AppShellState extends ConsumerState { color: t.sideBorder, margin: const EdgeInsets.symmetric(horizontal: 16)), ListTile( - leading: Icon(Icons.logout, color: t.sideFg), + leading: Icon(LucideIcons.logOut, color: t.sideFg), title: Text('退出登录', style: TextStyle( - color: t.sideActiveFg, - fontWeight: FontWeight.w500)), + color: t.sideActiveFg, fontWeight: FontWeight.w500)), onTap: () { Navigator.pop(context); _logout(); @@ -437,7 +438,7 @@ class _AppShellState extends ConsumerState { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), child: Row( children: [ - Icon(Icons.system_update, size: 16, color: t.warn), + Icon(LucideIcons.hardDriveDownload, size: 16, color: t.warn), const SizedBox(width: 8), Expanded( child: Text( @@ -487,7 +488,7 @@ class _AppShellState extends ConsumerState { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), child: const Row( children: [ - Icon(Icons.wifi_off, size: 16, color: AppChrome.onAccent), + Icon(LucideIcons.wifiOff, size: 16, color: AppChrome.onAccent), SizedBox(width: 8), Expanded( child: Text( @@ -516,7 +517,8 @@ class _AppShellState extends ConsumerState { child: AlertDialog( title: Row( children: [ - Icon(Icons.system_update, color: context.tokens.primary), + Icon(LucideIcons.hardDriveDownload, + color: context.tokens.primary), const SizedBox(width: 8), const Text('发现新版本'), ], @@ -524,10 +526,9 @@ class _AppShellState extends ConsumerState { content: Text('发现新版本 v${info.latestVersion}，需更新后才能继续使用，' '更新以获得最新功能与修复。'), actions: [ - ElevatedButton( - onPressed: () => startInAppUpdate(context, info), - child: const Text('立即更新'), - ), + DsButton('立即更新', + variant: DsBtnVariant.primary, + onPressed: () => startInAppUpdate(context, info)), ], ), ), @@ -543,7 +544,8 @@ class _AppShellState extends ConsumerState { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), child: Row( children: [ - const Icon(Icons.warning_amber_rounded, size: 16, color: AppChrome.onAccent), + const Icon(LucideIcons.triangleAlert, + size: 16, color: AppChrome.onAccent), const SizedBox(width: 8), Expanded( child: Text(msg, @@ -552,7 +554,8 @@ class _AppShellState extends ConsumerState { ), TextButton( onPressed: () => context.go('/settings?tab=license'), - style: TextButton.styleFrom(foregroundColor: AppChrome.onAccentFaint), + style: + TextButton.styleFrom(foregroundColor: AppChrome.onAccentFaint), child: const Text('去激活'), ), ], @@ -569,24 +572,20 @@ class _AppShellState extends ConsumerState { barrierDismissible: true, builder: (_) => AlertDialog( title: Row(children: [ - Icon(Icons.warning_amber_rounded, color: titleColor, size: 20), + Icon(LucideIcons.triangleAlert, color: titleColor, size: 20), const SizedBox(width: 8), Text(title, style: TextStyle(color: titleColor, fontSize: 16)), ]), content: Text(body, style: const TextStyle(fontSize: 14)), actions: [ - TextButton( - onPressed: () => Navigator.pop(_), - child: const Text('稍后处理'), - ), - ElevatedButton( - style: ElevatedButton.styleFrom(backgroundColor: titleColor), - onPressed: () { - Navigator.pop(_); - ctx.go('/settings?tab=license'); - }, - child: const Text('立即前往', style: TextStyle(color: AppChrome.onAccent)), - ), + DsButton('稍后处理', onPressed: () => Navigator.pop(_)), + DsButton('立即前往', + variant: lic.phase == 'grace' + ? DsBtnVariant.primary + : DsBtnVariant.danger, onPressed: () { + Navigator.pop(_); + ctx.go('/settings?tab=license'); + }), ], ), ); @@ -649,8 +648,8 @@ class _BrandMarkPainter extends CustomPainter { ..lineTo(50, 33); canvas.drawPath(peak, p); canvas.drawLine(const Offset(15, 41), const Offset(49, 41), p); - canvas.drawCircle(const Offset(32, 48), 3.4, - Paint()..color = AppChrome.brandDot); + canvas.drawCircle( + const Offset(32, 48), 3.4, Paint()..color = AppChrome.brandDot); } @override @@ -741,8 +740,8 @@ class _ShopMark extends StatelessWidget { decoration: BoxDecoration(color: bg, borderRadius: radius), alignment: Alignment.center, child: Text(initial, - style: TextStyle( - color: fg, fontSize: 13, fontWeight: FontWeight.w800)), + style: + TextStyle(color: fg, fontSize: 13, fontWeight: FontWeight.w800)), ); } } @@ -824,7 +823,7 @@ class _SideUserTileState extends State<_SideUserTile> { ], ), ), - Icon(Icons.keyboard_arrow_down, size: 14, color: t.sideMuted), + Icon(LucideIcons.chevronDown, size: 14, color: t.sideMuted), ], ), ), @@ -852,9 +851,8 @@ class _SidebarNavState extends State<_SidebarNav> { Widget build(BuildContext context) { final t = context.tokens; final active = widget.active; - final Color bg = active - ? t.sideActiveBg - : (_hover ? t.sideHover : Colors.transparent); + final Color bg = + active ? t.sideActiveBg : (_hover ? t.sideHover : Colors.transparent); final Color fg = active || _hover ? t.sideActiveFg : t.sideFg; return MouseRegion( cursor: SystemMouseCursors.click, @@ -912,7 +910,8 @@ void _showShopPanel(BuildContext context, AuthUser u, ), child: Row( children: [ - const Icon(Icons.store, color: AppChrome.onAccent, size: 20), + const Icon(LucideIcons.store, + color: AppChrome.onAccent, size: 20), const SizedBox(width: 10), const Text('门店信息', style: TextStyle( @@ -922,7 +921,7 @@ void _showShopPanel(BuildContext context, AuthUser u, const Spacer(), IconButton( onPressed: () => Navigator.pop(ctx), - icon: const Icon(Icons.close, + icon: const Icon(LucideIcons.x, color: AppChrome.onAccentFaint, size: 18), padding: EdgeInsets.zero, constraints: const BoxConstraints(), @@ -934,18 +933,17 @@ void _showShopPanel(BuildContext context, AuthUser u, padding: const EdgeInsets.all(20), child: Column( children: [ - _InfoRow(icon: Icons.tag, label: '门店编号', value: u.shopNo), + _InfoRow( + icon: LucideIcons.tag, label: '门店编号', value: u.shopNo), const SizedBox(height: 14), _InfoRow( - icon: Icons.person, label: '登录账号', value: u.username), + icon: LucideIcons.user, label: '登录账号', value: u.username), const SizedBox(height: 14), _InfoRow( - icon: Icons.badge_outlined, - label: '姓名', - value: u.realName), + icon: LucideIcons.idCard, label: '姓名', value: u.realName), const SizedBox(height: 14), _InfoRow( - icon: Icons.info_outline, label: '系统版本', value: version), + icon: LucideIcons.info, label: '系统版本', value: version), ], ), ), diff --git a/client/lib/screens/stock_in/stock_in_form_screen.dart b/client/lib/screens/stock_in/stock_in_form_screen.dart index 4df3e7f..5d1249c 100644 --- a/client/lib/screens/stock_in/stock_in_form_screen.dart +++ b/client/lib/screens/stock_in/stock_in_form_screen.dart @@ -1,24 +1,30 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../core/responsive/responsive.dart'; import 'package:go_router/go_router.dart'; -import '../../core/theme/context_tokens.dart'; + import '../../core/auth/auth_state.dart'; +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; import '../../core/utils/date_util.dart'; -import '../../widgets/order_print_preview_dialog.dart'; import '../../models/stock_in.dart'; -import '../../core/config/app_constants.dart'; import '../../providers/partner_provider.dart'; import '../../providers/product_option_provider.dart'; -import '../../providers/inventory_provider.dart'; +import '../../providers/shop_provider.dart'; import '../../providers/stock_in_provider.dart'; import '../../providers/warehouse_provider.dart'; -import '../../providers/shop_provider.dart'; -import '../../widgets/searchable_option_field.dart'; -import '../../widgets/date_picker_field.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/grid_combo_cell.dart'; import '../../widgets/mobile_list_card.dart'; +import '../../widgets/order_print_preview_dialog.dart'; +import '../../widgets/searchable_option_field.dart'; +import '../shared/order_form_shell.dart'; +import '../../widgets/ds/ds_toast.dart'; +/// 新建 / 修改入库单：照原型 stock-in.html 逐元素复刻的内联录单表单。 +/// 明细为可键盘操作的内联网格（名称/系列/规格可搜索+新增，生产日期/批次/数量/单价/售价内联编辑）。 class StockInFormScreen extends ConsumerStatefulWidget { final int? editOrderId; const StockInFormScreen({super.key, this.editOrderId}); @@ -28,23 +34,34 @@ class StockInFormScreen extends ConsumerStatefulWidget { } class _StockInFormScreenState extends ConsumerState { - final _formKey = GlobalKey(); final _remarkCtrl = TextEditingController(); + final _partnerFocus = FocusNode(); + final _warehouseFocus = FocusNode(); int? _warehouseId; int? _partnerId; DateTime _orderDate = DateTime.now(); bool _submitting = false; bool _loadingEdit = false; - Map _inventoryMap = {}; StockInOrder? _loadedOrder; - // 新建单据时的名称/系列/规格默认值（名称仅店配置；系列/规格店配置优先，53度/500ml 兜底） int? _defaultNameId; int? _defaultSeriesId; int? _defaultSpecId; final List<_ItemRow> _items = []; + // 入库可聚焦字段顺序（全部必填参与键盘推进；单价可留空=待定价，提交时不校验） + static const _fields = [ + 'name', + 'series', + 'spec', + 'prodDate', + 'batch', + 'qty', + 'price', + 'sale' + ]; + bool get _isEdit => widget.editOrderId != null; @override @@ -58,9 +75,6 @@ class _StockInFormScreenState extends ConsumerState { } } - /// 新建单据：算出系列/规格默认值并回填仍为空、未被改过的行。 - /// 优先级：店配置 default_series_id/default_spec_id（且仍存在）→ 同名 53度/500ml → - /// 相似项 contains('53')/contains('500') → 无则留空。 Future _initDefaults() async { try { final shop = await ref.read(shopInfoProvider.future); @@ -68,7 +82,6 @@ class _StockInFormScreenState extends ConsumerState { final series = await ref.read(productSeriesListProvider.future); final specs = await ref.read(productSpecListProvider.future); if (!mounted) return; - // 名称无「常见值」可兜底，只认店配置的默认 _defaultNameId = (shop.defaultNameId != null && names.any((o) => o.id == shop.defaultNameId)) ? shop.defaultNameId @@ -98,9 +111,7 @@ class _StockInFormScreenState extends ConsumerState { } } }); - } catch (_) { - // 默认值是锦上添花，取不到就静默留空 - } + } catch (_) {} } int? _pickDefault( @@ -153,10 +164,9 @@ class _StockInFormScreenState extends ConsumerState { specOpts.where((o) => o.name == item.productSpec).firstOrNull?.id; if (item.batchNo != null) row.batchNoCtrl.text = item.batchNo!; if (item.productionDate != null) { - row.productionDateCtrl.text = item.productionDate!.length >= 10 + row.prodDate = item.productionDate!.length >= 10 ? item.productionDate!.substring(0, 10) : item.productionDate!; - row.productionDate = DateTime.tryParse(item.productionDate!); } _items.add(row); } @@ -164,9 +174,7 @@ class _StockInFormScreenState extends ConsumerState { }); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('加载失败：$e'), backgroundColor: context.tokens.danger), - ); + showDsToast(context, '加载失败：$e', bg: context.tokens.danger); } } finally { if (mounted) setState(() => _loadingEdit = false); @@ -176,6 +184,8 @@ class _StockInFormScreenState extends ConsumerState { @override void dispose() { _remarkCtrl.dispose(); + _partnerFocus.dispose(); + _warehouseFocus.dispose(); for (final item in _items) { item.dispose(); } @@ -185,30 +195,13 @@ class _StockInFormScreenState extends ConsumerState { double get _totalAmount { double total = 0; for (final item in _items) { - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = double.tryParse(item.priceCtrl.text) ?? 0; - total += qty * price; + total += item.amount; } return total; } - Future _loadInventory(int warehouseId) async { - try { - final result = await ref - .read(inventoryRepositoryProvider) - .listInventory( - warehouseId: warehouseId, - pageSize: AppConstants.stockInPickerPageSize); - setState(() { - _inventoryMap = { - for (final inv in result.data.where((inv) => inv.productId != null)) - inv.productId!: inv.quantity - }; - }); - } catch (_) {} - } - - void _addItem() { + // ── 行操作 ──────────────────────────────────────────────────────────────── + void _addRow({bool focusFirst = false}) { setState(() { final row = _ItemRow(); row.selectedNameId = _defaultNameId; @@ -216,133 +209,174 @@ class _StockInFormScreenState extends ConsumerState { row.selectedSpecId = _defaultSpecId; _items.add(row); }); + if (focusFirst) { + WidgetsBinding.instance.addPostFrameCallback((_) { + _focusCell(_items.length - 1, _fields.first); + }); + } } void _removeItem(int index) { setState(() { - _items[index].dispose(); - _items.removeAt(index); + if (_items.length <= 1) { + _items[0].reset(); + } else { + _items[index].dispose(); + _items.removeAt(index); + } }); } + void _copyRow(int index) { + final s = _items[index]; + final r = _ItemRow(); + r.selectedNameId = s.selectedNameId; + r.selectedSeriesId = s.selectedSeriesId; + r.selectedSpecId = s.selectedSpecId; + r.priceCtrl.text = s.priceCtrl.text; + r.saleCtrl.text = s.saleCtrl.text; + setState(() => _items.insert(index + 1, r)); + WidgetsBinding.instance + .addPostFrameCallback((_) => _focusCell(index + 1, 'prodDate')); + } + + void _copyLast() { + if (_items.isNotEmpty) _copyRow(_items.length - 1); + } + + void _copyFromFocus() { + final idx = _items.indexWhere((r) => r.hasFocus); + _copyRow(idx >= 0 ? idx : _items.length - 1); + } + + // ── 键盘流 ──────────────────────────────────────────────────────────────── + void _focusCell(int row, String field) { + if (row < 0 || row >= _items.length) return; + _items[row].focusNode(field).requestFocus(); + } + + bool _isEmpty(int row, String field) { + final r = _items[row]; + switch (field) { + case 'name': + return r.selectedNameId == null; + case 'series': + return r.selectedSeriesId == null; + case 'spec': + return r.selectedSpecId == null; + case 'prodDate': + return r.prodDate == null || r.prodDate!.isEmpty; + case 'batch': + return r.batchNoCtrl.text.trim().isEmpty; + case 'qty': + return r.qtyCtrl.text.trim().isEmpty; + case 'price': + return r.priceCtrl.text.trim().isEmpty; + case 'sale': + return r.saleCtrl.text.trim().isEmpty; + } + return true; + } + + void _advance(int row, String from) => advanceFocus( + rowIndex: row, + fromField: from, + rowCount: _items.length, + fields: _fields, + isRequired: (_) => true, + isEmpty: _isEmpty, + focusCell: _focusCell, + onAddRow: () => _addRow(focusFirst: true), + ); + + void _retreat(int row, String from) => retreatFocus( + rowIndex: row, + fromField: from, + fields: _fields, + focusCell: _focusCell, + ); + + bool _onTab(int row, String field, {required bool backward}) { + if (backward) { + _retreat(row, field); + } else { + _advance(row, field); + } + return true; + } + Future _printOrder() async { if (_loadedOrder == null) return; await showStockInOrderPrint(context, ref, _loadedOrder!); } + // ── 提交 ────────────────────────────────────────────────────────────────── Future _submit(bool asDraft) async { - if (!asDraft && !_formKey.currentState!.validate()) return; if (_warehouseId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请选择入库仓库'), backgroundColor: context.tokens.danger), - ); + _snack('请选择入库仓库', err: true); return; } if (_items.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请添加商品明细'), backgroundColor: context.tokens.danger), - ); + _snack('请添加商品明细', err: true); return; } - final invalidQtyIndex = _items - .indexWhere((item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0); - if (invalidQtyIndex >= 0) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${invalidQtyIndex + 1} 行数量必须大于 0'), - backgroundColor: context.tokens.danger, - ), - ); + final invalidQty = + _items.indexWhere((it) => (double.tryParse(it.qtyCtrl.text) ?? 0) <= 0); + if (invalidQty >= 0) { + _snack('第 ${invalidQty + 1} 行数量必须大于 0', err: true); return; } - if (!asDraft) { if (_partnerId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请选择供应商'), backgroundColor: context.tokens.danger), - ); + _snack('请选择供应商', err: true); return; } for (int i = 0; i < _items.length; i++) { - final item = _items[i]; - if (item.selectedNameId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${i + 1} 行请选择商品名称'), - backgroundColor: context.tokens.danger), - ); - return; + final it = _items[i]; + if (it.selectedNameId == null) + return _snack('第 ${i + 1} 行请选择商品名称', err: true); + if (it.selectedSeriesId == null) + return _snack('第 ${i + 1} 行请选择系列', err: true); + if (it.selectedSpecId == null) + return _snack('第 ${i + 1} 行请选择规格', err: true); + if (it.prodDate == null || it.prodDate!.isEmpty) { + return _snack('第 ${i + 1} 行请填写生产日期', err: true); } - if (item.selectedSeriesId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${i + 1} 行请选择系列'), - backgroundColor: context.tokens.danger), - ); - return; - } - if (item.selectedSpecId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${i + 1} 行请选择规格'), - backgroundColor: context.tokens.danger), - ); - return; - } - if (item.productionDateCtrl.text.trim().isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${i + 1} 行请填写生产日期'), - backgroundColor: context.tokens.danger), - ); - return; - } - if (item.batchNoCtrl.text.trim().isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${i + 1} 行请填写批次号'), - backgroundColor: context.tokens.danger), - ); - return; + if (it.batchNoCtrl.text.trim().isEmpty) { + return _snack('第 ${i + 1} 行请填写批次号', err: true); } } } setState(() => _submitting = true); - // 入库每行 = 一个特有产品：明细只带 名称/系列/规格(字典文本) + 批次/生产日期， - // 由后端为每行新建独立产品(序列号)，前端不再 findOrCreate 复用。 final nameOpts = ref.read(productNameListProvider).valueOrNull ?? []; final seriesOpts = ref.read(productSeriesListProvider).valueOrNull ?? []; final specOpts = ref.read(productSpecListProvider).valueOrNull ?? []; String optName(List opts, int? id) => opts.where((o) => o.id == id).firstOrNull?.name as String? ?? ''; - for (final item in _items) { - if (optName(nameOpts, item.selectedNameId).isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请选择商品名称'), backgroundColor: context.tokens.danger), - ); + for (final it in _items) { + if (optName(nameOpts, it.selectedNameId).isEmpty) { + _snack('请选择商品名称', err: true); setState(() => _submitting = false); return; } } - final itemsData = _items.map((item) { - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = double.tryParse(item.priceCtrl.text) ?? 0; - final batchNo = item.batchNoCtrl.text.trim(); - final productionDate = item.productionDateCtrl.text.trim(); + final itemsData = _items.map((it) { + final qty = double.tryParse(it.qtyCtrl.text) ?? 0; + final price = double.tryParse(it.priceCtrl.text) ?? 0; + final sale = double.tryParse(it.saleCtrl.text) ?? 0; + final batchNo = it.batchNoCtrl.text.trim(); + final productionDate = it.prodDate?.trim() ?? ''; return { - 'product_name': optName(nameOpts, item.selectedNameId), - 'series': optName(seriesOpts, item.selectedSeriesId), - 'spec': optName(specOpts, item.selectedSpecId), + 'product_name': optName(nameOpts, it.selectedNameId), + 'series': optName(seriesOpts, it.selectedSeriesId), + 'spec': optName(specOpts, it.selectedSpecId), 'quantity': qty, 'unit_price': price, + if (sale > 0) 'sale_price': sale, 'total_price': qty * price, if (batchNo.isNotEmpty) 'batch_no': batchNo, if (productionDate.isNotEmpty) 'production_date': productionDate, @@ -368,42 +402,34 @@ class _StockInFormScreenState extends ConsumerState { await ref.read(stockInListProvider.notifier).createOrder(data); } if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(asDraft ? '已保存为草稿' : '入库单已提交审核'), - backgroundColor: context.tokens.success, - ), - ); + _snack(asDraft ? '已保存为草稿' : '入库单已提交审核'); context.go('/stock-in'); } } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('操作失败：$e'), backgroundColor: context.tokens.danger), - ); - } + if (mounted) _snack('操作失败：$e', err: true); } finally { if (mounted) setState(() => _submitting = false); } } - /// 是否有值得保留的录入（用于退出前判断是否提示保存草稿）。 - /// 系列/规格的默认值不算「脏」，只有用户实际录入了名称/价格/批次/生产日期/备注， - /// 或选了仓库/供应商才算。 + void _snack(String msg, {bool err = false}) { + showDsToast(context, msg, + bg: err ? context.tokens.danger : context.tokens.success); + } + bool get _isDirty { if (_remarkCtrl.text.trim().isNotEmpty) return true; if (_warehouseId != null) return true; if (_partnerId != null) return true; - for (final item in _items) { - if (item.selectedNameId != null) return true; - if (item.priceCtrl.text.trim().isNotEmpty) return true; - if (item.batchNoCtrl.text.trim().isNotEmpty) return true; - if (item.productionDateCtrl.text.trim().isNotEmpty) return true; + for (final it in _items) { + if (it.selectedNameId != null) return true; + if (it.priceCtrl.text.trim().isNotEmpty) return true; + if (it.batchNoCtrl.text.trim().isNotEmpty) return true; + if (it.prodDate != null && it.prodDate!.isNotEmpty) return true; } return false; } - /// 退出前处理：无录入直接离开；有未保存录入则提示「保存草稿 / 放弃 / 继续编辑」。 Future _handleExit() async { if (!_isDirty) { context.go('/stock-in'); @@ -416,766 +442,499 @@ class _StockInFormScreenState extends ConsumerState { content: Text(_isEdit ? '当前修改尚未保存。是否保存为草稿？' : '当前入库单尚未提交。是否保存为草稿，以免内容丢失？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop('edit'), - child: const Text('继续编辑'), - ), - TextButton( - onPressed: () => Navigator.of(ctx).pop('discard'), - child: Text('放弃', style: TextStyle(color: context.tokens.danger)), - ), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop('draft'), - child: const Text('保存草稿'), - ), + DsButton('继续编辑', onPressed: () => Navigator.of(ctx).pop('edit')), + DsButton('放弃', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop('discard')), + DsButton('保存草稿', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop('draft')), ], ), ); if (choice == 'draft') { - await _submit(true); // 成功后自身会跳回列表并提示「已保存为草稿」 + await _submit(true); } else if (choice == 'discard' && mounted) { context.go('/stock-in'); } - // 'edit' / null：留在当前页 } + // ── 构建 ────────────────────────────────────────────────────────────────── @override Widget build(BuildContext context) { - final asyncWarehouses = ref.watch(warehouseListProvider); - final asyncSuppliers = ref.watch(supplierListProvider); final currentUser = ref.watch(authStateProvider).user; - final isMobile = context.isMobile; + final mobile = context.isMobile; + + final deskActions = [ + if (_isEdit && _loadedOrder != null) + DsButton('打印', + icon: LucideIcons.printer, + variant: DsBtnVariant.ghost, + onPressed: _printOrder), + DsButton('暂存草稿', + variant: DsBtnVariant.ghost, + onPressed: _submitting ? null : () => _submit(true)), + DsButton('提交审核', + icon: LucideIcons.send, + variant: DsBtnVariant.primary, + onPressed: _submitting ? null : () => _submit(false)), + DsButton('取消', variant: DsBtnVariant.ghost, onPressed: _handleExit), + ]; + final mobileActions = [ + DsButton('提交', + variant: DsBtnVariant.primary, + onPressed: _submitting ? null : () => _submit(false)), + PopupMenuButton( + onSelected: (v) { + switch (v) { + case 'draft': + _submit(true); + break; + case 'print': + _printOrder(); + break; + case 'cancel': + _handleExit(); + break; + } + }, + itemBuilder: (_) => [ + const PopupMenuItem(value: 'draft', child: Text('保存草稿')), + if (_isEdit && _loadedOrder != null) + const PopupMenuItem(value: 'print', child: Text('打印')), + const PopupMenuItem(value: 'cancel', child: Text('取消')), + ], + ), + ]; return PopScope( canPop: false, onPopInvokedWithResult: (didPop, _) { if (!didPop) _handleExit(); }, - child: Scaffold( - backgroundColor: context.tokens.bg, - body: Column( - children: [ - Container( - height: 52, - color: context.tokens.surface, - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Row( - children: [ - IconButton( - icon: const Icon(Icons.arrow_back, size: 20), - onPressed: _handleExit, - tooltip: '返回', - ), - const SizedBox(width: 8), - Text(_isEdit ? '修改入库单' : '新建入库单', - style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.w600)), - const Spacer(), - // 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏 - if (isMobile) ...[ - ElevatedButton( - onPressed: _submitting ? null : () => _submit(false), - child: _submitting - ? const SizedBox( - width: 14, - height: 14, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('提交'), - ), - PopupMenuButton( - onSelected: (v) { - switch (v) { - case 'draft': - _submit(true); - break; - case 'print': - _printOrder(); - break; - case 'cancel': - _handleExit(); - break; - } - }, - itemBuilder: (_) => [ - const PopupMenuItem( - value: 'draft', child: Text('保存草稿')), - if (_isEdit && _loadedOrder != null) - const PopupMenuItem( - value: 'print', child: Text('打印')), - const PopupMenuItem(value: 'cancel', child: Text('取消')), - ], - ), - ] else ...[ - if (_isEdit && _loadedOrder != null) ...[ - OutlinedButton.icon( - onPressed: _printOrder, - icon: const Icon(Icons.print_outlined, size: 16), - label: const Text('打印'), - ), - const SizedBox(width: 8), - ], - OutlinedButton( - onPressed: _submitting ? null : () => _submit(true), - child: const Text('保存草稿'), - ), - const SizedBox(width: 8), - ElevatedButton.icon( - onPressed: _submitting ? null : () => _submit(false), - icon: _submitting - ? const SizedBox( - width: 14, - height: 14, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Icon(Icons.send, size: 16), - label: const Text('提交审核'), - ), - const SizedBox(width: 8), - OutlinedButton.icon( - onPressed: _handleExit, - icon: const Icon(Icons.cancel_outlined, size: 16), - label: const Text('取消'), - ), - ], - ], - ), + child: FocusableActionDetector( + shortcuts: _shortcuts(), + actions: { + _SubmitIntent: CallbackAction<_SubmitIntent>( + onInvoke: (_) => _submitting ? null : _submit(false)), + _CopyIntent: + CallbackAction<_CopyIntent>(onInvoke: (_) => _copyFromFocus()), + }, + child: OrderFormShell( + title: _isEdit ? '修改入库单' : '新建入库单', + onBack: _handleExit, + loading: _loadingEdit, + deskActions: deskActions, + mobileActions: mobileActions, + rowsLabel: '明细 ${_items.length} 行', + totalText: '¥${_totalAmount.toStringAsFixed(2)}', + docHead: _buildDocHead(currentUser?.realName ?? '-'), + detailHead: DetailHead(actions: [ + DsButton('复制上一行', + icon: LucideIcons.copy, + variant: DsBtnVariant.ghost, + small: true, + onPressed: _copyLast), + ]), + detail: mobile ? _buildMobileCards() : _buildGrid(), + ), + ), + ); + } + + Map _shortcuts() => { + const SingleActivator(LogicalKeyboardKey.enter, meta: true): + const _SubmitIntent(), + const SingleActivator(LogicalKeyboardKey.enter, control: true): + const _SubmitIntent(), + const SingleActivator(LogicalKeyboardKey.keyD, meta: true): + const _CopyIntent(), + const SingleActivator(LogicalKeyboardKey.keyD, control: true): + const _CopyIntent(), + }; + + Widget _buildDocHead(String handler) { + final asyncWarehouses = ref.watch(warehouseListProvider); + // 往来单位一次取全部（allPartnersProvider，pageSize 1000）本地过滤； + // 历史 type 不可靠，按 type 过滤会漏项，故与列表页一致用全量。 + final asyncSuppliers = ref.watch(allPartnersProvider); + final wName = asyncWarehouses.valueOrNull + ?.where((w) => w.id == _warehouseId) + .firstOrNull + ?.name ?? + '—'; + final summary = '$wName · ${formatYmd(_orderDate)}'; + return DocHeadCard( + summary: summary, + fields: [ + DocField( + label: '供应商', + required: true, + child: asyncSuppliers.when( + loading: () => const LinearProgressIndicator(), + error: (_, __) => const Text('加载失败'), + data: (result) => GridComboCell( + focusNode: _partnerFocus, + hint: '选择或搜索往来单位…', + searchHint: '搜索供应商…', + showCount: true, + options: result.data + .map((p) => OptionItem(id: p.id, name: p.name, code: p.code)) + .toList(), + selectedId: _partnerId, + onChanged: (v) => setState(() => _partnerId = v), ), - const Divider(height: 1), - if (_loadingEdit) - const Expanded(child: Center(child: CircularProgressIndicator())), - if (!_loadingEdit) - Expanded( - child: SingleChildScrollView( - padding: const EdgeInsets.all(16), - child: Form( - key: _formKey, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('基本信息', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const SizedBox(height: 16), - Wrap( - spacing: 16, - runSpacing: 16, - children: [ - _FormField( - label: '入库仓库', - required: true, - child: asyncWarehouses.when( - loading: () => - const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (warehouses) => - SearchableOptionField( - options: warehouses - .map((w) => OptionItem( - id: w.id, name: w.name)) - .toList(), - selectedId: _warehouseId, - hint: '请选择仓库', - dialogTitle: '选择入库仓库', - isRequired: true, - onChanged: (v) { - setState(() => _warehouseId = v); - if (v != null) _loadInventory(v); - }, - ), - ), - ), - _FormField( - label: '供应商', - required: true, - child: asyncSuppliers.when( - loading: () => - const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (result) => - SearchableOptionField( - options: result.data - .map((p) => OptionItem( - id: p.id, - name: p.name, - code: p.code)) - .toList(), - selectedId: _partnerId, - hint: '请选择供应商', - dialogTitle: '选择供应商', - isRequired: true, - onSearch: (kw) async { - final res = await ref - .read(partnerRepositoryProvider) - .list( - type: 'supplier', - keyword: kw, - pageSize: 50); - return res.data - .map((p) => OptionItem( - id: p.id, - name: p.name, - code: p.code)) - .toList(); - }, - onChanged: (v) => - setState(() => _partnerId = v), - ), - ), - ), - _FormField( - label: '入库员', - child: InputDecorator( - decoration: const InputDecoration(), - child: Text( - currentUser?.realName ?? '-', - style: const TextStyle(fontSize: 13), - ), - ), - ), - _FormField( - label: '入库日期', - required: true, - width: 320, - child: DatePickerField( - value: formatYmd(_orderDate), - onChanged: (v) { - final d = parseYmd(v); - if (d != null) - setState(() => _orderDate = d); - }, - ), - ), - ], - ), - const SizedBox(height: 16), - _FormField( - label: '备注', - width: double.infinity, - child: TextFormField( - controller: _remarkCtrl, - maxLines: 2, - decoration: const InputDecoration( - hintText: '选填，如有特殊说明请在此注明', - ), - ), - ), - ], - ), - ), - ), - const SizedBox(height: 12), - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text('商品明细', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const Spacer(), - ElevatedButton.icon( - onPressed: _addItem, - icon: const Icon(Icons.add, size: 16), - label: const Text('添加商品'), - style: ElevatedButton.styleFrom( - minimumSize: const Size(0, 32)), - ), - ], - ), - const SizedBox(height: 12), - // 窄屏：逐项卡片竖排，避免 12 列表格横向溢出；宽屏保持表格 - if (isMobile) - Column( - children: List.generate( - _items.length, - (i) => Padding( - padding: const EdgeInsets.only( - bottom: 10), - child: _buildItemCard(i), - )), - ) - else - Column( - crossAxisAlignment: - CrossAxisAlignment.stretch, - children: [ - _buildItemTableHeader(), - const Divider(height: 1), - ...List.generate( - _items.length, _buildItemGroup), - ], - ), - const Divider(height: 1), - Padding( - padding: const EdgeInsets.only(top: 12), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - const Text('合计金额：', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500)), - Text( - '¥${_totalAmount.toStringAsFixed(2)}', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w700, - color: context.tokens.danger), - ), - ], - ), - ), - ], - ), - ), - ), - ], - ), - ), - ), - ), - ], + ), + ), + DocField( + label: '入库仓库', + required: true, + child: asyncWarehouses.when( + loading: () => const LinearProgressIndicator(), + error: (_, __) => const Text('加载失败'), + data: (warehouses) => GridComboCell( + focusNode: _warehouseFocus, + hint: '选择仓库…', + searchHint: '搜索仓库…', + options: warehouses + .map((w) => OptionItem(id: w.id, name: w.name)) + .toList(), + selectedId: _warehouseId, + onChanged: (v) => setState(() => _warehouseId = v), + ), + ), + ), + DocField( + label: '单据日期', + required: true, + child: DsDateCell( + value: formatYmd(_orderDate), + onChanged: (v) { + final d = parseYmd(v); + if (d != null) setState(() => _orderDate = d); + }, + ), + ), + DocField(label: '入库员', child: RoValue(handler)), + ], + remark: DocField( + label: '备注', + child: TextField( + controller: _remarkCtrl, + maxLines: 2, + style: + TextStyle(fontSize: AppDims.fsBody, color: context.tokens.text), + decoration: InputDecoration( + hintText: '选填，如有特殊说明请在此注明', + hintStyle: TextStyle( + fontSize: AppDims.fsBody, color: context.tokens.faint), + filled: true, + fillColor: context.tokens.surface, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: context.tokens.border), + ), + ), ), ), ); } - // ── 明细字段构件（表格行与移动卡片共用，保持两种布局一致）────────── + // ── 桌面：内联网格 ───────────────────────────────────────────────────────── + static const _columns = [ + GridCol('idx', '#', width: 38), + GridCol('name', '商品名称', req: true), + GridCol('series', '系列', width: 116, req: true), + GridCol('spec', '规格', width: 128, req: true), + GridCol('prodDate', '生产日期', width: 150, req: true), + GridCol('batch', '批次号', width: 116, req: true), + GridCol('qty', '数量', width: 82, num: true, req: true), + GridCol('price', '进价', width: 100, num: true), + GridCol('sale', '售价', width: 108, num: true, req: true), + GridCol('amount', '金额', width: 110, num: true), + GridCol('act', '', width: 78), + ]; - Widget _nameField(_ItemRow item) { - final asyncNames = ref.watch(productNameListProvider); - return asyncNames.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (names) => SearchableOptionField( - options: names - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedNameId, - hint: '选择名称', - dialogTitle: '选择商品名称', - isRequired: true, - onCreate: (kw) async { - await ref.read(productNameListProvider.notifier).create({'name': kw}); - final list = await ref.read(productNameListProvider.future); - return list.where((o) => o.name == kw).firstOrNull?.id; - }, - onChanged: (v) => setState(() { - item.selectedNameId = v; - item.nameTouched = true; - item.productId = null; - }), - ), + Widget _buildGrid() { + return OrderGridTable( + columns: _columns, + rowCount: _items.length, + rowHasError: (_) => false, + onAddRow: () => _addRow(focusFirst: true), + cellBuilder: _cell, ); } - Widget _seriesField(_ItemRow item) { - final asyncSeries = ref.watch(productSeriesListProvider); - return asyncSeries.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (series) => SearchableOptionField( - options: series - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedSeriesId, - hint: '选择系列', - dialogTitle: '选择系列', - isRequired: true, - onCreate: (kw) async { - await ref - .read(productSeriesListProvider.notifier) - .create({'name': kw}); - final list = await ref.read(productSeriesListProvider.future); - return list.where((o) => o.name == kw).firstOrNull?.id; - }, - onChanged: (v) => setState(() { - item.selectedSeriesId = v; - item.seriesTouched = true; - item.productId = null; - }), - ), - ); - } - - Widget _specField(_ItemRow item) { - final asyncSpecs = ref.watch(productSpecListProvider); - return asyncSpecs.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (specs) => SearchableOptionField( - options: specs - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedSpecId, - hint: '选择规格', - dialogTitle: '选择规格', - isRequired: true, - onCreate: (kw) async { - await ref.read(productSpecListProvider.notifier).create({'name': kw}); - final list = await ref.read(productSpecListProvider.future); - return list.where((o) => o.name == kw).firstOrNull?.id; - }, - onChanged: (v) => setState(() { - item.selectedSpecId = v; - item.specTouched = true; - item.productId = null; - }), - ), - ); - } - - Widget _qtyField(_ItemRow item) { - return TextFormField( - controller: item.qtyCtrl, - decoration: const InputDecoration(hintText: '0', isDense: true), - style: const TextStyle(fontSize: 13), - keyboardType: const TextInputType.numberWithOptions(decimal: true), - inputFormatters: [ - FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}')) - ], - onChanged: (_) => setState(() {}), - validator: (v) { - if (v == null || v.isEmpty) return '不能为空'; - if ((double.tryParse(v) ?? 0) <= 0) return '>0'; - return null; - }, - ); - } - - Widget _priceField(_ItemRow item) { - return TextFormField( - controller: item.priceCtrl, - decoration: const InputDecoration( - hintText: '0.00', prefixText: '¥', isDense: true), - style: const TextStyle(fontSize: 13), - keyboardType: const TextInputType.numberWithOptions(decimal: true), - inputFormatters: [ - FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}')) - ], - onChanged: (_) => setState(() {}), - // 单价允许为空或 0：表示「待定价」，入库审核后可在单据详情「确认进价」补填真实进价 - validator: (_) => null, - ); - } - - Widget _batchField(_ItemRow item) { - return TextFormField( - controller: item.batchNoCtrl, - decoration: const InputDecoration( - hintText: '必填', - isDense: true, - ), - style: const TextStyle(fontSize: 13), - onChanged: (_) => setState(() {}), - validator: (v) => - (v == null || v.trim().isEmpty) ? '不能为空' : null, - ); - } - - Widget _dateField(_ItemRow item) { - return DatePickerField( - label: '生产日期', - isRequired: true, - value: item.productionDateCtrl.text.isEmpty - ? null - : item.productionDateCtrl.text, - onChanged: (v) { - setState(() { - item.productionDateCtrl.text = v ?? ''; - item.productionDate = parseYmd(v); - }); - }, - ); - } - - Widget _originField(_ItemRow item) { - final asyncOrigins = ref.watch(productOriginListProvider); - return asyncOrigins.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (origins) => SearchableOptionField( - options: origins - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedOriginId, - hint: '选择产地（可选）', - dialogTitle: '选择产地', - isRequired: false, - onChanged: (v) => setState(() => item.selectedOriginId = v), - ), - ); - } - - Widget _shelfLifeField(_ItemRow item) { - final asyncShelfLives = ref.watch(productShelfLifeListProvider); - return asyncShelfLives.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (shelfLives) => SearchableOptionField( - options: shelfLives - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedShelfLifeId, - hint: '选择保质期（可选）', - dialogTitle: '选择保质期', - isRequired: false, - onChanged: (v) => setState(() => item.selectedShelfLifeId = v), - ), - ); - } - - Widget _storageField(_ItemRow item) { - final asyncStorages = ref.watch(productStorageListProvider); - return asyncStorages.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (storages) => SearchableOptionField( - options: storages - .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) - .toList(), - selectedId: item.selectedStorageId, - hint: '选择储存方式（可选）', - dialogTitle: '选择储存方式', - isRequired: false, - onChanged: (v) => setState(() => item.selectedStorageId = v), - ), - ); - } - - Widget _descriptionDocField(_ItemRow item) { - final asyncDocs = ref.watch(productDescriptionDocListProvider); - return asyncDocs.when( - loading: () => const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (docs) => SearchableOptionField( - options: docs.map((o) => OptionItem(id: o.id, name: o.title)).toList(), - selectedId: item.selectedDescriptionDocId, - hint: '选择介绍文档（可选）', - dialogTitle: '选择介绍文档', - isRequired: false, - onChanged: (v) => setState(() => item.selectedDescriptionDocId = v), - ), - ); - } - - // ── 桌面表格：表头行 ────────────────────────────────────────────────────── - Widget _buildItemTableHeader() { - Widget th(String s) => Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), - child: Text(s, - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), + Widget _cell(int i, String key) { + final item = _items[i]; + final t = context.tokens; + switch (key) { + case 'idx': + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8), + child: Text('${i + 1}', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), ); - return Container( - color: context.tokens.thBg, - child: Row(children: [ - SizedBox(width: 36, child: th('序号')), - Expanded(flex: 18, child: th('名称')), - Expanded(flex: 12, child: th('系列')), - Expanded(flex: 12, child: th('规格')), - Expanded(flex: 20, child: th('生产日期')), - Expanded(flex: 12, child: th('批次号')), - Expanded(flex: 10, child: th('数量')), - Expanded(flex: 10, child: th('单价')), - Expanded(flex: 10, child: th('金额')), - const SizedBox(width: 32), - const SizedBox(width: 44), - ]), + case 'name': + return _nameCombo(item, i, cell: true); + case 'series': + return _seriesCombo(item, i, cell: true); + case 'spec': + return _specCombo(item, i, cell: true); + case 'prodDate': + return DsDateCell( + cell: true, + value: item.prodDate, + focusNode: item.focusNode('prodDate'), + onChanged: (v) => setState(() => item.prodDate = v), + onPicked: () => _advance(i, 'prodDate'), + onTab: ({required backward}) => + _onTab(i, 'prodDate', backward: backward), + ); + case 'batch': + return GciField( + controller: item.batchNoCtrl, + focusNode: item.focusNode('batch'), + hint: '批次号', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'batch'), + onTab: ({required backward}) => + _onTab(i, 'batch', backward: backward), + ); + case 'qty': + return GciField( + controller: item.qtyCtrl, + focusNode: item.focusNode('qty'), + num: true, + hint: '0', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'qty'), + onTab: ({required backward}) => _onTab(i, 'qty', backward: backward), + ); + case 'price': + return GciField( + controller: item.priceCtrl, + focusNode: item.focusNode('price'), + num: true, + money: true, + hint: '0.00', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'price'), + onTab: ({required backward}) => + _onTab(i, 'price', backward: backward), + ); + case 'sale': + return GciField( + controller: item.saleCtrl, + focusNode: item.focusNode('sale'), + num: true, + money: true, + hint: '0.00', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'sale'), + onTab: ({required backward}) => _onTab(i, 'sale', backward: backward), + ); + case 'amount': + return AmountCell(amount: item.amount, pending: item.pending); + case 'act': + final hasOptional = item.selectedOriginId != null || + item.selectedShelfLifeId != null || + item.selectedStorageId != null || + item.selectedDescriptionDocId != null; + return RowActions( + expanded: item.expanded, + expandHighlight: hasOptional, + onToggleExpand: () => setState(() => item.expanded = !item.expanded), + onCopy: () => _copyRow(i), + onDelete: () => _removeItem(i), + ); + } + return const SizedBox.shrink(); + } + + Widget _nameCombo(_ItemRow item, int i, {required bool cell}) { + final names = ref.watch(productNameListProvider).valueOrNull ?? []; + return GridComboCell( + focusNode: item.focusNode('name'), + cell: cell, + popupSearch: true, + searchHint: '搜索商品名称/拼音…', + showCount: true, + allowCreate: true, + hint: '选择商品名称', + options: names + .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) + .toList(), + selectedId: item.selectedNameId, + onChanged: (v) => setState(() { + item.selectedNameId = v; + item.nameTouched = true; + item.productId = null; + }), + onCreate: (kw) async { + await ref.read(productNameListProvider.notifier).create({'name': kw}); + final list = await ref.read(productNameListProvider.future); + return list.where((o) => o.name == kw).firstOrNull?.id; + }, + onPickedByKeyboard: () => _advance(i, 'name'), + onTab: ({required backward}) => _onTab(i, 'name', backward: backward), ); } - // ── 桌面表格：每条明细（主行 + 可折叠选填区） ────────────────────────── - Widget _buildItemGroup(int index) { - final item = _items[index]; - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = double.tryParse(item.priceCtrl.text) ?? 0; - final amount = qty * price; + Widget _seriesCombo(_ItemRow item, int i, {required bool cell}) { + final series = ref.watch(productSeriesListProvider).valueOrNull ?? []; + return GridComboCell( + focusNode: item.focusNode('series'), + cell: cell, + popupSearch: true, + searchHint: '搜索系列…', + showCount: true, + allowCreate: true, + hint: '选择系列', + commonIds: _defaultSeriesId != null ? {_defaultSeriesId!} : const {}, + options: series + .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) + .toList(), + selectedId: item.selectedSeriesId, + onChanged: (v) => setState(() { + item.selectedSeriesId = v; + item.seriesTouched = true; + item.productId = null; + }), + onCreate: (kw) async { + await ref.read(productSeriesListProvider.notifier).create({'name': kw}); + final list = await ref.read(productSeriesListProvider.future); + return list.where((o) => o.name == kw).firstOrNull?.id; + }, + onPickedByKeyboard: () => _advance(i, 'series'), + onTab: ({required backward}) => _onTab(i, 'series', backward: backward), + ); + } - Widget tc(String s, {Color? color, FontWeight? weight}) => Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12), - child: Text(s, - style: TextStyle(fontSize: 13, color: color, fontWeight: weight)), - ); + Widget _specCombo(_ItemRow item, int i, {required bool cell}) { + final specs = ref.watch(productSpecListProvider).valueOrNull ?? []; + return GridComboCell( + focusNode: item.focusNode('spec'), + cell: cell, + popupSearch: true, + searchHint: '搜索规格…', + showCount: true, + allowCreate: true, + hint: '选择规格', + commonIds: _defaultSpecId != null ? {_defaultSpecId!} : const {}, + options: specs + .map((o) => OptionItem(id: o.id, name: o.name, code: o.code)) + .toList(), + selectedId: item.selectedSpecId, + onChanged: (v) => setState(() { + item.selectedSpecId = v; + item.specTouched = true; + item.productId = null; + }), + onCreate: (kw) async { + await ref.read(productSpecListProvider.notifier).create({'name': kw}); + final list = await ref.read(productSpecListProvider.future); + return list.where((o) => o.name == kw).firstOrNull?.id; + }, + onPickedByKeyboard: () => _advance(i, 'spec'), + onTab: ({required backward}) => _onTab(i, 'spec', backward: backward), + ); + } - final hasOptional = item.selectedOriginId != null || - item.selectedShelfLifeId != null || - item.selectedStorageId != null || - item.selectedDescriptionDocId != null; + Widget _optCombo(_ItemRow item, String label, AsyncValue> async, + int? selected, ValueChanged onChanged) { + return async.when( + loading: () => const LinearProgressIndicator(), + error: (_, __) => const Text('加载失败'), + data: (opts) => GridComboCell( + focusNode: item.focusNode('opt-$label'), + cell: false, + hint: '选择$label（可选）', + options: opts + .map((o) => OptionItem( + id: o.id as int, + name: (o.name ?? o.title) as String, + code: o.code as String?)) + .toList(), + selectedId: selected, + onChanged: onChanged, + ), + ); + } + // ── 窄屏：卡片流 ─────────────────────────────────────────────────────────── + Widget _buildMobileCards() { return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - IntrinsicHeight( - child: Container( - color: index.isEven ? context.tokens.surface : context.tokens.bg, - child: - Row(crossAxisAlignment: CrossAxisAlignment.center, children: [ - SizedBox( - width: 36, - child: tc('${index + 1}', color: context.tokens.muted)), - Expanded( - flex: 18, - child: Padding( - padding: const EdgeInsets.all(4), - child: _nameField(item))), - Expanded( - flex: 12, - child: Padding( - padding: const EdgeInsets.all(4), - child: _seriesField(item))), - Expanded( - flex: 12, - child: Padding( - padding: const EdgeInsets.all(4), - child: _specField(item))), - Expanded( - flex: 20, - child: Padding( - padding: const EdgeInsets.all(4), - child: _dateField(item))), - Expanded( - flex: 12, - child: Padding( - padding: const EdgeInsets.all(4), - child: _batchField(item))), - Expanded( - flex: 10, - child: Padding( - padding: const EdgeInsets.all(4), - child: _qtyField(item))), - Expanded( - flex: 10, - child: Padding( - padding: const EdgeInsets.all(4), - child: _priceField(item))), - Expanded( - flex: 10, - child: tc('¥${amount.toStringAsFixed(2)}', - weight: FontWeight.w500)), - SizedBox( - width: 32, - child: Tooltip( - message: item.expanded ? '收起选填' : '展开选填（产地/保质期等）', - child: IconButton( - icon: Icon( - item.expanded ? Icons.expand_less : Icons.expand_more, - size: 18, - color: hasOptional - ? context.tokens.primary - : context.tokens.muted, - ), - onPressed: () => - setState(() => item.expanded = !item.expanded), - padding: EdgeInsets.zero, - constraints: - const BoxConstraints(minWidth: 28, minHeight: 28), - ), - ), - ), - SizedBox( - width: 44, - child: IconButton( - icon: Icon(Icons.delete_outline, - size: 18, color: context.tokens.danger), - onPressed: - _items.length > 1 ? () => _removeItem(index) : null, - tooltip: '删除', - padding: EdgeInsets.zero, - constraints: - const BoxConstraints(minWidth: 28, minHeight: 28), - ), - ), - ]), + for (var i = 0; i < _items.length; i++) + Padding( + padding: const EdgeInsets.only(bottom: 10), + child: _mobileCard(i), ), - ), - if (item.expanded) _buildOptionalSection(item), - const Divider(height: 1), + DsButton('添加商品', + icon: LucideIcons.plus, + variant: DsBtnVariant.ghost, + onPressed: () => _addRow()), ], ); } - // ── 可折叠选填区（桌面） ────────────────────────────────────────────────── - Widget _buildOptionalSection(_ItemRow item) { - return Container( - decoration: BoxDecoration( - color: context.tokens.infoSoft, - border: Border(left: BorderSide(color: context.tokens.primary, width: 3)), - ), - padding: const EdgeInsets.fromLTRB(16, 10, 16, 14), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('选填信息', - style: TextStyle( - fontSize: 12, - color: context.tokens.muted, - fontWeight: FontWeight.w500)), - const SizedBox(height: 10), - Wrap( - spacing: 16, - runSpacing: 12, - children: [ - _OptionalField( - label: '产地', width: 180, child: _originField(item)), - _OptionalField( - label: '保质期', width: 180, child: _shelfLifeField(item)), - _OptionalField( - label: '储存方式', width: 180, child: _storageField(item)), - _OptionalField( - label: '介绍文档', width: 200, child: _descriptionDocField(item)), - ], - ), - ], - ), - ); - } - - /// 窄屏（手机）：每个明细行渲染为一张卡片，必填字段竖排，选填字段默认折叠。 - Widget _buildItemCard(int index) { - final item = _items[index]; - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = double.tryParse(item.priceCtrl.text) ?? 0; - final amount = qty * price; - + Widget _mobileCard(int i) { + final item = _items[i]; return MobileListCard( - title: Text('商品 ${index + 1}'), + title: Text('商品 ${i + 1}'), trailing: IconButton( - icon: - Icon(Icons.delete_outline, size: 20, color: context.tokens.danger), - onPressed: _items.length > 1 ? () => _removeItem(index) : null, + icon: Icon(LucideIcons.trash2, size: 20, color: context.tokens.danger), + onPressed: () => _removeItem(i), tooltip: '删除', visualDensity: VisualDensity.compact, ), fields: [ - MobileCardField('名称', null, valueWidget: _nameField(item)), - MobileCardField('系列', null, valueWidget: _seriesField(item)), - MobileCardField('规格', null, valueWidget: _specField(item)), - MobileCardField('生产日期', null, valueWidget: _dateField(item)), - MobileCardField('批次号', null, valueWidget: _batchField(item)), - MobileCardField('数量', null, valueWidget: _qtyField(item)), - MobileCardField('单价', null, valueWidget: _priceField(item)), - MobileCardField('金额', '¥${amount.toStringAsFixed(2)}'), + MobileCardField('名称', null, + valueWidget: _nameCombo(item, i, cell: false)), + MobileCardField('系列', null, + valueWidget: _seriesCombo(item, i, cell: false)), + MobileCardField('规格', null, + valueWidget: _specCombo(item, i, cell: false)), + MobileCardField('生产日期', null, + valueWidget: DsDateCell( + value: item.prodDate, + onChanged: (v) => setState(() => item.prodDate = v), + )), + MobileCardField('批次号', null, + valueWidget: GciField( + controller: item.batchNoCtrl, + hint: '批次号', + onChanged: (_) => setState(() {}))), + MobileCardField('数量', null, + valueWidget: GciField( + controller: item.qtyCtrl, + num: true, + hint: '0', + onChanged: (_) => setState(() {}))), + MobileCardField('进价（可留空/0）', null, + valueWidget: GciField( + controller: item.priceCtrl, + num: true, + money: true, + hint: '留空=待定价', + onChanged: (_) => setState(() {}))), + MobileCardField('售价', null, + valueWidget: GciField( + controller: item.saleCtrl, + num: true, + money: true, + hint: '0.00', + onChanged: (_) => setState(() {}))), + MobileCardField( + '金额', item.pending ? '待定价' : '¥${item.amount.toStringAsFixed(2)}'), MobileCardField('', null, valueWidget: TextButton.icon( onPressed: () => setState(() => item.expanded = !item.expanded), - icon: Icon(item.expanded ? Icons.expand_less : Icons.expand_more, + icon: Icon( + item.expanded + ? LucideIcons.chevronUp + : LucideIcons.chevronDown, size: 16), label: Text(item.expanded ? '收起选填项' : '展开选填项（产地/保质期…）'), style: TextButton.styleFrom( @@ -1184,43 +943,58 @@ class _StockInFormScreenState extends ConsumerState { foregroundColor: context.tokens.muted, ), )), - if (item.expanded) - MobileCardField('产地', null, valueWidget: _originField(item)), - if (item.expanded) - MobileCardField('保质期', null, valueWidget: _shelfLifeField(item)), - if (item.expanded) - MobileCardField('储存方式', null, valueWidget: _storageField(item)), - if (item.expanded) - MobileCardField('介绍文档', null, - valueWidget: _descriptionDocField(item)), + if (item.expanded) ..._optionalFields(item), ], ); } - Widget _buildInventoryCell(int? productId) { - if (productId == null) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12), - child: Text('-', - style: TextStyle(color: context.tokens.muted, fontSize: 13)), - ); - } - final qty = _inventoryMap[productId]; - final text = qty != null - ? qty.toStringAsFixed(0) - : (_warehouseId == null ? '选仓库后显示' : '-'); - final color = qty == null - ? context.tokens.muted - : qty <= 0 - ? context.tokens.danger - : context.tokens.primary; - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12), - child: Text(text, - style: TextStyle( - fontSize: 13, fontWeight: FontWeight.w700, color: color)), - ); - } + List _optionalFields(_ItemRow item) => [ + MobileCardField('产地', null, + valueWidget: _optCombo( + item, + '产地', + ref + .watch(productOriginListProvider) + .whenData((v) => v.cast()), + item.selectedOriginId, + (v) => setState(() => item.selectedOriginId = v))), + MobileCardField('保质期', null, + valueWidget: _optCombo( + item, + '保质期', + ref + .watch(productShelfLifeListProvider) + .whenData((v) => v.cast()), + item.selectedShelfLifeId, + (v) => setState(() => item.selectedShelfLifeId = v))), + MobileCardField('储存方式', null, + valueWidget: _optCombo( + item, + '储存方式', + ref + .watch(productStorageListProvider) + .whenData((v) => v.cast()), + item.selectedStorageId, + (v) => setState(() => item.selectedStorageId = v))), + MobileCardField('介绍文档', null, + valueWidget: _optCombo( + item, + '介绍文档', + ref + .watch(productDescriptionDocListProvider) + .whenData((v) => v.cast()), + item.selectedDescriptionDocId, + (v) => setState(() => item.selectedDescriptionDocId = v))), + ]; +} + +// ── 意图（键盘快捷键）──────────────────────────────────────────────────────── +class _SubmitIntent extends Intent { + const _SubmitIntent(); +} + +class _CopyIntent extends Intent { + const _CopyIntent(); } class _ItemRow { @@ -1228,96 +1002,61 @@ class _ItemRow { int? selectedNameId; int? selectedSeriesId; int? selectedSpecId; - // 商品属性字典（可选，入库时关联到商品） int? selectedOriginId; int? selectedShelfLifeId; int? selectedStorageId; int? selectedDescriptionDocId; final TextEditingController qtyCtrl = TextEditingController(text: '1'); - final TextEditingController priceCtrl = TextEditingController(); + // 进价默认 0（暂估/待定价）：留空即视作 0，确认进价后回填。 + final TextEditingController priceCtrl = TextEditingController(text: '0'); + final TextEditingController saleCtrl = TextEditingController(); final TextEditingController batchNoCtrl = TextEditingController(); - final TextEditingController productionDateCtrl = TextEditingController(); - DateTime? productionDate; + String? prodDate; // yyyy-MM-dd bool expanded = false; - // 用户是否手动改过名称/系列/规格：改过则默认值不再覆盖 bool nameTouched = false; bool seriesTouched = false; bool specTouched = false; + final Map _focusNodes = {}; + FocusNode focusNode(String field) => + _focusNodes.putIfAbsent(field, () => FocusNode()); + + bool get hasFocus => _focusNodes.values.any((n) => n.hasFocus); + + double get amount => + (double.tryParse(qtyCtrl.text) ?? 0) * + (double.tryParse(priceCtrl.text) ?? 0); + + // 入库进价留空/0 = 待定价（暂估），金额显示「待定价」；确认进价后回填。 + bool get pending => (double.tryParse(priceCtrl.text) ?? 0) <= 0; + + void reset() { + productId = null; + selectedNameId = null; + selectedSeriesId = null; + selectedSpecId = null; + selectedOriginId = null; + selectedShelfLifeId = null; + selectedStorageId = null; + selectedDescriptionDocId = null; + qtyCtrl.text = '1'; + priceCtrl.text = '0'; + saleCtrl.clear(); + batchNoCtrl.clear(); + prodDate = null; + expanded = false; + nameTouched = false; + seriesTouched = false; + specTouched = false; + } + void dispose() { qtyCtrl.dispose(); priceCtrl.dispose(); + saleCtrl.dispose(); batchNoCtrl.dispose(); - productionDateCtrl.dispose(); - } -} - -/// 选填区内单个字段：label + 字段控件，固定宽度。 -class _OptionalField extends StatelessWidget { - final String label; - final Widget child; - final double width; - - const _OptionalField( - {required this.label, required this.child, this.width = 180}); - - @override - Widget build(BuildContext context) { - return SizedBox( - width: width, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text(label, - style: - TextStyle(fontSize: 12, color: context.tokens.muted)), - const SizedBox(height: 4), - child, - ], - ), - ); - } -} - -class _FormField extends StatelessWidget { - final String label; - final Widget child; - final bool required; - final double width; - - const _FormField({ - required this.label, - required this.child, - this.required = false, - this.width = 240, - }); - - @override - Widget build(BuildContext context) { - // 窄屏（手机）字段占满整行，便于点选；宽屏沿用固定宽度配合 Wrap 多列。 - final effectiveWidth = width == double.infinity - ? double.infinity - : (context.isMobile ? MediaQuery.sizeOf(context).width - 64 : width); - return SizedBox( - width: effectiveWidth, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - if (required) - Text('*', - style: TextStyle(color: context.tokens.danger, fontSize: 13)), - Text(label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), - ], - ), - const SizedBox(height: 6), - child, - ], - ), - ); + for (final n in _focusNodes.values) { + n.dispose(); + } } } diff --git a/client/lib/screens/stock_in/stock_in_list_screen.dart b/client/lib/screens/stock_in/stock_in_list_screen.dart index 00b3953..19980f8 100644 --- a/client/lib/screens/stock_in/stock_in_list_screen.dart +++ b/client/lib/screens/stock_in/stock_in_list_screen.dart @@ -28,7 +28,8 @@ import '../../providers/user_provider.dart' show userListProvider; import '../../providers/product_option_provider.dart' show productSeriesListProvider, productSpecListProvider; import '../../providers/product_provider.dart' show productRepositoryProvider; -import '../../providers/finance_provider.dart' show financeRepositoryProvider; +import '../../providers/finance_provider.dart' + show financeRepositoryProvider, financePartnerRowsProvider; import '../../providers/shop_provider.dart' show shopInfoProvider; import '../../widgets/write_guard.dart'; import '../../widgets/order_row_actions.dart'; @@ -37,6 +38,8 @@ import '../../widgets/order_detail_drawer.dart'; import '../../widgets/wheel_date_picker.dart'; import '../../core/auth/auth_state.dart' show isAdminProvider, currentUserIdProvider; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; class StockInListScreen extends ConsumerStatefulWidget { const StockInListScreen({super.key}); @@ -79,7 +82,13 @@ class _StockInListScreenState extends ConsumerState { ]; // 单视图已知主状态；未知值（如旧版残留的 'pending,draft' 多值）进页面时归零。 - static const _knownStatuses = {'', 'draft', 'pending', 'approved', 'rejected'}; + static const _knownStatuses = { + '', + 'draft', + 'pending', + 'approved', + 'rejected' + }; @override void initState() { @@ -218,7 +227,8 @@ class _StockInListScreenState extends ConsumerState { label = '近 30 天'; break; case 'month': - range = DateTimeRange(start: DateTime(now.year, now.month, 1), end: now); + range = + DateTimeRange(start: DateTime(now.year, now.month, 1), end: now); label = '本月'; break; default: // all @@ -300,10 +310,10 @@ class _StockInListScreenState extends ConsumerState { style: TextStyle(color: context.tokens.muted), textAlign: TextAlign.center), const SizedBox(height: 12), - ElevatedButton( - onPressed: () => ref.read(stockInListProvider.notifier).reload(), - child: const Text('重试'), - ), + DsButton('重试', + variant: DsBtnVariant.primary, + onPressed: () => + ref.read(stockInListProvider.notifier).reload()), ], ), ), @@ -317,11 +327,11 @@ class _StockInListScreenState extends ConsumerState { .toList(); final warehouseOptions = (ref - .watch(warehouseListProvider) - .valueOrNull - ?.map((w) => w.name) - .toList() ?? - []) + .watch(warehouseListProvider) + .valueOrNull + ?.map((w) => w.name) + .toList() ?? + []) ..sort(); final supplierOptions = ref .watch(allPartnersProvider) @@ -334,51 +344,59 @@ class _StockInListScreenState extends ConsumerState { ? int.tryParse(_detail['partner_id']!) : null; - final summary = ref.watch(stockInSummaryProvider).valueOrNull; + final summary = ref.watch(stockInSummary30Provider).valueOrNull; - final content = Column( - children: [ - _buildHeader(result.total, summary), - _buildKpis(summary, result.total), - const Divider(height: 1), - Expanded( - child: DsTable( - total: result.total, - page: result.page, - pageSize: result.pageSize, - onPageChanged: (p) => - ref.read(stockInListProvider.notifier).setPage(p), - onPageSizeChanged: (s) => - ref.read(stockInListProvider.notifier).setPageSize(s), - emptyText: '没有匹配的入库单 · 试试调整筛选或搜索', - toolbar: _buildToolbar( - orders: orders, - warehouseOptions: warehouseOptions, - supplierOptions: supplierOptions, - selectedSupplierId: selectedSupplierId, + final content = Container( + color: context.tokens.bg, + padding: context.isMobile + ? EdgeInsets.zero + // 原型 .main{padding:22px 26px} + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + children: [ + _buildHeader(result.total, summary), + _buildKpis(summary, result.total), + Expanded( + child: DsTable( + total: result.total, + page: result.page, + pageSize: result.pageSize, + onPageChanged: (p) => + ref.read(stockInListProvider.notifier).setPage(p), + onPageSizeChanged: (s) => + ref.read(stockInListProvider.notifier).setPageSize(s), + emptyText: '没有匹配的入库单 · 试试调整筛选或搜索', + toolbar: _buildToolbar( + orders: orders, + warehouseOptions: warehouseOptions, + supplierOptions: supplierOptions, + selectedSupplierId: selectedSupplierId, + ), + mobileCards: + orders.map((o) => _orderCard(context, o)).toList(), + columns: _colDefs + .map((c) => DsColumn(c.$1, c.$2, + numeric: c.$1 == 'amount', + action: c.$1 == 'actions')) + .toList(), + rows: orders + .map((o) => DsRow( + onTap: () => _showDetail(context, o.id), + cells: _colDefs + .map((c) => _buildCell(c.$1, o)) + .toList(), + )) + .toList(), + ), ), - mobileCards: orders.map((o) => _orderCard(context, o)).toList(), - columns: _colDefs - .map((c) => DsColumn(c.$1, c.$2, - numeric: c.$1 == 'amount', action: c.$1 == 'actions')) - .toList(), - rows: orders - .map((o) => DsRow( - onTap: () => _showDetail(context, o.id), - cells: _colDefs - .map((c) => _buildCell(c.$1, o)) - .toList(), - )) - .toList(), - ), - ), - ], - ); + ], + )); return Stack( children: [ content, // 搜索/筛选 reload 中：叠加半透明进度，保留旧内容不白屏。 - if (asyncOrders.isLoading) const Positioned.fill(child: DsLoadingScrim()), + if (asyncOrders.isLoading) + const Positioned.fill(child: DsLoadingScrim()), ], ); }, @@ -391,8 +409,11 @@ class _StockInListScreenState extends ConsumerState { return Container( width: double.infinity, color: context.tokens.bg, - padding: const EdgeInsets.fromLTRB( - AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2), + // 原型 .head{margin-bottom:18px}；窄屏保持紧凑内边距 + padding: context.isMobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), child: Row( crossAxisAlignment: CrossAxisAlignment.end, children: [ @@ -404,7 +425,7 @@ class _StockInListScreenState extends ConsumerState { const SizedBox(width: AppDims.sp3), Padding( padding: const EdgeInsets.only(bottom: 2), - child: Text('本月 $monthCount 笔入库单', + child: Text('近30天 $monthCount 笔入库单', style: TextStyle( fontSize: AppDims.fsSm, color: context.tokens.muted)), ), @@ -443,23 +464,23 @@ class _StockInListScreenState extends ConsumerState { ? '¥${(v / 10000).toStringAsFixed(v >= 1000000 ? 0 : 1)}万' : '¥${v.toStringAsFixed(0)}'; String pctText(double? pct) => - pct == null ? '较上月 —' : '${pct.abs().toStringAsFixed(1)}% 较上月'; + pct == null ? '较前30天 —' : '${pct.abs().toStringAsFixed(1)}% 较前30天'; DsKpiDelta pctTone(double? pct) => pct == null ? DsKpiDelta.neutral : (pct >= 0 ? DsKpiDelta.up : DsKpiDelta.down); final cards = [ DsKpi( - title: '本月入库笔数', - value: NumberFormat.decimalPattern() - .format(summary?.monthCount ?? total), + title: '近30天入库笔数', + value: + NumberFormat.decimalPattern().format(summary?.monthCount ?? total), icon: LucideIcons.download, tone: DsKpiTone.info, delta: pctText(summary?.countDeltaPct), deltaTone: pctTone(summary?.countDeltaPct), ), DsKpi( - title: '本月入库金额', + title: '近30天入库金额', value: summary != null ? yuanWan(summary.monthAmount) : '—', icon: LucideIcons.wallet, tone: DsKpiTone.ok, @@ -489,7 +510,10 @@ class _StockInListScreenState extends ConsumerState { } return Container( color: context.tokens.bg, - padding: const EdgeInsets.all(AppDims.sp3), + // 原型 .kpis{margin-bottom:20px}；窄屏保持紧凑内边距 + padding: context.isMobile + ? const EdgeInsets.all(AppDims.sp3) + : const EdgeInsets.only(bottom: 20), child: mobile ? SingleChildScrollView( scrollDirection: Axis.horizontal, @@ -531,7 +555,8 @@ class _StockInListScreenState extends ConsumerState { ); final warehouseChip = PopupMenuButton( - onSelected: (v) => setState(() => _warehouseName = v.isEmpty ? null : v), + onSelected: (v) => + setState(() => _warehouseName = v.isEmpty ? null : v), offset: const Offset(0, 40), color: ctx.tokens.surface, elevation: 8, @@ -674,10 +699,12 @@ class _StockInListScreenState extends ConsumerState { final t = context.tokens; switch (key) { case 'order_no': + // 原型 .pcode（fs-body 覆盖）：faint + mono return Text(o.orderNo, style: TextStyle( - color: t.primary, - fontFamily: 'monospace', + color: t.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: AppDims.fsBody)); case 'supplier': return Text(o.partnerName ?? '-'); @@ -686,9 +713,11 @@ class _StockInListScreenState extends ConsumerState { case 'amount': return Text( o.totalAmount != null - ? '¥${o.totalAmount!.toStringAsFixed(2)}' - : '-', - style: const TextStyle(fontFamily: 'monospace')); + ? '¥${NumberFormat('#,##0').format(o.totalAmount)}' + : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)); case 'status': final rb = returnStateBadge(context, o.returnState); return Row(mainAxisSize: MainAxisSize.min, children: [ @@ -701,7 +730,7 @@ class _StockInListScreenState extends ConsumerState { case 'operator': return Text(o.operatorName ?? '-'); case 'reviewer': - return Text(o.reviewerName ?? '-', + return Text(o.reviewerName ?? '—', style: o.reviewerName == null ? TextStyle(color: t.faint) : null); case 'actions': // 原型：操作列只放一个眼睛图标，点开右侧详情抽屉（其余操作在抽屉内）。 @@ -785,7 +814,10 @@ class _StockInListScreenState extends ConsumerState { return MobileListCard( onTap: () => _showDetail(context, o.id), title: Text(o.orderNo, - style: const TextStyle(fontFamily: 'monospace', fontSize: 14)), + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: 14)), trailing: Row(mainAxisSize: MainAxisSize.min, children: [ StatusBadge(_apiStatusToEnum(o.status)), if (returnStateBadge(context, o.returnState) != null) ...[ @@ -882,7 +914,8 @@ class _StockInListScreenState extends ConsumerState { final readonly = WriteGuard.isReadonly(ref); final isAdmin = ref.read(isAdminProvider); final canWithdraw = isAdmin || - (o.operatorId != null && o.operatorId == ref.read(currentUserIdProvider)); + (o.operatorId != null && + o.operatorId == ref.read(currentUserIdProvider)); void close() => Navigator.of(context).pop(); DsButton b(String label, VoidCallback onTap, {DsBtnVariant v = DsBtnVariant.ghost}) => @@ -994,7 +1027,9 @@ class _StockInListScreenState extends ConsumerState { final pending = o.items.where((it) => it.unitPrice == 0 && it.id != null).toList(); if (pending.isEmpty) return; - final controllers = {for (final it in pending) it.id!: TextEditingController()}; + final controllers = { + for (final it in pending) it.id!: TextEditingController() + }; final ok = await showDialog( context: context, builder: (ctx) => AlertDialog( @@ -1034,12 +1069,10 @@ class _StockInListScreenState extends ConsumerState { ), ), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.pop(ctx, true), - child: const Text('确认')), + DsButton('取消', onPressed: () => Navigator.pop(ctx, false)), + DsButton('确认', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.pop(ctx, true)), ], ), ); @@ -1057,13 +1090,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInRepositoryProvider).confirmCost(o.id, items); if (!mounted) return; - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('进价已确认'))); + showDsToast(context, '进价已确认'); ref.read(stockInListProvider.notifier).reload(); } on AppException catch (e) { if (!mounted) return; - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('确认失败：${e.message}'))); + showDsToast(context, '确认失败：${e.message}'); } } @@ -1075,34 +1106,25 @@ class _StockInListScreenState extends ConsumerState { title: const Text('结清确认'), content: const Text('确认将该单据的账款标记为已结清？'), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('取消')), - TextButton( - onPressed: () => Navigator.pop(ctx, true), - child: - Text('确认结清', style: TextStyle(color: context.tokens.accent)), - ), + DsButton('取消', onPressed: () => Navigator.pop(ctx, false)), + DsButton('确认结清', + variant: DsBtnVariant.accent, + onPressed: () => Navigator.pop(ctx, true)), ], ), ); if (confirmed != true || !context.mounted) return; try { await ref.read(financeRepositoryProvider).closeByRef(refType, orderId); + // 结清改变单据结算状态展示，刷新列表；财务屏应收应付表非 autoDispose，需一并失效 + ref.read(stockInListProvider.notifier).reload(); + ref.invalidate(financePartnerRowsProvider); if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('已结清'), - backgroundColor: context.tokens.success), - ); + showDsToast(context, '已结清', bg: context.tokens.success); } } catch (e) { if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(e.toString()), - backgroundColor: context.tokens.danger), - ); + showDsToast(context, e.toString(), bg: context.tokens.danger); } } } @@ -1114,16 +1136,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('删除确认'), content: Text('确认删除入库单「${o.orderNo}」？此操作不可恢复。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('删除'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('删除', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1131,15 +1147,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInListProvider.notifier).deleteOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已删除'), - backgroundColor: context.tokens.success)); + showDsToast(context, '已删除', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('删除失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); } } } @@ -1152,12 +1164,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('提交审核'), content: Text('确认提交入库单「${o.orderNo}」？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - child: const Text('提交')), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('提交', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1165,15 +1175,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInListProvider.notifier).submitOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已提交审核'), - backgroundColor: context.tokens.success)); + showDsToast(context, '已提交审核', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('提交失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '提交失败：$e', bg: context.tokens.danger); } } } @@ -1186,16 +1192,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('审核确认'), content: Text('确认审核通过入库单「${o.orderNo}」？审核后将入库并增加库存。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.success, - foregroundColor: Colors.white), - child: const Text('通过'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('通过', + variant: DsBtnVariant.success, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1203,15 +1203,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInListProvider.notifier).approveOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('审核通过'), - backgroundColor: context.tokens.success)); + showDsToast(context, '审核通过', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('审核失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '审核失败：$e', bg: context.tokens.danger); } } } @@ -1224,16 +1220,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('拒绝确认'), content: Text('确认拒绝入库单「${o.orderNo}」？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('拒绝'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('拒绝', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1241,15 +1231,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInListProvider.notifier).rejectOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已拒绝'), - backgroundColor: context.tokens.accent)); + showDsToast(context, '已拒绝', bg: context.tokens.accent); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('操作失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '操作失败：$e', bg: context.tokens.danger); } } } @@ -1262,16 +1248,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('撤回确认'), content: Text('确认撤回入库单「${o.orderNo}」？撤回后单据回到草稿，可修改后重新提交审核。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.accent, - foregroundColor: Colors.white), - child: const Text('撤回'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('撤回', + variant: DsBtnVariant.accent, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1279,15 +1259,11 @@ class _StockInListScreenState extends ConsumerState { try { await ref.read(stockInListProvider.notifier).withdrawOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已撤回为草稿'), - backgroundColor: context.tokens.accent)); + showDsToast(context, '已撤回为草稿', bg: context.tokens.accent); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('撤回失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '撤回失败：$e', bg: context.tokens.danger); } } } @@ -1300,16 +1276,10 @@ class _StockInListScreenState extends ConsumerState { title: const Text('退单'), content: Text('确认对已审核入库单「${o.orderNo}」发起退单？将打开退单明细窗口选择要退的商品。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('确认'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('确认', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1319,9 +1289,7 @@ class _StockInListScreenState extends ConsumerState { full = await ref.read(stockInRepositoryProvider).get(o.id); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('加载明细失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '加载明细失败：$e', bg: context.tokens.danger); } return; } @@ -1347,9 +1315,12 @@ class _StockInListScreenState extends ConsumerState { meta: [ ('供应商', o.partnerName ?? '-'), ('仓库', o.warehouseName ?? '-'), - ('入库日期', o.orderDate != null && o.orderDate!.length >= 10 - ? o.orderDate!.substring(0, 10) - : (o.orderDate ?? '-')), + ( + '入库日期', + o.orderDate != null && o.orderDate!.length >= 10 + ? o.orderDate!.substring(0, 10) + : (o.orderDate ?? '-') + ), ], lines: lines, onSubmit: (ids) => @@ -1509,25 +1480,34 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { } List _supplierOpts() => - ref.watch(allPartnersProvider).valueOrNull?.data + ref + .watch(allPartnersProvider) + .valueOrNull + ?.data .map((p) => OptionItem(id: p.id, name: p.name)) .toList() ?? const []; List _seriesOpts() => - ref.watch(productSeriesListProvider).valueOrNull + ref + .watch(productSeriesListProvider) + .valueOrNull ?.map((s) => OptionItem(id: s.id, name: s.name)) .toList() ?? const []; List _specOpts() => - ref.watch(productSpecListProvider).valueOrNull + ref + .watch(productSpecListProvider) + .valueOrNull ?.map((s) => OptionItem(id: s.id, name: s.name)) .toList() ?? const []; List _userOpts() => - ref.watch(userListProvider).valueOrNull + ref + .watch(userListProvider) + .valueOrNull ?.map((u) => OptionItem( id: u.id, name: (u.realName != null && u.realName!.isNotEmpty) @@ -1576,7 +1556,11 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { style: TextStyle(fontSize: AppDims.fsBody, color: t.text), decoration: InputDecoration( isCollapsed: true, + contentPadding: EdgeInsets.zero, border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, hintText: hint, hintStyle: TextStyle(color: t.faint, fontSize: AppDims.fsBody), ), @@ -1663,7 +1647,7 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { const Spacer(), InkWell( onTap: () => Navigator.of(context).pop(), - child: Icon(Icons.close, size: 20, color: t.muted), + child: Icon(LucideIcons.x, size: 20, color: t.muted), ), ]), ), @@ -1674,66 +1658,70 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { mainAxisSize: MainAxisSize.min, children: [ row([ - field('单据编号', - textField(_orderNoCtrl, '如 RK20260401001')), - field( - '供应商', - combo( - opts: _supplierOpts(), - selectedId: _partnerId, - hint: '全部供应商', - onChanged: (v) => setState(() => _partnerId = v))), - ]), - row([ - field('商品名', textField(_productCtrl, '输入酒名')), - field('商品编码', textField(_productCodeCtrl, '输入商品编码')), - ]), - row([ - field( - '系列', - combo( - opts: seriesOpts, - selectedId: _idByName(seriesOpts, _seriesName), - hint: '全部系列', - onChanged: (v) => setState(() => _seriesName = v == null - ? null - : seriesOpts - .where((o) => o.id == v) - .map((o) => o.name) - .firstOrNull))), - field( - '规格', - combo( - opts: specOpts, - selectedId: _idByName(specOpts, _specName), - hint: '全部规格', - onChanged: (v) => setState(() => _specName = v == null - ? null - : specOpts - .where((o) => o.id == v) - .map((o) => o.name) - .firstOrNull))), - ]), - row([ - field('批次号', textField(_batchCtrl, '输入批次号')), - field('状态', statusCombo()), - ]), - row([ - field( - '入库员', - combo( - opts: _userOpts(), - selectedId: _operatorId, - hint: '全部入库员', - onChanged: (v) => setState(() => _operatorId = v))), - field( - '审核人', - combo( - opts: _userOpts(), - selectedId: _reviewerId, - hint: '全部审核人', - onChanged: (v) => setState(() => _reviewerId = v))), - ]), + field('单据编号', textField(_orderNoCtrl, '如 RK20260401001')), + field( + '供应商', + combo( + opts: _supplierOpts(), + selectedId: _partnerId, + hint: '全部供应商', + onChanged: (v) => + setState(() => _partnerId = v))), + ]), + row([ + field('商品名', textField(_productCtrl, '输入酒名')), + field('商品编码', textField(_productCodeCtrl, '输入商品编码')), + ]), + row([ + field( + '系列', + combo( + opts: seriesOpts, + selectedId: _idByName(seriesOpts, _seriesName), + hint: '全部系列', + onChanged: (v) => setState(() => _seriesName = + v == null + ? null + : seriesOpts + .where((o) => o.id == v) + .map((o) => o.name) + .firstOrNull))), + field( + '规格', + combo( + opts: specOpts, + selectedId: _idByName(specOpts, _specName), + hint: '全部规格', + onChanged: (v) => setState(() => _specName = + v == null + ? null + : specOpts + .where((o) => o.id == v) + .map((o) => o.name) + .firstOrNull))), + ]), + row([ + field('批次号', textField(_batchCtrl, '输入批次号')), + field('状态', statusCombo()), + ]), + row([ + field( + '入库员', + combo( + opts: _userOpts(), + selectedId: _operatorId, + hint: '全部入库员', + onChanged: (v) => + setState(() => _operatorId = v))), + field( + '审核人', + combo( + opts: _userOpts(), + selectedId: _reviewerId, + hint: '全部审核人', + onChanged: (v) => + setState(() => _reviewerId = v))), + ]), row([ field('单据日期', _dateField()), ]), @@ -1749,8 +1737,7 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { child: Row(children: [ DsButton('重置', onPressed: _reset), const Spacer(), - DsButton('取消', - onPressed: () => Navigator.of(context).pop()), + DsButton('取消', onPressed: () => Navigator.of(context).pop()), const SizedBox(width: 10), DsButton('确认', variant: DsBtnVariant.primary, onPressed: _apply), @@ -1783,16 +1770,15 @@ class _AdvSearchDialogState extends ConsumerState<_AdvSearchDialog> { Expanded( child: Text(label, style: TextStyle( - fontSize: AppDims.fsBody, - color: has ? t.text : t.faint)), + fontSize: AppDims.fsBody, color: has ? t.text : t.faint)), ), if (has) GestureDetector( onTap: () => setState(() => _range = null), - child: Icon(Icons.close, size: 14, color: t.muted), + child: Icon(LucideIcons.x, size: 14, color: t.muted), ) else - Icon(Icons.date_range, size: 16, color: t.faint), + Icon(LucideIcons.calendar, size: 16, color: t.faint), ]), ), ); diff --git a/client/lib/screens/stock_out/stock_out_form_screen.dart b/client/lib/screens/stock_out/stock_out_form_screen.dart index 52c31f2..19ce2bb 100644 --- a/client/lib/screens/stock_out/stock_out_form_screen.dart +++ b/client/lib/screens/stock_out/stock_out_form_screen.dart @@ -1,24 +1,30 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -import '../../core/responsive/responsive.dart'; -import '../../core/theme/context_tokens.dart'; + import '../../core/auth/auth_state.dart'; +import '../../core/config/app_constants.dart'; +import '../../core/responsive/responsive.dart'; +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; import '../../core/utils/date_util.dart'; -import '../../widgets/order_print_preview_dialog.dart'; import '../../models/inventory.dart'; import '../../models/stock_out.dart'; -import '../../widgets/date_picker_field.dart'; -import '../../widgets/searchable_option_field.dart'; -import '../../core/config/app_constants.dart'; import '../../providers/inventory_provider.dart'; import '../../providers/partner_provider.dart'; import '../../providers/stock_out_provider.dart'; import '../../providers/warehouse_provider.dart'; +import '../../widgets/ds/ds_atoms.dart'; +import '../../widgets/ds/grid_combo_cell.dart'; import '../../widgets/mobile_list_card.dart'; +import '../../widgets/order_print_preview_dialog.dart'; +import '../../widgets/searchable_option_field.dart'; +import '../shared/order_form_shell.dart'; +import '../../widgets/ds/ds_toast.dart'; // Aggregated per-product inventory item for the picker dialog class _PickerItem { @@ -82,8 +88,11 @@ class _ItemRow { final String series; final String spec; final double? unitPrice; + final double? availableQty; final TextEditingController qtyCtrl; final TextEditingController salePriceCtrl; + final FocusNode qtyFocus = FocusNode(); + final FocusNode saleFocus = FocusNode(); _ItemRow({ this.productId, @@ -92,6 +101,7 @@ class _ItemRow { this.series = '', this.spec = '', this.unitPrice, + this.availableQty, double? salePrice, }) : qtyCtrl = TextEditingController(text: '1'), // 售价默认带出成本单价（无历史售价时），可手工改成实际卖价 @@ -101,12 +111,23 @@ class _ItemRow { : (unitPrice ?? 0)) .toStringAsFixed(2)); + FocusNode focusNode(String field) => field == 'sale' ? saleFocus : qtyFocus; + bool get hasFocus => qtyFocus.hasFocus || saleFocus.hasFocus; + + double get amount => + (double.tryParse(qtyCtrl.text) ?? 0) * + (double.tryParse(salePriceCtrl.text) ?? 0); + void dispose() { qtyCtrl.dispose(); salePriceCtrl.dispose(); + qtyFocus.dispose(); + saleFocus.dispose(); } } +/// 新建 / 修改出库单：照原型 stock-in.html(out 模式) 复刻的内联录单表单。 +/// 明细行经「从库存批量选择」添加，商品/系列/规格/可用只读，仅数量、售价可内联编辑。 class StockOutFormScreen extends ConsumerStatefulWidget { final int? editOrderId; const StockOutFormScreen({super.key, this.editOrderId}); @@ -116,8 +137,9 @@ class StockOutFormScreen extends ConsumerStatefulWidget { } class _StockOutFormScreenState extends ConsumerState { - final _formKey = GlobalKey(); final _remarkCtrl = TextEditingController(); + final _partnerFocus = FocusNode(); + final _warehouseFocus = FocusNode(); int? _warehouseId; int? _partnerId; DateTime _orderDate = DateTime.now(); @@ -127,6 +149,8 @@ class _StockOutFormScreenState extends ConsumerState { List<_PickerItem> _inventoryPickerItems = []; StockOutOrder? _loadedOrder; + static const _fields = ['qty', 'sale']; + final List<_ItemRow> _items = []; bool get _isEdit => widget.editOrderId != null; @@ -134,10 +158,8 @@ class _StockOutFormScreenState extends ConsumerState { @override void initState() { super.initState(); - if (_isEdit) { - _loadEditOrder(); - } - // New orders start with empty list; user adds via dialog + if (_isEdit) _loadEditOrder(); + // 新单起始为空，用户通过「从库存选择」添加明细 } Future _loadEditOrder() async { @@ -145,7 +167,6 @@ class _StockOutFormScreenState extends ConsumerState { try { final order = await ref.read(stockOutRepositoryProvider).get(widget.editOrderId!); - setState(() { _loadedOrder = order; _warehouseId = order.warehouseId; @@ -171,11 +192,7 @@ class _StockOutFormScreenState extends ConsumerState { }); if (_warehouseId != null) await _loadInventory(_warehouseId!); } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('加载失败：$e'), backgroundColor: context.tokens.danger), - ); - } + if (mounted) _snack('加载失败：$e', err: true); } finally { if (mounted) setState(() => _loadingEdit = false); } @@ -184,30 +201,27 @@ class _StockOutFormScreenState extends ConsumerState { @override void dispose() { _remarkCtrl.dispose(); + _partnerFocus.dispose(); + _warehouseFocus.dispose(); for (final item in _items) { item.dispose(); } super.dispose(); } - // 出库单总金额 = 应收 = Σ(售价×数量) double get _totalAmount { double total = 0; for (final item in _items) { - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final sale = double.tryParse(item.salePriceCtrl.text) ?? 0; - total += qty * sale; + total += item.amount; } return total; } Future _loadInventory(int warehouseId) async { try { - final result = await ref - .read(inventoryRepositoryProvider) - .listInventory( - warehouseId: warehouseId, - pageSize: AppConstants.stockOutPickerPageSize); + final result = await ref.read(inventoryRepositoryProvider).listInventory( + warehouseId: warehouseId, + pageSize: AppConstants.stockOutPickerPageSize); setState(() { _inventoryPickerItems = _aggregatePickerItems(result.data); _inventoryMap = { @@ -220,10 +234,7 @@ class _StockOutFormScreenState extends ConsumerState { Future _addItem() async { if (_warehouseId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请先选择出库仓库'), backgroundColor: context.tokens.danger), - ); + _snack('请先选择出库仓库', err: true); return; } final selected = await showDialog>( @@ -244,6 +255,7 @@ class _StockOutFormScreenState extends ConsumerState { series: item.series, spec: item.spec, unitPrice: item.unitPrice, + availableQty: item.availableQty, )); } }); @@ -256,36 +268,86 @@ class _StockOutFormScreenState extends ConsumerState { }); } + void _copyRow(int index) { + final s = _items[index]; + final r = _ItemRow( + productId: s.productId, + productCode: s.productCode, + productName: s.productName, + series: s.series, + spec: s.spec, + unitPrice: s.unitPrice, + availableQty: s.availableQty, + ); + r.salePriceCtrl.text = s.salePriceCtrl.text; + setState(() => _items.insert(index + 1, r)); + WidgetsBinding.instance + .addPostFrameCallback((_) => _focusCell(index + 1, 'qty')); + } + + void _copyFromFocus() { + final idx = _items.indexWhere((r) => r.hasFocus); + if (idx >= 0) _copyRow(idx); + } + + // ── 键盘流 ──────────────────────────────────────────────────────────────── + void _focusCell(int row, String field) { + if (row < 0 || row >= _items.length) return; + _items[row].focusNode(field).requestFocus(); + } + + bool _isEmpty(int row, String field) { + final r = _items[row]; + if (field == 'qty') return r.qtyCtrl.text.trim().isEmpty; + if (field == 'sale') return r.salePriceCtrl.text.trim().isEmpty; + return true; + } + + void _advance(int row, String from) => advanceFocus( + rowIndex: row, + fromField: from, + rowCount: _items.length, + fields: _fields, + isRequired: (_) => true, + isEmpty: _isEmpty, + focusCell: _focusCell, + onAddRow: _addItem, + ); + + void _retreat(int row, String from) => retreatFocus( + rowIndex: row, + fromField: from, + fields: _fields, + focusCell: _focusCell, + ); + + bool _onTab(int row, String field, {required bool backward}) { + if (backward) { + _retreat(row, field); + } else { + _advance(row, field); + } + return true; + } + Future _printOrder() async { if (_loadedOrder == null) return; await showStockOutOrderPrint(context, ref, _loadedOrder!); } Future _submit(bool asDraft) async { - if (!asDraft && !_formKey.currentState!.validate()) return; if (_warehouseId == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请选择出库仓库'), backgroundColor: context.tokens.danger), - ); + _snack('请选择出库仓库', err: true); return; } if (_items.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: const Text('请添加商品明细'), backgroundColor: context.tokens.danger), - ); + _snack('请添加商品明细', err: true); return; } - final invalidQtyIndex = _items - .indexWhere((item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0); - if (invalidQtyIndex >= 0) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('第 ${invalidQtyIndex + 1} 行数量必须大于 0'), - backgroundColor: context.tokens.danger, - ), - ); + final invalidQty = + _items.indexWhere((it) => (double.tryParse(it.qtyCtrl.text) ?? 0) <= 0); + if (invalidQty >= 0) { + _snack('第 ${invalidQty + 1} 行数量必须大于 0', err: true); return; } @@ -323,26 +385,21 @@ class _StockOutFormScreenState extends ConsumerState { await ref.read(stockOutListProvider.notifier).createOrder(data); } if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(asDraft ? '已保存为草稿' : '出库单已提交审核'), - backgroundColor: context.tokens.success, - ), - ); + _snack(asDraft ? '已保存为草稿' : '出库单已提交审核'); context.go('/stock-out'); } } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('操作失败：$e'), backgroundColor: context.tokens.danger), - ); - } + if (mounted) _snack('操作失败：$e', err: true); } finally { if (mounted) setState(() => _submitting = false); } } - /// 是否有值得保留的录入（用于退出前判断是否提示保存草稿）。 + void _snack(String msg, {bool err = false}) { + showDsToast(context, msg, + bg: err ? context.tokens.danger : context.tokens.success); + } + bool get _isDirty { if (_remarkCtrl.text.trim().isNotEmpty) return true; if (_warehouseId != null) return true; @@ -353,7 +410,6 @@ class _StockOutFormScreenState extends ConsumerState { return false; } - /// 退出前处理：无录入直接离开；有未保存录入则提示「保存草稿 / 放弃 / 继续编辑」。 Future _handleExit() async { if (!_isDirty) { context.go('/stock-out'); @@ -366,18 +422,13 @@ class _StockOutFormScreenState extends ConsumerState { content: Text(_isEdit ? '当前修改尚未保存。是否保存为草稿？' : '当前出库单尚未提交。是否保存为草稿，以免内容丢失？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop('edit'), - child: const Text('继续编辑'), - ), - TextButton( - onPressed: () => Navigator.of(ctx).pop('discard'), - child: Text('放弃', style: TextStyle(color: ctx.tokens.danger)), - ), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop('draft'), - child: const Text('保存草稿'), - ), + DsButton('继续编辑', onPressed: () => Navigator.of(ctx).pop('edit')), + DsButton('放弃', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop('discard')), + DsButton('保存草稿', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop('draft')), ], ), ); @@ -388,554 +439,370 @@ class _StockOutFormScreenState extends ConsumerState { } } + // ── 构建 ────────────────────────────────────────────────────────────────── @override Widget build(BuildContext context) { - final asyncWarehouses = ref.watch(warehouseListProvider); - final asyncCustomers = ref.watch(customerListProvider); final currentUser = ref.watch(authStateProvider).user; - final isMobile = context.isMobile; + final mobile = context.isMobile; + + final deskActions = [ + if (_isEdit && _loadedOrder != null) + DsButton('打印', + icon: LucideIcons.printer, + variant: DsBtnVariant.ghost, + onPressed: _printOrder), + DsButton('暂存草稿', + variant: DsBtnVariant.ghost, + onPressed: _submitting ? null : () => _submit(true)), + DsButton('提交审核', + icon: LucideIcons.send, + variant: DsBtnVariant.primary, + onPressed: _submitting ? null : () => _submit(false)), + DsButton('取消', variant: DsBtnVariant.ghost, onPressed: _handleExit), + ]; + final mobileActions = [ + DsButton('提交', + variant: DsBtnVariant.primary, + onPressed: _submitting ? null : () => _submit(false)), + PopupMenuButton( + onSelected: (v) { + switch (v) { + case 'draft': + _submit(true); + break; + case 'print': + _printOrder(); + break; + case 'cancel': + _handleExit(); + break; + } + }, + itemBuilder: (_) => [ + const PopupMenuItem(value: 'draft', child: Text('保存草稿')), + if (_isEdit && _loadedOrder != null) + const PopupMenuItem(value: 'print', child: Text('打印')), + const PopupMenuItem(value: 'cancel', child: Text('取消')), + ], + ), + ]; return PopScope( canPop: false, onPopInvokedWithResult: (didPop, _) { if (!didPop) _handleExit(); }, - child: Scaffold( - backgroundColor: context.tokens.bg, - body: Column( - children: [ - Container( - height: 52, - color: context.tokens.surface, - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Row( - children: [ - IconButton( - icon: const Icon(Icons.arrow_back, size: 20), - onPressed: _handleExit, - tooltip: '返回', - ), - const SizedBox(width: 8), - Text(_isEdit ? '修改出库单' : '新建出库单', - style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.w600)), - const Spacer(), - // 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏 - if (isMobile) ...[ - ElevatedButton( - onPressed: _submitting ? null : () => _submit(false), - child: _submitting - ? const SizedBox( - width: 14, - height: 14, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Text('提交'), - ), - PopupMenuButton( - onSelected: (v) { - switch (v) { - case 'draft': - _submit(true); - break; - case 'print': - _printOrder(); - break; - case 'cancel': - _handleExit(); - break; - } - }, - itemBuilder: (_) => [ - const PopupMenuItem( - value: 'draft', child: Text('保存草稿')), - if (_isEdit && _loadedOrder != null) - const PopupMenuItem( - value: 'print', child: Text('打印')), - const PopupMenuItem(value: 'cancel', child: Text('取消')), - ], - ), - ] else ...[ - if (_isEdit && _loadedOrder != null) ...[ - OutlinedButton.icon( - onPressed: _printOrder, - icon: const Icon(Icons.print_outlined, size: 16), - label: const Text('打印'), - ), - const SizedBox(width: 8), - ], - OutlinedButton( - onPressed: _submitting ? null : () => _submit(true), - child: const Text('保存草稿'), - ), - const SizedBox(width: 8), - ElevatedButton.icon( - onPressed: _submitting ? null : () => _submit(false), - icon: _submitting - ? const SizedBox( - width: 14, - height: 14, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : const Icon(Icons.send, size: 16), - label: const Text('提交审核'), - ), - const SizedBox(width: 8), - OutlinedButton.icon( - onPressed: _handleExit, - icon: const Icon(Icons.cancel_outlined, size: 16), - label: const Text('取消'), - ), - ], - ], - ), - ), - const Divider(height: 1), - if (_loadingEdit) - const Expanded(child: Center(child: CircularProgressIndicator())), - if (!_loadingEdit) - Expanded( - child: SingleChildScrollView( - padding: const EdgeInsets.all(16), - child: Form( - key: _formKey, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('基本信息', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const SizedBox(height: 16), - Wrap( - spacing: 16, - runSpacing: 16, - children: [ - _FormField( - label: '出库仓库', - required: true, - child: asyncWarehouses.when( - loading: () => - const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (warehouses) => - SearchableOptionField( - options: warehouses - .map((w) => OptionItem( - id: w.id, name: w.name)) - .toList(), - selectedId: _warehouseId, - hint: '请选择仓库', - dialogTitle: '选择出库仓库', - isRequired: true, - onChanged: (v) { - setState(() => _warehouseId = v); - if (v != null) _loadInventory(v); - }, - ), - ), - ), - _FormField( - label: '客户', - child: asyncCustomers.when( - loading: () => - const LinearProgressIndicator(), - error: (_, __) => const Text('加载失败'), - data: (result) => - SearchableOptionField( - options: result.data - .map((p) => OptionItem( - id: p.id, - name: p.name, - code: p.code)) - .toList(), - selectedId: _partnerId, - hint: '请选择客户', - dialogTitle: '选择客户', - onSearch: (kw) async { - final res = await ref - .read(partnerRepositoryProvider) - .list( - type: 'customer', - keyword: kw, - pageSize: 50); - return res.data - .map((p) => OptionItem( - id: p.id, - name: p.name, - code: p.code)) - .toList(); - }, - onChanged: (v) => - setState(() => _partnerId = v), - ), - ), - ), - _FormField( - label: '出库员', - child: InputDecorator( - decoration: const InputDecoration(), - child: Text( - currentUser?.realName ?? '-', - style: const TextStyle(fontSize: 13), - ), - ), - ), - _FormField( - label: '出库日期', - required: true, - width: 320, - child: DatePickerField( - value: formatYmd(_orderDate), - onChanged: (v) { - final d = parseYmd(v); - if (d != null) - setState(() => _orderDate = d); - }, - ), - ), - ], - ), - const SizedBox(height: 16), - _FormField( - label: '备注', - width: double.infinity, - child: TextFormField( - controller: _remarkCtrl, - maxLines: 2, - decoration: const InputDecoration( - hintText: '选填，如有特殊说明请在此注明', - ), - ), - ), - ], - ), - ), - ), - const SizedBox(height: 12), - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text('商品明细', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark)), - const Spacer(), - ElevatedButton.icon( - onPressed: _addItem, - icon: const Icon(Icons.add, size: 16), - label: const Text('添加商品'), - style: ElevatedButton.styleFrom( - minimumSize: const Size(0, 32)), - ), - ], - ), - const SizedBox(height: 12), - // 窄屏：逐项卡片竖排，避免 9 列表格横向溢出；宽屏保持表格 - if (isMobile) - Column( - children: List.generate( - _items.length, - (i) => Padding( - padding: const EdgeInsets.only( - bottom: 10), - child: _buildItemCard(i), - )), - ) - else - Table( - columnWidths: const { - 0: FixedColumnWidth(36), // 序号 - 1: FlexColumnWidth(1.2), // 商品编码 - 2: FlexColumnWidth(2.0), // 商品名称 - 3: FlexColumnWidth(1.2), // 系列 - 4: FlexColumnWidth(1.2), // 规格 - 5: FlexColumnWidth(1.0), // 成本价 - 6: FlexColumnWidth(1.0), // 售价 - 7: FlexColumnWidth(0.8), // 数量 - 8: FlexColumnWidth(1.0), // 金额 - 9: FixedColumnWidth(48), // 操作 - }, - children: [ - TableRow( - decoration: BoxDecoration( - color: context.tokens.thBg), - children: [ - '序号', - '商品编码', - '商品名称', - '系列', - '规格', - '成本价', - '售价', - '数量', - '金额', - '操作', - ] - .map((h) => Padding( - padding: const EdgeInsets - .symmetric( - horizontal: 8, - vertical: 10), - child: Text(h, - style: TextStyle( - fontSize: 13, - fontWeight: - FontWeight.w600, - color: context - .tokens.primaryDark)), - )) - .toList(), - ), - ...List.generate(_items.length, - (i) => _buildItemRow(i)), - ], - ), - if (_items.isEmpty) - Padding( - padding: const EdgeInsets.symmetric(vertical: 24), - child: Center( - child: Text('暂无商品，点击"添加商品"从库存中选择', - style: TextStyle( - color: context.tokens.muted, - fontSize: 13))), - ), - const Divider(height: 1), - Padding( - padding: const EdgeInsets.only(top: 12), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - const Text('合计金额：', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500)), - Text( - '¥${_totalAmount.toStringAsFixed(2)}', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w700, - color: context.tokens.danger), - ), - ], - ), - ), - ], - ), - ), - ), - ], - ), - ), - ), - ), - ], + child: FocusableActionDetector( + shortcuts: const { + SingleActivator(LogicalKeyboardKey.enter, meta: true): + _SubmitIntent(), + SingleActivator(LogicalKeyboardKey.enter, control: true): + _SubmitIntent(), + SingleActivator(LogicalKeyboardKey.keyD, meta: true): _CopyIntent(), + SingleActivator(LogicalKeyboardKey.keyD, control: true): + _CopyIntent(), + }, + actions: { + _SubmitIntent: CallbackAction<_SubmitIntent>( + onInvoke: (_) => _submitting ? null : _submit(false)), + _CopyIntent: + CallbackAction<_CopyIntent>(onInvoke: (_) => _copyFromFocus()), + }, + child: OrderFormShell( + title: _isEdit ? '修改出库单' : '新建出库单', + onBack: _handleExit, + loading: _loadingEdit, + deskActions: deskActions, + mobileActions: mobileActions, + rowsLabel: '明细 ${_items.length} 行', + totalText: '¥${_totalAmount.toStringAsFixed(2)}', + docHead: _buildDocHead(currentUser?.realName ?? '-'), + detailHead: DetailHead(actions: [ + DsButton('从库存选择', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + small: true, + onPressed: _addItem), + ]), + detail: mobile ? _buildMobileCards() : _buildGrid(), ), ), ); } - TableRow _buildItemRow(int index) { - final item = _items[index]; - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = item.unitPrice ?? 0; - final sale = double.tryParse(item.salePriceCtrl.text) ?? 0; - final amount = qty * sale; - - return TableRow( - decoration: BoxDecoration( - color: index.isEven ? context.tokens.surface : context.tokens.bg, - ), - children: [ - // 序号 - _cell(Text('${index + 1}', - style: - TextStyle(fontSize: 13, color: context.tokens.muted))), - // 商品编码 - _cell(Text(item.productCode, - style: - TextStyle(fontSize: 12, color: context.tokens.muted))), - // 商品名称 - _cell(Text(item.productName, - style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500), - overflow: TextOverflow.ellipsis)), - // 系列 - _cell(Text(item.series, - style: - TextStyle(fontSize: 12, color: context.tokens.muted))), - // 规格 - _cell(Text(item.spec, - style: - TextStyle(fontSize: 12, color: context.tokens.muted))), - // 成本价 - _cell(Text(price > 0 ? '¥${price.toStringAsFixed(2)}' : '-', - style: TextStyle( - fontSize: 13, color: context.tokens.muted))), - // 售价（可编辑） - Padding( - padding: const EdgeInsets.all(4), child: _salePriceField(item)), - // 数量 - Padding(padding: const EdgeInsets.all(4), child: _qtyField(item)), - // 金额（=售价×数量） - _cell(Text('¥${amount.toStringAsFixed(2)}', - style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500))), - // 操作 - Padding( - padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4), - child: IconButton( - icon: Icon(Icons.delete_outline, - size: 18, color: context.tokens.danger), - onPressed: () => _removeItem(index), - tooltip: '删除', - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), + Widget _buildDocHead(String handler) { + final asyncWarehouses = ref.watch(warehouseListProvider); + // 往来单位一次取全部（allPartnersProvider，pageSize 1000）本地过滤； + // 历史 type 不可靠，按 type 过滤会漏项，故与列表页一致用全量。 + final asyncCustomers = ref.watch(allPartnersProvider); + final wName = asyncWarehouses.valueOrNull + ?.where((w) => w.id == _warehouseId) + .firstOrNull + ?.name ?? + '—'; + final summary = '$wName · ${formatYmd(_orderDate)}'; + return DocHeadCard( + summary: summary, + fields: [ + DocField( + label: '客户', + child: asyncCustomers.when( + loading: () => const LinearProgressIndicator(), + error: (_, __) => const Text('加载失败'), + data: (result) => GridComboCell( + focusNode: _partnerFocus, + hint: '选择或搜索往来单位…', + searchHint: '搜索客户…', + showCount: true, + allowCreate: true, + options: result.data + .map((p) => OptionItem(id: p.id, name: p.name, code: p.code)) + .toList(), + selectedId: _partnerId, + onCreate: (kw) async { + final p = await ref + .read(partnerRepositoryProvider) + .create({'name': kw, 'type': 'customer'}); + ref.read(allPartnersProvider.notifier).reload(); + return p.id; + }, + onChanged: (v) => setState(() => _partnerId = v), + ), ), ), + DocField( + label: '出库仓库', + required: true, + child: asyncWarehouses.when( + loading: () => const LinearProgressIndicator(), + error: (_, __) => const Text('加载失败'), + data: (warehouses) => GridComboCell( + focusNode: _warehouseFocus, + hint: '选择仓库…', + searchHint: '搜索仓库…', + options: warehouses + .map((w) => OptionItem(id: w.id, name: w.name)) + .toList(), + selectedId: _warehouseId, + onChanged: (v) { + setState(() => _warehouseId = v); + if (v != null) _loadInventory(v); + }, + ), + ), + ), + DocField( + label: '单据日期', + required: true, + child: DsDateCell( + value: formatYmd(_orderDate), + onChanged: (v) { + final d = parseYmd(v); + if (d != null) setState(() => _orderDate = d); + }, + ), + ), + DocField(label: '出库员', child: RoValue(handler)), + ], + remark: DocField( + label: '备注', + child: TextField( + controller: _remarkCtrl, + maxLines: 2, + style: + TextStyle(fontSize: AppDims.fsBody, color: context.tokens.text), + decoration: InputDecoration( + hintText: '选填，如有特殊说明请在此注明', + hintStyle: TextStyle( + fontSize: AppDims.fsBody, color: context.tokens.faint), + filled: true, + fillColor: context.tokens.surface, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: context.tokens.border), + ), + ), + ), + ), + ); + } + + // ── 桌面：内联网格 ───────────────────────────────────────────────────────── + static const _columns = [ + GridCol('idx', '#', width: 38), + GridCol('name', '商品名称'), + GridCol('series', '系列', width: 116), + GridCol('spec', '规格', width: 128), + GridCol('avail', '可用', width: 92, num: true), + GridCol('qty', '数量', width: 82, num: true, req: true), + GridCol('price', '进价', width: 100, num: true), + GridCol('sale', '售价', width: 108, num: true, req: true), + GridCol('amount', '金额', width: 110, num: true), + GridCol('act', '', width: 62), + ]; + + Widget _buildGrid() { + if (_items.isEmpty) { + return Container( + decoration: BoxDecoration( + color: context.tokens.surface, + border: Border.all(color: context.tokens.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + padding: const EdgeInsets.symmetric(vertical: 40), + child: Center( + child: Column( + children: [ + Text('暂无商品', + style: TextStyle( + fontSize: AppDims.fsBody, color: context.tokens.muted)), + const SizedBox(height: 10), + DsButton('从库存选择', + icon: LucideIcons.plus, + variant: DsBtnVariant.primary, + small: true, + onPressed: _addItem), + ], + ), + ), + ); + } + return OrderGridTable( + columns: _columns, + rowCount: _items.length, + rowHasError: (_) => false, + onAddRow: _addItem, + cellBuilder: _cell, + ); + } + + Widget _cell(int i, String key) { + final item = _items[i]; + final t = context.tokens; + switch (key) { + case 'idx': + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8), + child: Text('${i + 1}', + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ); + case 'name': + return RoCell(item.productName, color: t.heading); + case 'series': + return RoCell(item.series); + case 'spec': + return RoCell(item.spec); + case 'avail': + final avail = item.availableQty ?? _inventoryMap[item.productId]; + return RoCell( + avail != null ? avail.toStringAsFixed(0) : '—', + num: true, + color: avail == null ? t.faint : (avail <= 0 ? t.danger : t.primary), + ); + case 'qty': + return GciField( + controller: item.qtyCtrl, + focusNode: item.qtyFocus, + num: true, + hint: '0', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'qty'), + onTab: ({required backward}) => _onTab(i, 'qty', backward: backward), + ); + case 'price': + return RoCell( + (item.unitPrice ?? 0) > 0 + ? '¥${item.unitPrice!.toStringAsFixed(2)}' + : '—', + num: true, + ); + case 'sale': + return GciField( + controller: item.salePriceCtrl, + focusNode: item.saleFocus, + num: true, + money: true, + hint: '0.00', + onChanged: (_) => setState(() {}), + onEnter: () => _advance(i, 'sale'), + onTab: ({required backward}) => _onTab(i, 'sale', backward: backward), + ); + case 'amount': + return AmountCell(amount: item.amount); + case 'act': + return RowActions( + onCopy: () => _copyRow(i), + onDelete: () => _removeItem(i), + ); + } + return const SizedBox.shrink(); + } + + // ── 窄屏：卡片流 ─────────────────────────────────────────────────────────── + Widget _buildMobileCards() { + return Column( + children: [ + for (var i = 0; i < _items.length; i++) + Padding( + padding: const EdgeInsets.only(bottom: 10), + child: _mobileCard(i), + ), + DsButton('从库存选择', + icon: LucideIcons.plus, + variant: DsBtnVariant.ghost, + onPressed: _addItem), ], ); } - Widget _qtyField(_ItemRow item) { - return TextFormField( - controller: item.qtyCtrl, - decoration: const InputDecoration(hintText: '0', isDense: true), - style: const TextStyle(fontSize: 13), - keyboardType: const TextInputType.numberWithOptions(decimal: true), - inputFormatters: [ - FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}')) - ], - onChanged: (_) => setState(() {}), - validator: (v) { - if (v == null || v.isEmpty) return '不能为空'; - if ((double.tryParse(v) ?? 0) <= 0) return '>0'; - return null; - }, - ); - } - - // 售价输入：可编辑，金额(应收)按 售价×数量 联动 - Widget _salePriceField(_ItemRow item) { - return TextFormField( - controller: item.salePriceCtrl, - decoration: const InputDecoration(hintText: '0.00', isDense: true), - style: const TextStyle(fontSize: 13), - keyboardType: const TextInputType.numberWithOptions(decimal: true), - inputFormatters: [ - FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}')) - ], - onChanged: (_) => setState(() {}), - ); - } - - /// 窄屏（手机）：每个明细行渲染为一张卡片，字段竖排，避免表格横向溢出。 - Widget _buildItemCard(int index) { - final item = _items[index]; - final qty = double.tryParse(item.qtyCtrl.text) ?? 0; - final price = item.unitPrice ?? 0; - final sale = double.tryParse(item.salePriceCtrl.text) ?? 0; - final amount = qty * sale; - + Widget _mobileCard(int i) { + final item = _items[i]; + final avail = item.availableQty ?? _inventoryMap[item.productId]; return MobileListCard( title: Text(item.productName), subtitle: item.productCode.isNotEmpty ? Text('编码 ${item.productCode}') : null, trailing: IconButton( - icon: - Icon(Icons.delete_outline, size: 20, color: context.tokens.danger), - onPressed: () => _removeItem(index), + icon: Icon(LucideIcons.trash2, size: 20, color: context.tokens.danger), + onPressed: () => _removeItem(i), tooltip: '删除', visualDensity: VisualDensity.compact, ), fields: [ if (item.series.isNotEmpty) MobileCardField('系列', item.series), if (item.spec.isNotEmpty) MobileCardField('规格', item.spec), + MobileCardField('可用', avail != null ? avail.toStringAsFixed(0) : '—'), MobileCardField( - '成本价', price > 0 ? '¥${price.toStringAsFixed(2)}' : '-'), - MobileCardField('售价', null, valueWidget: _salePriceField(item)), - MobileCardField('数量', null, valueWidget: _qtyField(item)), - MobileCardField('金额', '¥${amount.toStringAsFixed(2)}'), + '进价', + (item.unitPrice ?? 0) > 0 + ? '¥${item.unitPrice!.toStringAsFixed(2)}' + : '—'), + MobileCardField('数量', null, + valueWidget: GciField( + controller: item.qtyCtrl, + num: true, + hint: '0', + onChanged: (_) => setState(() {}))), + MobileCardField('售价', null, + valueWidget: GciField( + controller: item.salePriceCtrl, + num: true, + money: true, + hint: '0.00', + onChanged: (_) => setState(() {}))), + MobileCardField('金额', '¥${item.amount.toStringAsFixed(2)}'), ], ); } - - Widget _cell(Widget child) => Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12), - child: child, - ); - - Widget _buildInventoryCell(int? productId, [double? available]) { - if (productId == null) { - return _cell(Text('-', - style: TextStyle(color: context.tokens.muted, fontSize: 13))); - } - final qty = available ?? _inventoryMap[productId]; - final text = qty != null - ? qty.toStringAsFixed(0) - : (_warehouseId == null ? '选仓库后显示' : '-'); - final color = qty == null - ? context.tokens.muted - : qty <= 0 - ? context.tokens.danger - : context.tokens.primary; - return _cell(Text(text, - style: TextStyle( - fontSize: 13, fontWeight: FontWeight.w700, color: color))); - } } -class _FormField extends StatelessWidget { - final String label; - final Widget child; - final bool required; - final double width; +// ── 意图（键盘快捷键）──────────────────────────────────────────────────────── +class _SubmitIntent extends Intent { + const _SubmitIntent(); +} - const _FormField({ - required this.label, - required this.child, - this.required = false, - this.width = 240, - }); - - @override - Widget build(BuildContext context) { - // 窄屏（手机）字段占满整行，便于点选；宽屏沿用固定宽度配合 Wrap 多列。 - final effectiveWidth = width == double.infinity - ? double.infinity - : (context.isMobile ? MediaQuery.sizeOf(context).width - 64 : width); - return SizedBox( - width: effectiveWidth, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - if (required) - Text('*', - style: TextStyle(color: context.tokens.danger, fontSize: 13)), - Text(label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), - ], - ), - const SizedBox(height: 6), - child, - ], - ), - ); - } +class _CopyIntent extends Intent { + const _CopyIntent(); } class _InventoryPickerDialog extends ConsumerStatefulWidget { @@ -953,25 +820,21 @@ class _InventoryPickerDialogState final _searchCtrl = TextEditingController(); String _search = ''; final Set _selected = {}; - // 服务端搜索结果（替代一次性拉全部本地过滤）；初始用调用方已加载的首屏 late List<_PickerItem> _results = widget.items; - // 已见过的条目（跨多次搜索），用于确认时按 productId 还原所选 late final Map _known = { for (final it in widget.items) it.productId: it }; bool _loading = false; Timer? _debounce; - // 服务端分页：默认第 1 页 20 条；_total 为当前筛选下的库存总数 static const int _pageSize = 20; int _page = 1; int _total = 0; - int get _totalPages => _total <= 0 ? 1 : ((_total + _pageSize - 1) ~/ _pageSize); + int get _totalPages => + _total <= 0 ? 1 : ((_total + _pageSize - 1) ~/ _pageSize); @override void initState() { super.initState(); - // 打开即拉取第 1 页（默认前 20 条），不依赖调用方预加载，避免默认空白。 - // 用首帧后回调，避开 initState 同步段调用 setState。 WidgetsBinding.instance.addPostFrameCallback((_) { if (mounted) _fetch(); }); @@ -991,7 +854,6 @@ class _InventoryPickerDialogState } void _onSearchChanged(String v) { - // 改搜索词回到第 1 页 setState(() { _search = v; _page = 1; @@ -1040,7 +902,6 @@ class _InventoryPickerDialogState height: 580, child: Column( children: [ - // Header Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), child: Row( @@ -1050,11 +911,11 @@ class _InventoryPickerDialogState TextStyle(fontSize: 15, fontWeight: FontWeight.w600)), const SizedBox(width: 8), Text('已选 ${_selected.length} 个', - style: TextStyle( - fontSize: 13, color: context.tokens.muted)), + style: + TextStyle(fontSize: 13, color: context.tokens.muted)), const Spacer(), IconButton( - icon: const Icon(Icons.close, size: 20), + icon: const Icon(LucideIcons.x, size: 20), onPressed: () => Navigator.pop(context), padding: EdgeInsets.zero, constraints: @@ -1064,14 +925,13 @@ class _InventoryPickerDialogState ), ), const Divider(height: 1), - // Search bar Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10), child: TextField( controller: _searchCtrl, decoration: InputDecoration( hintText: '搜索商品编码、名称或系列', - prefixIcon: const Icon(Icons.search, size: 18), + prefixIcon: const Icon(LucideIcons.search, size: 18), suffixIcon: _loading ? const Padding( padding: EdgeInsets.all(12), @@ -1089,7 +949,6 @@ class _InventoryPickerDialogState onChanged: _onSearchChanged, ), ), - // Table header Container( color: context.tokens.thBg, padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), @@ -1100,13 +959,12 @@ class _InventoryPickerDialogState _headerCell('商品名称', 200), _headerCell('系列', 110), _headerCell('规格', 130), - _headerCell('单价', 90), + _headerCell('进价', 90), _headerCell('库存', 90), ], ), ), const Divider(height: 1), - // List Expanded( child: filtered.isEmpty ? Center( @@ -1175,7 +1033,6 @@ class _InventoryPickerDialogState ), ), const Divider(height: 1), - // Footer Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), child: Row( @@ -1193,16 +1050,13 @@ class _InventoryPickerDialogState child: Text(allSelected ? '取消全选' : '全选当前'), ), const SizedBox(width: 8), - // 库存总数汇总（无搜索=整仓总数，搜索时=匹配总数） Text( _loading ? '加载中…' : '共 $_total 项库存商品', - style: TextStyle( - fontSize: 13, color: context.tokens.muted), + style: TextStyle(fontSize: 13, color: context.tokens.muted), ), const SizedBox(width: 12), - // 翻页 IconButton( - icon: const Icon(Icons.chevron_left, size: 20), + icon: const Icon(LucideIcons.chevronLeft, size: 20), onPressed: (_page > 1 && !_loading) ? () => _goPage(_page - 1) : null, @@ -1215,7 +1069,7 @@ class _InventoryPickerDialogState Text('第 $_page / $_totalPages 页', style: const TextStyle(fontSize: 13)), IconButton( - icon: const Icon(Icons.chevron_right, size: 20), + icon: const Icon(LucideIcons.chevronRight, size: 20), onPressed: (_page < _totalPages && !_loading) ? () => _goPage(_page + 1) : null, diff --git a/client/lib/screens/stock_out/stock_out_list_screen.dart b/client/lib/screens/stock_out/stock_out_list_screen.dart index fde751d..217c803 100644 --- a/client/lib/screens/stock_out/stock_out_list_screen.dart +++ b/client/lib/screens/stock_out/stock_out_list_screen.dart @@ -16,7 +16,8 @@ import '../../core/auth/auth_state.dart' show isAdminProvider, currentUserIdProvider; import '../../models/stock_out.dart'; import '../../providers/stock_out_provider.dart'; -import '../../providers/finance_provider.dart' show financeRepositoryProvider; +import '../../providers/finance_provider.dart' + show financeRepositoryProvider, financePartnerRowsProvider; import '../../providers/partner_provider.dart' show allPartnersProvider; import '../../providers/warehouse_provider.dart' show warehouseListProvider; import '../../providers/user_provider.dart' show userListProvider; @@ -38,6 +39,8 @@ import '../../widgets/order_row_actions.dart'; import '../../widgets/order_return_dialog.dart'; import '../../widgets/wheel_date_picker.dart'; import '../../widgets/write_guard.dart'; +import '../../core/theme/app_fonts.dart'; +import '../../widgets/ds/ds_toast.dart'; /// 出库管理列表屏（照原型 stock-out-list.html 重建）。 /// 单视图（无双 tab）：审核并入状态筛选 + KPI「待审核」卡点击筛选。 @@ -46,8 +49,7 @@ class StockOutListScreen extends ConsumerStatefulWidget { const StockOutListScreen({super.key}); @override - ConsumerState createState() => - _StockOutListScreenState(); + ConsumerState createState() => _StockOutListScreenState(); } class _StockOutListScreenState extends ConsumerState { @@ -74,7 +76,13 @@ class _StockOutListScreenState extends ConsumerState { int? _reviewerId; String _returnState = ''; // '' / partial / full（退单状态，走 detail 服务端过滤） - static const _knownStatuses = {'', 'draft', 'pending', 'approved', 'rejected'}; + static const _knownStatuses = { + '', + 'draft', + 'pending', + 'approved', + 'rejected' + }; static const _statusOptions = <(String, String)>[ ('', '全部'), ('draft', '草稿'), @@ -168,8 +176,9 @@ class _StockOutListScreenState extends ConsumerState { ? DateFormat('yyyy-MM-dd').format(_dateRange!.start) : null; - String? get _endDate => - _dateRange != null ? DateFormat('yyyy-MM-dd').format(_dateRange!.end) : null; + String? get _endDate => _dateRange != null + ? DateFormat('yyyy-MM-dd').format(_dateRange!.end) + : null; /// 只更新 detail 轴（客户快捷筛选）。 void _applyDetail() { @@ -244,7 +253,8 @@ class _StockOutListScreenState extends ConsumerState { start: now.subtract(const Duration(days: 29)), end: now); break; case '本月': - range = DateTimeRange(start: DateTime(now.year, now.month, 1), end: now); + range = + DateTimeRange(start: DateTime(now.year, now.month, 1), end: now); break; default: // 全部时间 range = null; @@ -281,24 +291,22 @@ class _StockOutListScreenState extends ConsumerState { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.cloud_off, size: 40, color: context.tokens.muted), + Icon(LucideIcons.cloudOff, size: 40, color: context.tokens.muted), const SizedBox(height: 12), Text('加载失败：$e', style: TextStyle(color: context.tokens.muted), textAlign: TextAlign.center), const SizedBox(height: 12), - ElevatedButton( - onPressed: () => - ref.read(stockOutListProvider.notifier).reload(), - child: const Text('重试'), - ), + DsButton('重试', + variant: DsBtnVariant.primary, + onPressed: () => + ref.read(stockOutListProvider.notifier).reload()), ], ), ), data: (result) => Stack( children: [ - _buildLoaded( - result.data, result.total, result.page, result.pageSize), + _buildLoaded(result.data, result.total, result.page, result.pageSize), if (asyncOrders.isLoading) const Positioned.fill(child: DsLoadingScrim()), ], @@ -316,80 +324,91 @@ class _StockOutListScreenState extends ConsumerState { .toList(); } - return Column( - children: [ - _buildHeader(total), - _buildKpis(), - const Divider(height: 1), - Expanded( - child: DsTable( - total: total, - page: page, - pageSize: pageSize, - onPageChanged: (p) => - ref.read(stockOutListProvider.notifier).setPage(p), - onPageSizeChanged: (s) => - ref.read(stockOutListProvider.notifier).setPageSize(s), - toolbar: _buildToolbar(orders), - emptyText: '没有匹配的出库单 · 试试调整筛选或搜索', - columns: const [ - DsColumn('order_no', '单号'), - DsColumn('customer', '客户'), - DsColumn('warehouse', '仓库'), - DsColumn('amount', '合计金额', numeric: true), - DsColumn('status', '状态'), - DsColumn('date', '出库时间'), - DsColumn('operator', '出库员'), - DsColumn('reviewer', '审核员'), - DsColumn('actions', '操作', action: true), - ], - rows: orders - .map((o) => DsRow( - onTap: () => _showDetail(context, o.id), - cells: [ - _cellOrderNo(o), - Text(o.partnerName ?? '-'), - Text(o.warehouseName ?? '-'), - Text( - o.totalAmount != null - ? '¥${o.totalAmount!.toStringAsFixed(2)}' - : '-', - style: const TextStyle(fontFamily: 'monospace')), - _cellStatus(o), - Text(o.orderDate?.substring(0, 10) ?? '-', - style: TextStyle( - color: context.tokens.muted, - fontSize: AppDims.fsSm)), - Text(o.operatorName ?? '-'), - Text(o.reviewerName ?? '-'), - // 原型：操作列只放眼睛，点开右侧详情抽屉。 - IconButton( - icon: Icon(LucideIcons.eye, - size: 16, color: context.tokens.muted), - tooltip: '详情', - splashRadius: 18, - constraints: const BoxConstraints( - minWidth: 32, minHeight: 32), - padding: EdgeInsets.zero, - onPressed: () => _showDetail(context, o.id), - ), - ], - )) - .toList(), - mobileCards: orders.map((o) => _orderCard(context, o)).toList(), - ), - ), - ], - ); + return Container( + color: context.tokens.bg, + padding: context.isMobile + ? EdgeInsets.zero + // 原型 .main{padding:22px 26px} + : const EdgeInsets.fromLTRB(26, 22, 26, 22), + child: Column( + children: [ + _buildHeader(total), + _buildKpis(), + Expanded( + child: DsTable( + total: total, + page: page, + pageSize: pageSize, + onPageChanged: (p) => + ref.read(stockOutListProvider.notifier).setPage(p), + onPageSizeChanged: (s) => + ref.read(stockOutListProvider.notifier).setPageSize(s), + toolbar: _buildToolbar(orders), + emptyText: '没有匹配的出库单 · 试试调整筛选或搜索', + columns: const [ + DsColumn('order_no', '单号'), + DsColumn('customer', '客户'), + DsColumn('warehouse', '仓库'), + DsColumn('amount', '合计金额', numeric: true), + DsColumn('status', '状态'), + DsColumn('date', '出库时间'), + DsColumn('operator', '出库员'), + DsColumn('reviewer', '审核员'), + DsColumn('actions', '操作', action: true), + ], + rows: orders + .map((o) => DsRow( + onTap: () => _showDetail(context, o.id), + cells: [ + _cellOrderNo(o), + Text(o.partnerName ?? '-'), + Text(o.warehouseName ?? '-'), + Text( + o.totalAmount != null + ? '¥${NumberFormat('#,##0').format(o.totalAmount)}' + : '—', + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + _cellStatus(o), + Text(o.orderDate?.substring(0, 10) ?? '-', + style: TextStyle( + color: context.tokens.muted, + fontSize: AppDims.fsSm)), + Text(o.operatorName ?? '-'), + Text(o.reviewerName ?? '—', + style: o.reviewerName == null + ? TextStyle(color: context.tokens.faint) + : null), + // 原型：操作列只放眼睛，点开右侧详情抽屉。 + IconButton( + icon: Icon(LucideIcons.eye, + size: 16, color: context.tokens.muted), + tooltip: '详情', + splashRadius: 18, + constraints: const BoxConstraints( + minWidth: 32, minHeight: 32), + padding: EdgeInsets.zero, + onPressed: () => _showDetail(context, o.id), + ), + ], + )) + .toList(), + mobileCards: orders.map((o) => _orderCard(context, o)).toList(), + ), + ), + ], + )); } + // 原型 .pcode（fs-body 覆盖）：faint + mono，无字重强调 Widget _cellOrderNo(StockOutOrder o) => Text( o.orderNo, style: TextStyle( - color: context.tokens.primary, - fontFamily: 'monospace', + color: context.tokens.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontSize: AppDims.fsBody, - fontWeight: FontWeight.w600, ), ); @@ -406,12 +425,12 @@ class _StockOutListScreenState extends ConsumerState { Widget _buildHeader(int total) { final refreshBtn = DsButton( '刷新', - icon: Icons.refresh, + icon: LucideIcons.refreshCw, onPressed: () => ref.read(stockOutListProvider.notifier).reload(), ); final exportBtn = DsButton( '导出', - icon: Icons.download, + icon: LucideIcons.download, onPressed: () => _doExport( ref.read(stockOutListProvider).valueOrNull?.data ?? const []), ); @@ -420,7 +439,7 @@ class _StockOutListScreenState extends ConsumerState { : WriteGuard( child: DsButton( '新增出库', - icon: Icons.add, + icon: LucideIcons.plus, variant: DsBtnVariant.primary, onPressed: () => context.go('/stock-out/new'), ), @@ -429,8 +448,11 @@ class _StockOutListScreenState extends ConsumerState { return Container( width: double.infinity, color: context.tokens.bg, - padding: const EdgeInsets.fromLTRB( - AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2), + // 原型 .head{margin-bottom:18px}；窄屏保持紧凑内边距 + padding: context.isMobile + ? const EdgeInsets.fromLTRB( + AppDims.sp4, AppDims.sp4, AppDims.sp4, AppDims.sp2) + : const EdgeInsets.only(bottom: 18), child: Row( crossAxisAlignment: CrossAxisAlignment.end, children: [ @@ -442,7 +464,8 @@ class _StockOutListScreenState extends ConsumerState { const SizedBox(width: AppDims.sp3), Padding( padding: const EdgeInsets.only(bottom: 2), - child: Text('本月 $total 笔出库单', + child: Text( + '近30天 ${ref.watch(stockOutSummary30Provider).valueOrNull?.monthCount ?? total} 笔出库单', style: TextStyle( fontSize: AppDims.fsSm, color: context.tokens.muted)), ), @@ -465,12 +488,12 @@ class _StockOutListScreenState extends ConsumerState { // ── KPI（原型 .kpis）────────────────────────────────────────── Widget _buildKpis() { - final summary = ref.watch(stockOutSummaryProvider).valueOrNull; + final summary = ref.watch(stockOutSummary30Provider).valueOrNull; String deltaText(double? pct) { - if (pct == null) return '— 较上月'; + if (pct == null) return '— 较前30天'; final sign = pct >= 0 ? '+' : ''; - return '$sign${pct.toStringAsFixed(1)}% 较上月'; + return '$sign${pct.toStringAsFixed(1)}% 较前30天'; } DsKpiDelta deltaTone(double? pct) => pct == null @@ -479,16 +502,17 @@ class _StockOutListScreenState extends ConsumerState { final cards = [ DsKpi( - title: '本月出库笔数', + title: '近30天出库笔数', value: '${summary?.monthCount ?? 0}', icon: LucideIcons.fileText, tone: DsKpiTone.info, delta: summary != null ? deltaText(summary.countDeltaPct) : null, - deltaTone: - summary != null ? deltaTone(summary.countDeltaPct) : DsKpiDelta.neutral, + deltaTone: summary != null + ? deltaTone(summary.countDeltaPct) + : DsKpiDelta.neutral, ), DsKpi( - title: '本月出库金额', + title: '近30天出库金额', value: summary != null ? _yuanWan(summary.monthAmount) : '—', icon: LucideIcons.banknote, tone: DsKpiTone.ok, @@ -520,8 +544,10 @@ class _StockOutListScreenState extends ConsumerState { } return Container( color: context.tokens.bg, - padding: const EdgeInsets.fromLTRB( - AppDims.sp4, 0, AppDims.sp4, AppDims.sp3), + // 原型 .kpis{margin-bottom:20px}；窄屏保持紧凑内边距 + padding: context.isMobile + ? const EdgeInsets.fromLTRB(AppDims.sp4, 0, AppDims.sp4, AppDims.sp3) + : const EdgeInsets.only(bottom: 20), child: mobile ? SingleChildScrollView( scrollDirection: Axis.horizontal, @@ -552,10 +578,10 @@ class _StockOutListScreenState extends ConsumerState { ); // 客户：可搜索单选下拉（→ setDetail partner_id）。 - final customers = (ref.watch(allPartnersProvider).valueOrNull?.data ?? - const []) - .map((p) => OptionItem(id: p.id, name: p.name, code: p.code)) - .toList(); + final customers = + (ref.watch(allPartnersProvider).valueOrNull?.data ?? const []) + .map((p) => OptionItem(id: p.id, name: p.name, code: p.code)) + .toList(); final customerField = ComboSearchField( options: customers, selectedId: _partnerId, @@ -568,10 +594,10 @@ class _StockOutListScreenState extends ConsumerState { ); // 仓库：客户端单选 chip（当前页）。 - final warehouseNames = (ref.watch(warehouseListProvider).valueOrNull ?? - const []) - .map((w) => w.name) - .toList(); + final warehouseNames = + (ref.watch(warehouseListProvider).valueOrNull ?? const []) + .map((w) => w.name) + .toList(); final warehouseChip = _MenuChip( label: '仓库', value: _filterWarehouseName, @@ -590,8 +616,7 @@ class _StockOutListScreenState extends ConsumerState { value: _statusFilter.isEmpty ? null : statusLabel, options: _statusOptions.map((e) => e.$2).toList(), onSelected: (label) { - final code = - _statusOptions.firstWhere((e) => e.$2 == label).$1; + final code = _statusOptions.firstWhere((e) => e.$2 == label).$1; final n = ref.read(stockOutListProvider.notifier); if (code.startsWith('ret:')) { // 退单状态：走 return_state，主状态清空（互斥）。 @@ -630,7 +655,7 @@ class _StockOutListScreenState extends ConsumerState { final advBtn = DsButton( _advCount > 0 ? '详细搜索 · $_advCount' : '详细搜索', - icon: Icons.tune, + icon: LucideIcons.slidersHorizontal, small: true, variant: _advCount > 0 ? DsBtnVariant.primary : DsBtnVariant.ghost, onPressed: _openAdvSearch, @@ -638,7 +663,7 @@ class _StockOutListScreenState extends ConsumerState { final resetBtn = DsButton( '重置', - icon: Icons.refresh, + icon: LucideIcons.refreshCw, small: true, variant: _hasAnyFilter ? DsBtnVariant.primary : DsBtnVariant.ghost, onPressed: _resetFilters, @@ -780,7 +805,10 @@ class _StockOutListScreenState extends ConsumerState { return MobileListCard( onTap: () => _showDetail(context, o.id), title: Text(o.orderNo, - style: const TextStyle(fontFamily: 'monospace', fontSize: 14)), + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: 14)), trailing: _cellStatus(o), fields: [ MobileCardField('客户', o.partnerName ?? '-'), @@ -869,8 +897,8 @@ class _StockOutListScreenState extends ConsumerState { List _detailActionGroups(StockOutOrder o) { final readonly = WriteGuard.isReadonly(ref); final isAdmin = ref.read(isAdminProvider); - final isMine = o.operatorId != null && - o.operatorId == ref.read(currentUserIdProvider); + final isMine = + o.operatorId != null && o.operatorId == ref.read(currentUserIdProvider); void close() => Navigator.of(context).pop(); DsButton b(String label, VoidCallback onTap, {DsBtnVariant v = DsBtnVariant.ghost}) => @@ -982,7 +1010,9 @@ class _StockOutListScreenState extends ConsumerState { final pending = o.items.where((it) => it.salePrice <= 0 && it.id != null).toList(); if (pending.isEmpty) return; - final controllers = {for (final it in pending) it.id!: TextEditingController()}; + final controllers = { + for (final it in pending) it.id!: TextEditingController() + }; final ok = await showDialog( context: context, builder: (ctx) => AlertDialog( @@ -1031,12 +1061,10 @@ class _StockOutListScreenState extends ConsumerState { ), ), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.pop(ctx, true), - child: const Text('确认并补应收')), + DsButton('取消', onPressed: () => Navigator.pop(ctx, false)), + DsButton('确认并补应收', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.pop(ctx, true)), ], ), ); @@ -1054,12 +1082,10 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).confirmSale(o.id, items); if (!mounted) return; - ScaffoldMessenger.of(context) - .showSnackBar(const SnackBar(content: Text('售价已确认，已补应收流水'))); + showDsToast(context, '售价已确认，已补应收流水'); } on AppException catch (e) { if (!mounted) return; - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('确认失败：${e.message}'))); + showDsToast(context, '确认失败：${e.message}'); } } @@ -1073,30 +1099,26 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('结清确认'), content: const Text('确认将该单据的账款标记为已结清？'), actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('取消')), - TextButton( - onPressed: () => Navigator.pop(ctx, true), - child: - Text('确认结清', style: TextStyle(color: context.tokens.accent)), - ), + DsButton('取消', onPressed: () => Navigator.pop(ctx, false)), + DsButton('确认结清', + variant: DsBtnVariant.accent, + onPressed: () => Navigator.pop(ctx, true)), ], ), ); if (confirmed != true || !context.mounted) return; try { await ref.read(financeRepositoryProvider).closeByRef(refType, orderId); + // 结清改变单据结算状态展示，刷新列表 + // 财务屏应收应付表非 autoDispose，结清后需一并失效 + ref.read(stockOutListProvider.notifier).reload(); + ref.invalidate(financePartnerRowsProvider); if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已结清'), - backgroundColor: context.tokens.success)); + showDsToast(context, '已结清', bg: context.tokens.success); } } catch (e) { if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(e.toString()), - backgroundColor: context.tokens.danger)); + showDsToast(context, e.toString(), bg: context.tokens.danger); } } } @@ -1108,16 +1130,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('删除确认'), content: Text('确认删除出库单「${o.orderNo}」？此操作不可恢复。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('删除'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('删除', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1125,15 +1141,11 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).deleteOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已删除'), - backgroundColor: context.tokens.success)); + showDsToast(context, '已删除', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('删除失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); } } } @@ -1146,12 +1158,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('提交审核'), content: Text('确认提交出库单「${o.orderNo}」？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - child: const Text('提交')), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('提交', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1159,15 +1169,11 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).submitOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已提交审核'), - backgroundColor: context.tokens.success)); + showDsToast(context, '已提交审核', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('提交失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '提交失败：$e', bg: context.tokens.danger); } } } @@ -1180,16 +1186,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('审核确认'), content: Text('确认审核通过出库单「${o.orderNo}」？审核后将出库并扣减库存。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.success, - foregroundColor: Colors.white), - child: const Text('通过'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('通过', + variant: DsBtnVariant.success, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1197,16 +1197,12 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).approveOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('审核通过'), - backgroundColor: context.tokens.success)); + showDsToast(context, '审核通过', bg: context.tokens.success); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('审核失败：$e'), - backgroundColor: context.tokens.danger, - duration: const Duration(seconds: 5))); + showDsToast(context, '审核失败：$e', + bg: context.tokens.danger, duration: const Duration(seconds: 5)); } } } @@ -1219,16 +1215,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('拒绝确认'), content: Text('确认拒绝出库单「${o.orderNo}」？'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('拒绝'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('拒绝', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1236,15 +1226,11 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).rejectOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已拒绝'), - backgroundColor: context.tokens.accent)); + showDsToast(context, '已拒绝', bg: context.tokens.accent); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('操作失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '操作失败：$e', bg: context.tokens.danger); } } } @@ -1257,16 +1243,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('撤回确认'), content: Text('确认撤回出库单「${o.orderNo}」？撤回后单据回到草稿，可修改后重新提交审核。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.accent, - foregroundColor: Colors.white), - child: const Text('撤回'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('撤回', + variant: DsBtnVariant.accent, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1274,15 +1254,11 @@ class _StockOutListScreenState extends ConsumerState { try { await ref.read(stockOutListProvider.notifier).withdrawOrder(o.id); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('已撤回为草稿'), - backgroundColor: context.tokens.accent)); + showDsToast(context, '已撤回为草稿', bg: context.tokens.accent); } } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('撤回失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '撤回失败：$e', bg: context.tokens.danger); } } } @@ -1295,16 +1271,10 @@ class _StockOutListScreenState extends ConsumerState { title: const Text('退单'), content: Text('确认对已审核出库单「${o.orderNo}」发起退单？将打开退单明细窗口选择要退的商品。'), actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), - child: const Text('确认'), - ), + DsButton('取消', onPressed: () => Navigator.of(ctx).pop(false)), + DsButton('确认', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.of(ctx).pop(true)), ], ), ); @@ -1314,9 +1284,7 @@ class _StockOutListScreenState extends ConsumerState { full = await ref.read(stockOutRepositoryProvider).get(o.id); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('加载明细失败：$e'), - backgroundColor: context.tokens.danger)); + showDsToast(context, '加载明细失败：$e', bg: context.tokens.danger); } return; } @@ -1342,9 +1310,12 @@ class _StockOutListScreenState extends ConsumerState { meta: [ ('客户', o.partnerName ?? '-'), ('仓库', o.warehouseName ?? '-'), - ('出库日期', o.orderDate != null && o.orderDate!.length >= 10 - ? o.orderDate!.substring(0, 10) - : (o.orderDate ?? '-')), + ( + '出库日期', + o.orderDate != null && o.orderDate!.length >= 10 + ? o.orderDate!.substring(0, 10) + : (o.orderDate ?? '-') + ), ], lines: lines, onSubmit: (ids) => @@ -1497,106 +1468,134 @@ class _AdvancedSearchDialogState extends ConsumerState<_AdvancedSearchDialog> { final t = context.tokens; final width = context.dialogWidth(680); final isMobile = context.isMobile; - final fullWidth = width - 40; // 体 padding 左右各 20 - final fieldWidth = isMobile ? fullWidth : (fullWidth - 16) / 2; - - Widget labeled(String label, Widget control, {double? w}) => SizedBox( - width: w ?? fieldWidth, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text(label, - style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), - const SizedBox(height: 6), - control, - ], - ), + Widget field(String label, Widget child) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + const SizedBox(height: 6), + child, + ], ); // 文本输入：用与 ComboSearchField 完全相同的 h38 带框 Container 包无边框 TextField， // 保证与下拉框等高等样式（对齐原型 .input / .combo）。 - Widget textField(String label, TextEditingController ctrl, String hint) => - labeled( - label, - Container( - height: 38, - padding: const EdgeInsets.symmetric(horizontal: 11), - alignment: Alignment.centerLeft, - decoration: BoxDecoration( - color: t.surface, - border: Border.all(color: t.border), - borderRadius: BorderRadius.circular(AppDims.rMd), - ), - child: TextField( - controller: ctrl, - style: TextStyle(fontSize: AppDims.fsBody, color: t.text), - decoration: InputDecoration( - isCollapsed: true, - border: InputBorder.none, - hintText: hint, - hintStyle: TextStyle(color: t.faint, fontSize: AppDims.fsBody), - ), - ), - ), - ); - - Widget optionField(String label, List opts, int? selected, - String hint, ValueChanged onChanged) => - labeled( - label, - ComboSearchField( - options: opts, - selectedId: selected, - hint: hint, - onChanged: onChanged, - height: 38, - fillColor: t.surface, - ), - ); - - final statusItems = [ - for (var i = 0; i < _statusNames.length; i++) - OptionItem(id: i, name: _statusNames[i]), - ]; - final statusSelIdx = _statusCodes.indexOf(_status); - - final dateHas = _dateRange != null; - final dateField = labeled( - '单据日期', - InkWell( - onTap: _pickDate, - borderRadius: BorderRadius.circular(AppDims.rMd), - child: Container( + Widget textField(TextEditingController c, String hint) => Container( height: 38, padding: const EdgeInsets.symmetric(horizontal: 11), + alignment: Alignment.centerLeft, decoration: BoxDecoration( color: t.surface, border: Border.all(color: t.border), borderRadius: BorderRadius.circular(AppDims.rMd), ), - child: Row(children: [ - Expanded( - child: Text( - dateHas - ? '${DateFormat('yyyy-MM-dd').format(_dateRange!.start)} ~ ${DateFormat('yyyy-MM-dd').format(_dateRange!.end)}' - : '全部时间', - style: TextStyle( - fontSize: AppDims.fsBody, color: dateHas ? t.text : t.faint), - ), + child: TextField( + controller: c, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text), + decoration: InputDecoration( + isCollapsed: true, + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + hintText: hint, + hintStyle: TextStyle(color: t.faint, fontSize: AppDims.fsBody), ), - if (dateHas) - GestureDetector( - onTap: () => setState(() => _dateRange = null), - child: Icon(Icons.close, size: 14, color: t.muted), - ) - else - Icon(Icons.date_range, size: 16, color: t.faint), - ]), + ), + ); + + // 下拉：锚定式 ComboSearchField，h38 + 白底，与文本框统一（对齐原型 .combo）。 + Widget combo({ + required List opts, + required int? selectedId, + required String hint, + required ValueChanged onChanged, + }) => + ComboSearchField( + options: opts, + selectedId: selectedId, + hint: hint, + onChanged: onChanged, + height: 38, + fillColor: t.surface, + ); + + // 状态：复用 ComboSearchField（把固定状态映射成 int id 项）。 + final statusItems = [ + for (var i = 0; i < _statusNames.length; i++) + OptionItem(id: i, name: _statusNames[i]), + ]; + final statusSelIdx = _statusCodes.indexOf(_status); + Widget statusCombo() => ComboSearchField( + options: statusItems, + selectedId: statusSelIdx <= 0 ? null : statusSelIdx, + hint: '全部', + height: 38, + fillColor: t.surface, + onChanged: (id) => + setState(() => _status = (id == null) ? '' : _statusCodes[id]), + ); + + Widget row(List children) { + if (isMobile) { + return Column( + children: [ + for (int i = 0; i < children.length; i++) ...[ + if (i > 0) const SizedBox(height: 12), + children[i], + ], + ], + ); + } + return Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (int i = 0; i < children.length; i++) ...[ + if (i > 0) const SizedBox(width: 16), + Expanded(child: children[i]), + ], + ], ), - ), - w: fullWidth, - ); + ); + } + + final dateHas = _dateRange != null; + Widget dateField() => InkWell( + onTap: _pickDate, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 38, + padding: const EdgeInsets.symmetric(horizontal: 11), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + Expanded( + child: Text( + dateHas + ? '${DateFormat('yyyy-MM-dd').format(_dateRange!.start)} ~ ${DateFormat('yyyy-MM-dd').format(_dateRange!.end)}' + : '全部时间', + style: TextStyle( + fontSize: AppDims.fsBody, + color: dateHas ? t.text : t.faint), + ), + ), + if (dateHas) + GestureDetector( + onTap: () => setState(() => _dateRange = null), + child: Icon(LucideIcons.x, size: 14, color: t.muted), + ) + else + Icon(LucideIcons.calendar, size: 16, color: t.faint), + ]), + ), + ); return AlertDialog( backgroundColor: t.surface, @@ -1621,56 +1620,82 @@ class _AdvancedSearchDialogState extends ConsumerState<_AdvancedSearchDialog> { const Spacer(), InkWell( onTap: () => Navigator.of(context).pop(), - child: Icon(Icons.close, size: 20, color: t.muted), + child: Icon(LucideIcons.x, size: 20, color: t.muted), ), ]), ), Flexible( child: SingleChildScrollView( padding: const EdgeInsets.fromLTRB(20, 18, 20, 18), - child: Wrap( - spacing: 16, - runSpacing: 12, + child: Column( + mainAxisSize: MainAxisSize.min, children: [ - textField('单据编号', _orderNoCtrl, '如 CK20260401001'), - optionField('客户', customers, _partnerId, '全部客户', - (id) => setState(() => _partnerId = id)), - textField('商品名', _productCtrl, '输入酒名'), - textField('商品编码', _productCodeCtrl, '输入商品编码'), - optionField( - '系列', - seriesOpts, - idByName(seriesOpts, _series), - '全部系列', - (id) => setState(() => _series = id == null - ? '' - : seriesOpts.firstWhere((o) => o.id == id).name)), - optionField( - '规格', - specOpts, - idByName(specOpts, _spec), - '全部规格', - (id) => setState(() => _spec = id == null - ? '' - : specOpts.firstWhere((o) => o.id == id).name)), - textField('批次号', _batchCtrl, '输入批次号'), - labeled( - '状态', - ComboSearchField( - options: statusItems, - selectedId: statusSelIdx <= 0 ? null : statusSelIdx, - hint: '全部', - height: 38, - fillColor: t.surface, - onChanged: (id) => setState(() => - _status = (id == null) ? '' : _statusCodes[id]), - ), - ), - optionField('出库员', users, _operatorId, '全部出库员', - (id) => setState(() => _operatorId = id)), - optionField('审核人', users, _reviewerId, '全部审核人', - (id) => setState(() => _reviewerId = id)), - dateField, + row([ + field('单据编号', textField(_orderNoCtrl, '如 CK20260401001')), + field( + '客户', + combo( + opts: customers, + selectedId: _partnerId, + hint: '全部客户', + onChanged: (v) => + setState(() => _partnerId = v))), + ]), + row([ + field('商品名', textField(_productCtrl, '输入酒名')), + field('商品编码', textField(_productCodeCtrl, '输入商品编码')), + ]), + row([ + field( + '系列', + combo( + opts: seriesOpts, + selectedId: idByName(seriesOpts, _series), + hint: '全部系列', + onChanged: (id) => setState(() => _series = + id == null + ? '' + : seriesOpts + .firstWhere((o) => o.id == id) + .name))), + field( + '规格', + combo( + opts: specOpts, + selectedId: idByName(specOpts, _spec), + hint: '全部规格', + onChanged: (id) => setState(() => _spec = + id == null + ? '' + : specOpts + .firstWhere((o) => o.id == id) + .name))), + ]), + row([ + field('批次号', textField(_batchCtrl, '输入批次号')), + field('状态', statusCombo()), + ]), + row([ + field( + '出库员', + combo( + opts: users, + selectedId: _operatorId, + hint: '全部出库员', + onChanged: (id) => + setState(() => _operatorId = id))), + field( + '审核人', + combo( + opts: users, + selectedId: _reviewerId, + hint: '全部审核人', + onChanged: (id) => + setState(() => _reviewerId = id))), + ]), + row([ + field('单据日期', dateField()), + ]), ], ), ), diff --git a/client/lib/widgets/app_status_bar.dart b/client/lib/widgets/app_status_bar.dart index 9ffc78b..df99605 100644 --- a/client/lib/widgets/app_status_bar.dart +++ b/client/lib/widgets/app_status_bar.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -36,8 +37,8 @@ class _AppStatusBarState extends ConsumerState { if (AppStatusBar.ticking) { _timer = Timer.periodic(const Duration(seconds: 1), (_) { if (mounted) { - setState(() => - _now = DateFormat('HH:mm:ss').format(AppStatusBar.clock())); + setState( + () => _now = DateFormat('HH:mm:ss').format(AppStatusBar.clock())); } }); } @@ -63,26 +64,26 @@ class _AppStatusBarState extends ConsumerState { child: Row( children: [ // 左组 - _item(icon: Icons.storefront_outlined, strong: user?.shopNo ?? '—'), + _item(icon: LucideIcons.store, strong: user?.shopNo ?? '—'), _div(), _item( - icon: Icons.person_outline, + icon: LucideIcons.user, text: (user == null || user.realName.isEmpty) ? (user?.username ?? '—') : user.realName), _div(), - _item(icon: Icons.login, text: '登录 ', strong: widget.loginTime), + _item(icon: LucideIcons.logIn, text: '登录 ', strong: widget.loginTime), _div(), - _item(icon: Icons.schedule, text: '当前 ', strong: _now), + _item(icon: LucideIcons.clock, text: '当前 ', strong: _now), const Spacer(), // 右组 _item( - icon: isOnline ? Icons.cloud_done_outlined : Icons.cloud_off_outlined, + icon: isOnline ? LucideIcons.cloudCheck : LucideIcons.cloudOff, text: isOnline ? '已连接' : '连接已断开', ok: isOnline, ), _div(), - _item(icon: Icons.sell_outlined, strong: version, ok: true), + _item(icon: LucideIcons.tags, strong: version, ok: true), _div(), _licenseItem(lic), ], @@ -132,7 +133,7 @@ class _AppStatusBarState extends ConsumerState { Widget _licenseItem(LicenseInfo? lic) { if (lic == null) { - return _item(icon: Icons.verified_user_outlined, text: '授权', ok: true); + return _item(icon: LucideIcons.shieldCheck, text: '授权', ok: true); } final color = LicenseCopy.phaseColor(lic.phase); final icon = LicenseCopy.phaseIcon(lic.phase); @@ -146,8 +147,7 @@ class _AppStatusBarState extends ConsumerState { child: Row( mainAxisSize: MainAxisSize.min, children: [ - Icon(icon, - size: 13, color: normal ? AppChrome.statusbarOk : color), + Icon(icon, size: 13, color: normal ? AppChrome.statusbarOk : color), const SizedBox(width: 6), Text( text, diff --git a/client/lib/widgets/brand_mark.dart b/client/lib/widgets/brand_mark.dart new file mode 100644 index 0000000..23eed7d --- /dev/null +++ b/client/lib/widgets/brand_mark.dart @@ -0,0 +1,58 @@ +// widgets/brand_mark.dart — 品牌 logo 真相源（镜像原型 about.html hero SVG）。 +// 原型 64×64 viewBox：rx15 深蓝底 #0F3057 + 白描边(4, round) 山形 +// M14 33→23 16→32 25→41 16→50 33 + 横线 y41(x15–49) + 横线下居中红点 (32,48) r3 +// #8B2331。品牌资产主题不变（原型 SVG 硬编码，不走主题 token）——勿改配色。 +import 'package:flutter/material.dart'; + +class BrandMark extends StatelessWidget { + final double size; + const BrandMark({super.key, this.size = 62}); + + static const Color _bg = + Color(0xFF0F3057); // ds-ignore: 品牌 logo 固定色（原型 SVG 硬编码，主题不变） + static const Color _stroke = + Colors.white; // ds-ignore: 品牌 logo 固定色（原型 SVG 硬编码，主题不变） + static const Color _dot = + Color(0xFF8B2331); // ds-ignore: 品牌 logo 固定色（原型 SVG 硬编码，主题不变） + + @override + Widget build(BuildContext context) { + return Container( + width: size, + height: size, + decoration: BoxDecoration( + color: _bg, + // 原型 rx15/64 + borderRadius: BorderRadius.circular(size * 15 / 64), + ), + child: CustomPaint(painter: _MarkPainter()), + ); + } +} + +class _MarkPainter extends CustomPainter { + @override + void paint(Canvas canvas, Size size) { + final s = size.width / 64; + final stroke = Paint() + ..color = BrandMark._stroke + ..style = PaintingStyle.stroke + ..strokeWidth = 4 * s + ..strokeCap = StrokeCap.round + ..strokeJoin = StrokeJoin.round; + + final mountain = Path() + ..moveTo(14 * s, 33 * s) + ..lineTo(23 * s, 16 * s) + ..lineTo(32 * s, 25 * s) + ..lineTo(41 * s, 16 * s) + ..lineTo(50 * s, 33 * s); + canvas.drawPath(mountain, stroke); + canvas.drawLine(Offset(15 * s, 41 * s), Offset(49 * s, 41 * s), stroke); + canvas.drawCircle( + Offset(32 * s, 48 * s), 3 * s, Paint()..color = BrandMark._dot); + } + + @override + bool shouldRepaint(covariant CustomPainter oldDelegate) => false; +} diff --git a/client/lib/widgets/combo_search_field.dart b/client/lib/widgets/combo_search_field.dart index 7c4c0d5..2435b03 100644 --- a/client/lib/widgets/combo_search_field.dart +++ b/client/lib/widgets/combo_search_field.dart @@ -1,8 +1,10 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; import '../core/theme/app_dims.g.dart'; import 'searchable_option_field.dart' show OptionItem; +import '../core/theme/app_fonts.dart'; /// 搜索下拉框（对齐原型 .combo + .combo-pop）： /// 触发器（带框 input 样式 + caret/清除）+ 锚定在下方的弹层 @@ -15,10 +17,13 @@ class ComboSearchField extends StatefulWidget { final int? selectedId; final String hint; final ValueChanged onChanged; + /// 固定宽度；传 null 则填满父约束（用于弹窗内 Expanded 布局）。 final double? width; + /// 触发器高度（工具栏 34，表单/弹窗 38，对齐原型 .combo）。 final double height; + /// 触发器填充色；null=透明（工具栏用，透出底色）。弹窗内传 surface 保持不透明一致。 final Color? fillColor; @@ -147,10 +152,10 @@ class _ComboSearchFieldState extends State { if (sel != null) GestureDetector( onTap: () => _pick(null), - child: Icon(Icons.close, size: 14, color: t.muted), + child: Icon(LucideIcons.x, size: 14, color: t.muted), ) else - Icon(Icons.keyboard_arrow_down, size: 16, color: t.faint), + Icon(LucideIcons.chevronDown, size: 16, color: t.faint), ], ), ), @@ -198,7 +203,7 @@ class _ComboPopState extends State<_ComboPop> { ), child: Row( children: [ - Icon(Icons.search, size: 14, color: t.faint), + Icon(LucideIcons.search, size: 14, color: t.faint), const SizedBox(width: 8), Expanded( child: TextField( @@ -206,7 +211,11 @@ class _ComboPopState extends State<_ComboPop> { style: TextStyle(fontSize: AppDims.fsBody, color: t.text), decoration: InputDecoration( isCollapsed: true, + contentPadding: EdgeInsets.zero, border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, hintText: '搜索${widget.hint}…', hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), @@ -255,12 +264,14 @@ class _ComboPopState extends State<_ComboPop> { Text(o.code!, style: TextStyle( fontSize: AppDims.fsXs, - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, color: t.faint)), ], if (sel) ...[ const SizedBox(width: 8), - Icon(Icons.check, size: 15, color: t.primary), + Icon(LucideIcons.check, + size: 15, color: t.primary), ], ], ), diff --git a/client/lib/widgets/data_table_card.dart b/client/lib/widgets/data_table_card.dart deleted file mode 100644 index 17c0220..0000000 --- a/client/lib/widgets/data_table_card.dart +++ /dev/null @@ -1,280 +0,0 @@ -import 'package:flutter/material.dart'; -import '../core/responsive/responsive.dart'; -import '../core/theme/context_tokens.dart'; - -class DataTableCard extends StatefulWidget { - final List columns; - final List rows; - final Widget? toolbar; - final int? totalCount; - final int page; - final int pageSize; - final ValueChanged? onPageChanged; - final ValueChanged? onPageSizeChanged; - - /// 窄屏（手机）卡片列表。与 [rows] 同序、同数量；提供后窄屏渲染卡片流， - /// 宽屏仍渲染表格。为 null 时窄屏也保持表格（横向滚动）。 - final List? mobileCards; - - const DataTableCard({ - super.key, - required this.columns, - required this.rows, - this.toolbar, - this.totalCount, - this.page = 1, - this.pageSize = 20, - this.onPageChanged, - this.onPageSizeChanged, - this.mobileCards, - }); - - @override - State createState() => _DataTableCardState(); -} - -class _DataTableCardState extends State { - // 当前悬停行的索引（-1 表示无悬停） - final _hoveredRow = ValueNotifier(-1); - final _vCtrl = ScrollController(); - final _hCtrl = ScrollController(); - - @override - void dispose() { - _hoveredRow.dispose(); - _vCtrl.dispose(); - _hCtrl.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return Column( - children: [ - if (widget.toolbar != null) - Container( - color: context.tokens.surface, - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), - child: widget.toolbar!, - ), - if (widget.toolbar != null) const Divider(height: 1), - Expanded( - child: (context.isMobile && widget.mobileCards != null) - ? _buildMobileList() - : _buildTable(), - ), - // Pagination - if (widget.totalCount != null) - Container( - height: 48, - color: context.tokens.surface, - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Row( - children: [ - Text( - '共 ${widget.totalCount} 条记录', - style: TextStyle( - fontSize: 13, color: context.tokens.muted), - ), - const Spacer(), - _PaginationBar( - page: widget.page, - total: widget.totalCount!, - pageSize: widget.pageSize, - onPageChanged: widget.onPageChanged, - onPageSizeChanged: widget.onPageSizeChanged, - // 窄屏隐藏「每页 N 条」选择器，给翻页让位，避免横向溢出 - compact: context.isMobile, - ), - ], - ), - ), - ], - ); - } - - Widget _buildTable() { - return LayoutBuilder( - builder: (context, constraints) => Scrollbar( - controller: _vCtrl, - thumbVisibility: true, - child: SingleChildScrollView( - controller: _vCtrl, - child: Scrollbar( - controller: _hCtrl, - thumbVisibility: true, - scrollbarOrientation: ScrollbarOrientation.bottom, - child: SingleChildScrollView( - controller: _hCtrl, - scrollDirection: Axis.horizontal, - child: ConstrainedBox( - constraints: BoxConstraints(minWidth: constraints.maxWidth), - child: Table( - defaultColumnWidth: const IntrinsicColumnWidth(), - border: TableBorder( - horizontalInside: BorderSide( - color: Colors.grey.shade200, - width: 0.5, - ), - ), - children: [ - _buildHeaderRow(), - for (int i = 0; i < widget.rows.length; i++) - _buildDataRow(i, widget.rows[i]), - ], - ), - ), - ), - ), - ), - ), - ); - } - - Widget _buildMobileList() { - final cards = widget.mobileCards!; - if (cards.isEmpty) { - return Center( - child: Padding( - padding: const EdgeInsets.all(32), - child: Text('暂无数据', - style: TextStyle(color: context.tokens.muted, fontSize: 14)), - ), - ); - } - return ListView.separated( - padding: const EdgeInsets.all(12), - itemCount: cards.length, - separatorBuilder: (_, __) => const SizedBox(height: 10), - itemBuilder: (_, i) => cards[i], - ); - } - - TableRow _buildHeaderRow() { - return TableRow( - decoration: BoxDecoration(color: context.tokens.thBg), - children: widget.columns.map((col) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - child: DefaultTextStyle.merge( - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, - color: context.tokens.primaryDark, - ), - child: col.numeric - ? Align(alignment: Alignment.centerRight, child: col.label) - : col.label, - ), - ); - }).toList(), - ); - } - - TableRow _buildDataRow(int rowIndex, DataRow row) { - return TableRow( - children: List.generate(row.cells.length, (colIndex) { - final cell = row.cells[colIndex]; - final col = widget.columns[colIndex]; - return MouseRegion( - onEnter: (_) => _hoveredRow.value = rowIndex, - onExit: (_) { - if (_hoveredRow.value == rowIndex) _hoveredRow.value = -1; - }, - child: ValueListenableBuilder( - valueListenable: _hoveredRow, - builder: (context, hovered, _) => Container( - constraints: const BoxConstraints(minHeight: 48), - alignment: - col.numeric ? Alignment.centerRight : Alignment.centerLeft, - color: hovered == rowIndex ? context.tokens.rowHover : null, - padding: - const EdgeInsets.symmetric(horizontal: 16, vertical: 10), - child: DefaultTextStyle.merge( - style: TextStyle( - fontSize: 13, color: context.tokens.text), - child: cell.child, - ), - ), - ), - ); - }), - ); - } -} - -class _PaginationBar extends StatelessWidget { - final int page; - final int total; - final int pageSize; - final ValueChanged? onPageChanged; - final ValueChanged? onPageSizeChanged; - final bool compact; - - static const _pageSizeOptions = [10, 20, 50, 100]; - - const _PaginationBar({ - required this.page, - required this.total, - required this.pageSize, - this.onPageChanged, - this.onPageSizeChanged, - this.compact = false, - }); - - @override - Widget build(BuildContext context) { - final totalPages = (total / pageSize).ceil().clamp(1, 9999); - // 确保当前 pageSize 在选项中（如默认值 50 不在列表时仍能显示） - final effectiveSize = _pageSizeOptions.contains(pageSize) ? pageSize : _pageSizeOptions.first; - return Row( - children: [ - // 每页条数选择器（窄屏隐藏，避免溢出） - if (onPageSizeChanged != null && !compact) ...[ - Text('每页', style: TextStyle(fontSize: 13, color: context.tokens.muted)), - const SizedBox(width: 4), - DropdownButtonHideUnderline( - child: DropdownButton( - value: effectiveSize, - isDense: true, - style: TextStyle(fontSize: 13, color: context.tokens.text), - items: _pageSizeOptions - .map((n) => DropdownMenuItem(value: n, child: Text('$n 条'))) - .toList(), - onChanged: (v) { - if (v != null) onPageSizeChanged!(v); - }, - ), - ), - const SizedBox(width: 16), - ], - // 翻页控件 - IconButton( - icon: const Icon(Icons.first_page, size: 18), - onPressed: page > 1 ? () => onPageChanged?.call(1) : null, - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), - ), - IconButton( - icon: const Icon(Icons.chevron_left, size: 18), - onPressed: page > 1 ? () => onPageChanged?.call(page - 1) : null, - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), - ), - Text('$page / $totalPages', style: const TextStyle(fontSize: 13)), - IconButton( - icon: const Icon(Icons.chevron_right, size: 18), - onPressed: page < totalPages ? () => onPageChanged?.call(page + 1) : null, - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), - ), - IconButton( - icon: const Icon(Icons.last_page, size: 18), - onPressed: page < totalPages ? () => onPageChanged?.call(totalPages) : null, - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), - ), - ], - ); - } -} diff --git a/client/lib/widgets/date_picker_field.dart b/client/lib/widgets/date_picker_field.dart index 9860882..1a60e10 100644 --- a/client/lib/widgets/date_picker_field.dart +++ b/client/lib/widgets/date_picker_field.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; import '../core/utils/date_util.dart'; @@ -138,7 +139,7 @@ class _DatePickerFieldState extends State { const EdgeInsets.symmetric(horizontal: 8, vertical: 8), errorText: field.errorText, suffixIcon: IconButton( - icon: Icon(Icons.calendar_today, + icon: Icon(LucideIcons.calendar, size: 16, color: context.tokens.muted), padding: EdgeInsets.zero, constraints: const BoxConstraints(minWidth: 34, minHeight: 34), diff --git a/client/lib/widgets/ds/ds_atoms.dart b/client/lib/widgets/ds/ds_atoms.dart index d5d4bdb..5b07e18 100644 --- a/client/lib/widgets/ds/ds_atoms.dart +++ b/client/lib/widgets/ds/ds_atoms.dart @@ -3,11 +3,13 @@ // 单一组件源：尺寸/间距/圆角/字号全引 AppDims，颜色全引 context.tokens（禁硬编码）。 // 屏只组合这些组件，不再自己堆样式（见代码端真相源闸 check_ds_code）。 import 'package:flutter/material.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../../core/theme/context_tokens.dart'; import '../../core/theme/app_dims.g.dart'; +import 'ds_menu.dart'; // ── .btn ────────────────────────────────────────────────────────────────── -enum DsBtnVariant { ghost, primary, danger } +enum DsBtnVariant { ghost, primary, danger, success, accent } /// 原型 .btn：h38 / pad 0 16 / r-md / fs-body / fw600 / gap7，图标 16。 /// ghost=surface+border / primary=primary+on-primary / danger=danger+白。 @@ -17,6 +19,7 @@ class DsButton extends StatelessWidget { final VoidCallback? onPressed; final DsBtnVariant variant; final bool small; // .btn.sm：h32 / pad 0 12 / fs-sm + final bool large; // .btn.lg：h44 / pad 0 22 / fs14（登录/注册主按钮） const DsButton( this.label, { @@ -25,6 +28,7 @@ class DsButton extends StatelessWidget { this.onPressed, this.variant = DsBtnVariant.ghost, this.small = false, + this.large = false, }); @override @@ -34,37 +38,53 @@ class DsButton extends StatelessWidget { DsBtnVariant.ghost => (t.surface, t.text, t.border), DsBtnVariant.primary => (t.primary, t.onPrimary, t.primary), DsBtnVariant.danger => (t.danger, t.onPrimary, t.danger), + // 语义确认键（审核通过/撤回等），色取 token + DsBtnVariant.success => (t.success, t.onPrimary, t.success), + DsBtnVariant.accent => (t.accent, t.onPrimary, t.accent), }; - return Material( - color: bg, - borderRadius: BorderRadius.circular(AppDims.rMd), - child: InkWell( - onTap: onPressed, - borderRadius: BorderRadius.circular(AppDims.rMd), - child: Container( - height: small ? 32 : 38, - padding: EdgeInsets.symmetric(horizontal: small ? 12 : 16), - decoration: BoxDecoration( + // disabled（onPressed=null）置灰 55%：批量替换 Material 按钮后不能丢禁用反馈 + return Opacity( + opacity: onPressed == null ? 0.55 : 1, + child: Material( + color: bg, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: InkWell( + onTap: onPressed, borderRadius: BorderRadius.circular(AppDims.rMd), - border: Border.all(color: border), + child: Container( + height: small ? 32 : (large ? 44 : 38), + padding: EdgeInsets.symmetric( + horizontal: small ? 12 : (large ? 22 : 16)), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(AppDims.rMd), + border: Border.all(color: border), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if (icon != null) ...[ + Icon(icon, size: 16, color: fg), + const SizedBox(width: 7), + ], + // Flexible+ellipsis：宿主给紧约束（如 dev-card 底部 flex:1）时不溢出 + Flexible( + child: Text(label, + maxLines: 1, + softWrap: false, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: fg, + fontSize: small + ? AppDims.fsSm + : (large ? 14 : AppDims.fsBody), + fontWeight: FontWeight.w600)), + ), + ], + ), + ), ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (icon != null) ...[ - Icon(icon, size: 16, color: fg), - const SizedBox(width: 7), - ], - Text(label, - style: TextStyle( - color: fg, - fontSize: small ? AppDims.fsSm : AppDims.fsBody, - fontWeight: FontWeight.w600)), - ], - ), - ), - ), - ); + )); } } @@ -91,8 +111,8 @@ class DsBadge extends StatelessWidget { return Container( height: 22, padding: const EdgeInsets.symmetric(horizontal: 9), - decoration: - BoxDecoration(color: bg, borderRadius: BorderRadius.circular(AppDims.rPill)), + decoration: BoxDecoration( + color: bg, borderRadius: BorderRadius.circular(AppDims.rPill)), child: Row( mainAxisSize: MainAxisSize.min, children: [ @@ -120,17 +140,23 @@ class DsChip extends StatelessWidget { final String? value; // 选中值（.cv）；非空即 on 态 final VoidCallback? onTap; final VoidCallback? onClear; // 选中态下点 × 单独清除该筛选（不触发展开菜单） + // 纯切换 chip（原型 .chip.on，如 partners 类型筛选）：selected 直接给 on 态， + // caret=false 去掉下拉箭头。 + final bool selected; + final bool caret; const DsChip( {super.key, required this.label, this.value, this.onTap, - this.onClear}); + this.onClear, + this.selected = false, + this.caret = true}); @override Widget build(BuildContext context) { final t = context.tokens; - final on = value != null && value!.isNotEmpty; + final on = selected || (value != null && value!.isNotEmpty); return InkWell( onTap: onTap, borderRadius: BorderRadius.circular(AppDims.rMd), @@ -147,7 +173,7 @@ class DsChip extends StatelessWidget { children: [ Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.text)), - if (on) ...[ + if (value != null && value!.isNotEmpty) ...[ const SizedBox(width: 7), Text(value!, style: TextStyle( @@ -155,16 +181,19 @@ class DsChip extends StatelessWidget { color: t.primary, fontWeight: FontWeight.w600)), ], - const SizedBox(width: 7), - // 选中且提供 onClear → 展示可点 ×（清该筛选）；否则展示下拉箭头。 - if (on && onClear != null) + // 选中且提供 onClear → 展示可点 ×（清该筛选）；否则展示下拉箭头； + // 纯切换 chip（caret=false）无尾部图标。 + if (on && onClear != null) ...[ + const SizedBox(width: 7), GestureDetector( behavior: HitTestBehavior.opaque, onTap: onClear, - child: Icon(Icons.close, size: 14, color: t.muted), - ) - else - Icon(Icons.keyboard_arrow_down, size: 14, color: t.faint), + child: Icon(LucideIcons.x, size: 14, color: t.muted), + ), + ] else if (caret) ...[ + const SizedBox(width: 7), + Icon(LucideIcons.chevronDown, size: 14, color: t.faint), + ], ], ), ), @@ -172,8 +201,290 @@ class DsChip extends StatelessWidget { } } +// ── .seg ───────────────────────────────────────────────────────────────── +/// 原型 .seg：分段 tab（inline-flex / bg / border r-md / pad 3 gap 3）。 +/// button h30 / pad 0 16 / fs-sm fw600 muted；选中=surface 底 + primary 字 + sh-1。 +class DsSeg extends StatelessWidget { + final List items; + final int index; + final ValueChanged onChanged; + const DsSeg( + {super.key, + required this.items, + required this.index, + required this.onChanged}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Container( + padding: const EdgeInsets.all(3), + decoration: BoxDecoration( + color: t.bg, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + for (var i = 0; i < items.length; i++) ...[ + if (i > 0) const SizedBox(width: 3), + InkWell( + onTap: () => onChanged(i), + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Container( + height: 30, + padding: const EdgeInsets.symmetric(horizontal: 16), + alignment: Alignment.center, + decoration: BoxDecoration( + color: i == index ? t.surface : null, + borderRadius: BorderRadius.circular(AppDims.rSm), + // 原型 --sh-1: 0 1px 3px var(--shadow) + boxShadow: i == index + ? [ + BoxShadow( + color: t.shadow, + blurRadius: 3, + offset: const Offset(0, 1)), + ] + : null, + ), + child: Text(items[i], + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: i == index ? t.primary : t.muted)), + ), + ), + ], + ], + ), + ); + } +} + // ── .searchbox ────────────────────────────────────────────────────────────── /// 原型 .searchbox：h34 / bg / border r-md / gap8 / pad 0 11，前导放大镜 14(faint)。 +/// 原型 .field：label（fs-sm muted）在控件上方、间距 6；required 缀红星。 +/// 对话框/面板表单统一用它排字段，禁止 Material labelText 浮动标签。 +class DsField extends StatelessWidget { + final String label; + final bool required; + final Widget child; + const DsField(this.label, + {super.key, this.required = false, required Widget input}) + : child = input; + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row(mainAxisSize: MainAxisSize.min, children: [ + Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + if (required) + Text(' *', + style: TextStyle(fontSize: AppDims.fsSm, color: t.danger)), + ]), + const SizedBox(height: 6), + child, + ], + ); + } +} + +/// 原型 .check / .agree（login.html / register.html）：18×18 盒 + 1.5px 边 + +/// r-sm；选中 → primary 底/边 + 白勾(13, stroke2.4)；文案 fs-body，间距 8。 +/// [label] 用 Widget 以承载富文本（如注册页协议链接）；[alignTop] 用于多行文案 +/// （register .agree：align-items:flex-start + 盒 margin-top 1）。 +class DsCheck extends StatelessWidget { + final bool value; + final ValueChanged onChanged; + final Widget label; + final bool alignTop; + const DsCheck({ + super.key, + required this.value, + required this.onChanged, + required this.label, + this.alignTop = false, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => onChanged(!value), + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: + alignTop ? CrossAxisAlignment.start : CrossAxisAlignment.center, + children: [ + Container( + width: 18, + height: 18, + margin: + alignTop ? const EdgeInsets.only(top: 1) : EdgeInsets.zero, + alignment: Alignment.center, + decoration: BoxDecoration( + color: value ? t.primary : t.surface, + border: + Border.all(color: value ? t.primary : t.border, width: 1.5), + borderRadius: BorderRadius.circular(AppDims.rSm), + ), + child: value + ? Icon(LucideIcons.check, size: 13, color: t.onPrimary) + : null, + ), + SizedBox(width: alignTop ? 9 : 8), + Flexible(child: label), + ], + ), + ), + ); + } +} + +/// 原型 .input：h38 / surface / 1px border / r-md / pad 0 11 / fs-body； +/// focus → primary 边；readonly/disabled → bg 底 + muted 字。 +class DsInput extends StatelessWidget { + final TextEditingController? controller; + final bool enabled; + final String? hintText; + final ValueChanged? onChanged; + final ValueChanged? onSubmitted; + final TextInputType? keyboardType; + final FocusNode? focusNode; + final bool obscureText; // 密码框 + final Widget? suffix; // 行内后缀（历史下拉箭头 / 密码可见切换） + const DsInput({ + super.key, + this.controller, + this.enabled = true, + this.hintText, + this.onChanged, + this.onSubmitted, + this.keyboardType, + this.focusNode, + this.obscureText = false, + this.suffix, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + OutlineInputBorder line(Color c) => OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: c), + ); + return SizedBox( + height: 38, + child: TextField( + controller: controller, + enabled: enabled, + onChanged: onChanged, + onSubmitted: onSubmitted, + keyboardType: keyboardType, + focusNode: focusNode, + obscureText: obscureText, + // letterSpacing 0：M3 默认字距比原型（无字距）宽，数字/拉丁明显 + style: TextStyle( + fontSize: AppDims.fsBody, + letterSpacing: 0, + color: enabled ? t.text : t.muted), + decoration: InputDecoration( + isDense: true, + // 装饰盒锁死 .input 的 38 高（不随 visualDensity 漂移） + constraints: const BoxConstraints.tightFor(height: 38), + filled: true, + fillColor: enabled ? t.surface : t.bg, + hintText: hintText, + hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), + contentPadding: + const EdgeInsets.symmetric(horizontal: 11, vertical: 9), + suffixIcon: suffix == null + ? null + : Padding( + padding: const EdgeInsets.only(right: 9), child: suffix), + suffixIconConstraints: + const BoxConstraints(minWidth: 0, minHeight: 0), + enabledBorder: line(t.border), + disabledBorder: line(t.border), + focusedBorder: line(t.primary), + border: line(t.border), + ), + ), + ); + } +} + +/// 原型 select：.input 盒式外观（h38/surface/border/r-md/pad 0 11 + 右侧 +/// chevron），点击弹 DsMenu（.menu 弹层，含 ✓ 选中态、锚定坐标已对齐）。 +/// 统一替代 Material DropdownButton——其默认灰底方角弹层不属 ds 体系。 +class DsSelect extends StatelessWidget { + final T? value; + final List<(T, String)> options; + final ValueChanged? onChanged; + final String hint; + const DsSelect({ + super.key, + required this.value, + required this.options, + required this.onChanged, + this.hint = '请选择…', + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final label = + options.where((o) => o.$1 == value).map((o) => o.$2).firstOrNull; + final enabled = onChanged != null; + return Builder( + builder: (bctx) => InkWell( + onTap: enabled + ? () async { + final picked = await showDsMenu(bctx, items: [ + for (final o in options) + DsMenuItem( + value: o.$1, label: o.$2, selected: o.$1 == value), + ]); + if (picked != null) onChanged!(picked); + } + : null, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + height: 38, + padding: const EdgeInsets.symmetric(horizontal: 11), + decoration: BoxDecoration( + color: enabled ? t.surface : t.bg, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Row(children: [ + Expanded( + child: Text(label ?? hint, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsBody, + color: label == null + ? t.faint + : (enabled ? t.text : t.muted))), + ), + const SizedBox(width: 8), + Icon(LucideIcons.chevronDown, size: 14, color: t.muted), + ]), + ), + ), + ); + } +} + class DsSearchBox extends StatelessWidget { final TextEditingController? controller; final String hint; @@ -204,7 +515,7 @@ class DsSearchBox extends StatelessWidget { ), child: Row( children: [ - Icon(Icons.search, size: 14, color: t.faint), + Icon(LucideIcons.search, size: 14, color: t.faint), const SizedBox(width: 8), Expanded( child: TextField( @@ -214,7 +525,11 @@ class DsSearchBox extends StatelessWidget { style: TextStyle(fontSize: AppDims.fsBody, color: t.text), decoration: InputDecoration( isCollapsed: true, + contentPadding: EdgeInsets.zero, border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, hintText: hint, hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), @@ -236,7 +551,7 @@ class DsSearchBox extends StatelessWidget { }, child: Padding( padding: const EdgeInsets.only(left: 6), - child: Icon(Icons.close, size: 14, color: t.muted), + child: Icon(LucideIcons.x, size: 14, color: t.muted), ), ); }, diff --git a/client/lib/widgets/ds/ds_bar_chart.dart b/client/lib/widgets/ds/ds_bar_chart.dart new file mode 100644 index 0000000..39ad576 --- /dev/null +++ b/client/lib/widgets/ds/ds_bar_chart.dart @@ -0,0 +1,149 @@ +// widgets/ds/ds_bar_chart.dart — 原型 finance.html 收支趋势分组柱状图（镜像 .barchart）。 +// 度量照原型：图高 180 / 柱宽 26 / pair 内 gap 6 / 列间 gap 18 / 柱顶 mono 数值标签 +// （top:-17）/ 顶圆角 r-sm；收入柱=primary、支出柱=brand400；含图例（.chart-legend）。 +import 'package:flutter/material.dart'; + +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; +import '../../core/theme/app_fonts.dart'; + +class DsBarGroup { + final String label; // 列底标签（如 1月） + final double a; // 收入（primary 柱） + final double b; // 支出（brand400 柱） + const DsBarGroup(this.label, this.a, this.b); +} + +class DsBarChart extends StatelessWidget { + final List groups; + final String legendA; + final String legendB; + + /// 柱顶数值标签格式化（原型显示「万元」整数）。 + final String Function(double v) format; + + const DsBarChart({ + super.key, + required this.groups, + this.legendA = '收入', + this.legendB = '支出', + required this.format, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + var max = 0.0; + for (final g in groups) { + if (g.a > max) max = g.a; + if (g.b > max) max = g.b; + } + if (max <= 0) max = 1; + + return Container( + // 原型 .chart-card：surface / border / r-lg / padding 18 20 14 + padding: const EdgeInsets.fromLTRB(20, 18, 20, 14), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // .chart-legend + Row(children: [ + _legend(t, t.primary, legendA), + const SizedBox(width: 18), + _legend(t, t.brand400, legendB), + ]), + const SizedBox(height: 16), + // .barchart：高 180 + 顶部标签余量 6 + SizedBox( + height: 186, + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + for (var i = 0; i < groups.length; i++) ...[ + if (i > 0) const SizedBox(width: 18), + Expanded(child: _col(t, groups[i], max)), + ], + ], + ), + ), + ], + ), + ); + } + + Widget _legend(dynamic t, Color color, String label) => + Row(mainAxisSize: MainAxisSize.min, children: [ + Container( + width: 11, + height: 11, + decoration: BoxDecoration( + color: color, borderRadius: BorderRadius.circular(3))), + const SizedBox(width: 7), + Text(label, style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ]); + + Widget _col(dynamic t, DsBarGroup g, double max) { + return LayoutBuilder(builder: (ctx, cons) { + // 原型柱宽 26；窄屏（列宽不足）按列宽收缩，防横向溢出 + final barW = ((cons.maxWidth - 6) / 2).clamp(8.0, 26.0); + return Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Expanded( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + _bar(t, g.a, max, t.primary, barW), + const SizedBox(width: 6), + _bar(t, g.b, max, t.brand400, barW), + ], + ), + ), + const SizedBox(height: 8), + Text(g.label, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ], + ); + }); + } + + Widget _bar(dynamic t, double v, double max, Color color, double barW) { + // 最高柱 140 + 顶标签 ~18 ≈ 原型 .bar-pair 可用高（180 - 月份标签行） + final h = (v / max * 140).clamp(2.0, 140.0); + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + // .bv 柱顶数值（mono fs-xs muted；原型绝对定位悬浮 → 布局占柱宽、绘制可溢出） + SizedBox( + width: barW, + child: Center( + child: Text(format(v), + softWrap: false, + overflow: TextOverflow.visible, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.muted, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ), + ), + const SizedBox(height: 3), + Container( + width: barW, + height: h, + decoration: BoxDecoration( + color: color, + borderRadius: + const BorderRadius.vertical(top: Radius.circular(AppDims.rSm)), + ), + ), + ], + ); + } +} diff --git a/client/lib/widgets/ds/ds_kpi.dart b/client/lib/widgets/ds/ds_kpi.dart index 86b77eb..5e9b916 100644 --- a/client/lib/widgets/ds/ds_kpi.dart +++ b/client/lib/widgets/ds/ds_kpi.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import '../../core/theme/context_tokens.dart'; import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/app_fonts.dart'; /// 图标块 .ic 变体（软底 + 前景色）。 enum DsKpiTone { info, ok, blue, alert } @@ -14,7 +15,8 @@ enum DsKpiDelta { up, down, neutral } class DsKpi extends StatelessWidget { final String title; final String value; - final IconData icon; + // 原型 users.html 的 KPI 无右上图标块 → icon 可空时不渲染 .ic + final IconData? icon; final DsKpiTone tone; final String? delta; final DsKpiDelta deltaTone; @@ -24,7 +26,7 @@ class DsKpi extends StatelessWidget { super.key, required this.title, required this.value, - required this.icon, + this.icon, this.tone = DsKpiTone.info, this.delta, this.deltaTone = DsKpiDelta.neutral, @@ -63,19 +65,19 @@ class DsKpi extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(top: 2), child: Text(title, - style: TextStyle( - fontSize: AppDims.fsSm, color: t.muted)), + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), ), ), - Container( - width: 30, - height: 30, - decoration: BoxDecoration( - color: icBg, - borderRadius: BorderRadius.circular(AppDims.rMd)), - alignment: Alignment.center, - child: Icon(icon, size: 17, color: icFg), - ), + if (icon != null) + Container( + width: 30, + height: 30, + decoration: BoxDecoration( + color: icBg, + borderRadius: BorderRadius.circular(AppDims.rMd)), + alignment: Alignment.center, + child: Icon(icon, size: 17, color: icFg), + ), ], ), const SizedBox(height: 7), @@ -84,23 +86,19 @@ class DsKpi extends StatelessWidget { fontSize: 24, fontWeight: FontWeight.w700, letterSpacing: 0.3, - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, color: tone == DsKpiTone.alert ? t.accent : t.heading)), if (delta != null) ...[ const SizedBox(height: 5), - Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (deltaTone != DsKpiDelta.neutral) - Icon( - deltaTone == DsKpiDelta.up - ? Icons.arrow_drop_up - : Icons.arrow_drop_down, - size: 14, - color: deltaColor), - Text(delta!, - style: TextStyle(fontSize: AppDims.fsXs, color: deltaColor)), - ], + // 原型 .d 的箭头是文本字符 ▲/▼（非图标），gap4。 + Text( + switch (deltaTone) { + DsKpiDelta.up => '▲ ${delta!}', + DsKpiDelta.down => '▼ ${delta!}', + DsKpiDelta.neutral => delta!, + }, + style: TextStyle(fontSize: AppDims.fsXs, color: deltaColor), ), ], ], diff --git a/client/lib/widgets/ds/ds_menu.dart b/client/lib/widgets/ds/ds_menu.dart new file mode 100644 index 0000000..145fbb4 --- /dev/null +++ b/client/lib/widgets/ds/ds_menu.dart @@ -0,0 +1,226 @@ +// widgets/ds/ds_menu.dart — 原型 .menu/.menu-item 下拉菜单（镜像 atoms.css + shell.js openMenu）。 +// 定位规则照抄 openMenu：宽 = max(锚宽, minW=168)，左缘夹在视口内(留 8px)， +// 锚下 6px 展开、下方放不下且上方够高则向上翻。 +import 'dart:math' as math; + +import 'package:flutter/material.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../../core/theme/context_tokens.dart'; +import '../../core/theme/app_dims.g.dart'; + +/// 菜单项：sel → 前导 ✓(primary) + 文字 primary fw600；icon → 前导 16px 图标； +/// 都没有 → 16px 占位（对齐 openMenu 的 lead 槽）。 +class DsMenuItem { + final T value; + final String label; + final IconData? icon; + final bool selected; + const DsMenuItem({ + required this.value, + required this.label, + this.icon, + this.selected = false, + }); +} + +/// 单选菜单：点击项返回其 value 并关闭；点外部关闭返回 null。 +Future showDsMenu( + BuildContext anchorContext, { + required List> items, + double minWidth = 168, +}) { + final rect = _anchorRect(anchorContext); + return Navigator.of(anchorContext).push(_DsMenuRoute( + anchorRect: rect, + minWidth: minWidth, + builder: (ctx) => _DsMenuPanel( + children: [ + for (final it in items) + _DsMenuItemTile( + item: it, + onTap: () => Navigator.of(ctx).pop(it.value), + ), + ], + ), + )); +} + +/// 多选菜单（列设置 / 多选筛选）：点击项切换选中、菜单保持打开；点外部关闭。 +/// [itemsBuilder] 每次切换后重建以刷新 ✓ 态；[onToggle] 通知外部改状态。 +Future showDsMultiMenu( + BuildContext anchorContext, { + required List> Function() itemsBuilder, + required ValueChanged onToggle, + double minWidth = 168, +}) { + final rect = _anchorRect(anchorContext); + return Navigator.of(anchorContext).push(_DsMenuRoute( + anchorRect: rect, + minWidth: minWidth, + builder: (ctx) => StatefulBuilder( + builder: (ctx, setState) => _DsMenuPanel( + children: [ + for (final it in itemsBuilder()) + _DsMenuItemTile( + item: it, + onTap: () { + onToggle(it.value); + setState(() {}); + }, + ), + ], + ), + ), + )); +} + +Rect _anchorRect(BuildContext anchorContext) { + // 锚点矩形必须和菜单路由同坐标系：路由推到 Navigator.of(anchorContext)， + // 该导航器不一定占满屏幕（shell 分支导航器原点在侧栏右/顶栏下； + // useRootNavigator:false 的抽屉同理），用全局坐标会整体漂移。 + final box = anchorContext.findRenderObject() as RenderBox; + final navBox = + Navigator.of(anchorContext).context.findRenderObject() as RenderBox?; + final origin = box.localToGlobal(Offset.zero, ancestor: navBox); + return origin & box.size; +} + +class _DsMenuRoute extends PopupRoute { + final Rect anchorRect; + final double minWidth; + final WidgetBuilder builder; + _DsMenuRoute({ + required this.anchorRect, + required this.minWidth, + required this.builder, + }); + + @override + Color? get barrierColor => Colors.transparent; + @override + bool get barrierDismissible => true; + @override + String? get barrierLabel => 'menu'; + @override + Duration get transitionDuration => Duration.zero; + + @override + Widget buildPage(BuildContext context, Animation animation, + Animation secondaryAnimation) { + return CustomSingleChildLayout( + delegate: _DsMenuLayout(anchorRect, minWidth), + child: builder(context), + ); + } +} + +class _DsMenuLayout extends SingleChildLayoutDelegate { + final Rect anchor; + final double minWidth; + _DsMenuLayout(this.anchor, this.minWidth); + + @override + BoxConstraints getConstraintsForChild(BoxConstraints constraints) { + final maxW = math.max(minWidth, constraints.maxWidth - 16); + return BoxConstraints( + minWidth: math.min(math.max(anchor.width, minWidth), maxW), + maxWidth: maxW, + maxHeight: math.max(0, constraints.maxHeight - 16), + ); + } + + @override + Offset getPositionForChild(Size size, Size childSize) { + final left = anchor.left + .clamp(8.0, math.max(8.0, size.width - childSize.width - 8)) + .toDouble(); + final below = anchor.bottom + 6; + final above = anchor.top - childSize.height - 6; + final top = + (below + childSize.height > size.height && above > 6) ? above : below; + return Offset(left, top); + } + + @override + bool shouldRelayout(_DsMenuLayout old) => + old.anchor != anchor || old.minWidth != minWidth; +} + +/// .menu：surface / border / r-md / sh-2(0 4px 14px shadow) / pad 6。 +class _DsMenuPanel extends StatelessWidget { + final List children; + const _DsMenuPanel({required this.children}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return Material( + color: Colors.transparent, + child: Container( + padding: const EdgeInsets.all(6), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + boxShadow: [ + BoxShadow( + color: t.shadow, offset: const Offset(0, 4), blurRadius: 14), + ], + ), + child: SingleChildScrollView( + child: IntrinsicWidth( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: children, + ), + ), + ), + ), + ); + } +} + +/// .menu-item：gap9 / pad 8 10 / r-sm / fs-body，hover→bg； +/// sel → 前导 ✓ + primary fw600；icon 颜色随文字（.mi-ic 继承 currentColor）。 +class _DsMenuItemTile extends StatelessWidget { + final DsMenuItem item; + final VoidCallback onTap; + const _DsMenuItemTile({required this.item, required this.onTap}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final fg = item.selected ? t.primary : t.text; + return InkWell( + onTap: onTap, + hoverColor: t.bg, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + width: 16, + height: 16, + child: item.selected + ? Icon(LucideIcons.check, size: 16, color: t.primary) + : (item.icon != null + ? Icon(item.icon, size: 16, color: fg) + : null), + ), + const SizedBox(width: 9), + Text(item.label, + style: TextStyle( + fontSize: AppDims.fsBody, + color: fg, + fontWeight: + item.selected ? FontWeight.w600 : FontWeight.w400)), + ], + ), + ), + ); + } +} diff --git a/client/lib/widgets/ds/ds_table.dart b/client/lib/widgets/ds/ds_table.dart index c2ece6c..3d37066 100644 --- a/client/lib/widgets/ds/ds_table.dart +++ b/client/lib/widgets/ds/ds_table.dart @@ -1,9 +1,15 @@ // widgets/ds/ds_table.dart — 原型 .table + .toolbar + .pager（镜像 atoms.css）。 -// .toolbar(圆角上,无下边) 接 .table.flush-top(圆角下) 接 .pager，视觉连成一卡。 +// .toolbar(圆角上,无下边) 接 .table.flush-top(圆角下) 连成一卡；.pager 透明、在卡外。 +import 'dart:math' as math; + import 'package:flutter/material.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + import '../../core/responsive/responsive.dart'; import '../../core/theme/context_tokens.dart'; import '../../core/theme/app_dims.g.dart'; +import 'ds_menu.dart'; +import '../../core/theme/app_fonts.dart'; class DsColumn { final String key; @@ -36,6 +42,12 @@ class DsTable extends StatefulWidget { final ValueChanged? onPageSizeChanged; // 窄屏卡片流（与 rows 同序）；为空时窄屏也走表格横滚 final List? mobileCards; + // 仅文案分页（原型 partners/products 的 .pager 只有一行 span 文案，无翻页控件）； + // 与 total 互斥，total 为空且此值非空时生效。 + final String? pagerInfoText; + // 内嵌收缩模式（多区块滚动页里的表格卡，如 devices/settings）： + // 不用 Expanded 撑满、表格不带内部滚动，高度随内容。 + final bool shrinkWrap; const DsTable({ super.key, @@ -49,6 +61,8 @@ class DsTable extends StatefulWidget { this.onPageChanged, this.onPageSizeChanged, this.mobileCards, + this.pagerInfoText, + this.shrinkWrap = false, }); @override @@ -71,35 +85,61 @@ class _DsTableState extends State { @override Widget build(BuildContext context) { final t = context.tokens; - return Container( - decoration: BoxDecoration( - color: t.surface, - border: Border.all(color: t.border), - borderRadius: BorderRadius.circular(AppDims.rLg), - ), - clipBehavior: Clip.antiAlias, - child: Column( - // 整宽拉伸：toolbar/表格/分页都填满卡片宽度（否则 toolbar 按内容宽居中→左侧留白）。 - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - if (widget.toolbar != null) ...[ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12), - child: widget.toolbar!, + return Column( + mainAxisSize: widget.shrinkWrap ? MainAxisSize.min : MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _maybeExpand( + Container( + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + clipBehavior: Clip.antiAlias, + child: Column( + // 整宽拉伸：toolbar/表格都填满卡片宽度（否则 toolbar 按内容宽居中→左侧留白）。 + mainAxisSize: + widget.shrinkWrap ? MainAxisSize.min : MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (widget.toolbar != null) ...[ + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 14, vertical: 12), + child: widget.toolbar!, + ), + Divider(height: 1, color: t.border), + ], + _maybeExpand( + (context.isMobile && widget.mobileCards != null) + ? (widget.shrinkWrap + ? _buildMobileShrink(t) + : _buildMobile(t)) + : (widget.shrinkWrap + ? _buildTableShrink(t) + : _buildTable(t)), + ), + ], ), - Divider(height: 1, color: t.border), - ], - Expanded( - child: (context.isMobile && widget.mobileCards != null) - ? _buildMobile(t) - : _buildTable(t), ), - if (widget.total != null) _buildPager(t), - ], - ), + ), + if (widget.total != null) + _buildPager(t) + else if (widget.pagerInfoText != null) + Padding( + padding: const EdgeInsets.fromLTRB(4, 13, 4, 2), + child: Text(widget.pagerInfoText!, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ), + ], ); } + /// shrinkWrap 模式下的 Expanded 兼容：收缩时原样返回，撑满时包 Expanded。 + Widget _maybeExpand(Widget child) => + widget.shrinkWrap ? child : Expanded(child: child); + Widget _buildMobile(dynamic t) { final cards = widget.mobileCards!; if (cards.isEmpty) return _empty(t); @@ -111,6 +151,44 @@ class _DsTableState extends State { ); } + /// 收缩版卡片流（外层页面自带滚动）。 + Widget _buildMobileShrink(dynamic t) { + final cards = widget.mobileCards!; + if (cards.isEmpty) return _empty(t); + return Padding( + padding: const EdgeInsets.all(12), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (var i = 0; i < cards.length; i++) ...[ + if (i > 0) const SizedBox(height: 10), + cards[i], + ], + ], + ), + ); + } + + /// 收缩版表格：不带内部滚动，高度随内容（多区块滚动页用）。 + Widget _buildTableShrink(dynamic t) { + if (widget.rows.isEmpty) return _empty(t); + return ValueListenableBuilder( + valueListenable: _hovered, + builder: (context, hov, __) => Table( + defaultColumnWidth: const IntrinsicColumnWidth(), + columnWidths: const {0: FlexColumnWidth()}, + // 原型 td vertical-align: middle——混高单元格（名称双行等）垂直居中 + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + _headerRow(t), + for (int i = 0; i < widget.rows.length; i++) + _dataRow(t, i, widget.rows[i], hov), + ], + ), + ); + } + Widget _empty(dynamic t) => Center( child: Padding( padding: const EdgeInsets.all(48), @@ -136,13 +214,18 @@ class _DsTableState extends State { scrollDirection: Axis.horizontal, child: ConstrainedBox( constraints: BoxConstraints(minWidth: constraints.maxWidth), - child: Table( - defaultColumnWidth: const IntrinsicColumnWidth(), - children: [ - _headerRow(t), - for (int i = 0; i < widget.rows.length; i++) - _dataRow(t, i, widget.rows[i]), - ], + child: ValueListenableBuilder( + valueListenable: _hovered, + builder: (context, hov, __) => Table( + defaultColumnWidth: const IntrinsicColumnWidth(), + // 原型 td vertical-align: middle + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + _headerRow(t), + for (int i = 0; i < widget.rows.length; i++) + _dataRow(t, i, widget.rows[i], hov), + ], + ), ), ), ), @@ -169,8 +252,7 @@ class _DsTableState extends State { // 原型 thead th: pad 11 14 padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11), child: Align( - alignment: - c.numeric ? Alignment.centerRight : Alignment.centerLeft, + alignment: c.numeric ? Alignment.centerRight : Alignment.centerLeft, child: child, ), ); @@ -178,120 +260,233 @@ class _DsTableState extends State { ); } - TableRow _dataRow(dynamic t, int index, DsRow row) { + TableRow _dataRow(dynamic t, int index, DsRow row, int hovered) { + // 背景 + 下边框挂在行级 decoration：单元格高度随内容各不相同（如名称双行 vs + // 单行徽章），若把边框画在格子上，矮格子的下边框会浮在行中间「断线」， + // hover 背景也会条纹化。行级画一次，整行齐平（原型 tbody td 的 border 视觉）。 + final bg = hovered == index ? t.rowHover : (row.highlight); return TableRow( + decoration: BoxDecoration( + color: bg, + border: Border(bottom: BorderSide(color: t.borderSubtle)), + ), children: List.generate(row.cells.length, (col) { final c = widget.columns[col]; return MouseRegion( - cursor: row.onTap != null - ? SystemMouseCursors.click - : MouseCursor.defer, + cursor: + row.onTap != null ? SystemMouseCursors.click : MouseCursor.defer, onEnter: (_) => _hovered.value = index, onExit: (_) { if (_hovered.value == index) _hovered.value = -1; }, - child: ValueListenableBuilder( - valueListenable: _hovered, - builder: (context, hov, __) { - final bg = hov == index ? t.rowHover : (row.highlight); - return GestureDetector( - onTap: row.onTap, - behavior: HitTestBehavior.opaque, - child: Container( - // 原型 tbody td: pad 12 14，下边 border-subtle - constraints: const BoxConstraints(minHeight: 44), - decoration: BoxDecoration( - color: bg, - border: Border( - bottom: BorderSide(color: t.borderSubtle)), - ), - padding: - const EdgeInsets.symmetric(horizontal: 14, vertical: 12), - alignment: c.numeric - ? Alignment.centerRight - : Alignment.centerLeft, - child: DefaultTextStyle.merge( - style: TextStyle( - fontSize: AppDims.fsBody, color: t.text), - child: row.cells[col], - ), - ), - ); - }, + child: GestureDetector( + onTap: row.onTap, + behavior: HitTestBehavior.opaque, + child: Container( + // 原型 tbody td: pad 12 14 + constraints: const BoxConstraints(minHeight: 44), + padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12), + alignment: + c.numeric ? Alignment.centerRight : Alignment.centerLeft, + child: DefaultTextStyle.merge( + style: TextStyle(fontSize: AppDims.fsBody, color: t.text), + child: row.cells[col], + ), + ), ), ); }), ); } - // 原型 .pager：每页 N 条 + 显示范围 + 翻页 + static const _pageSizes = [10, 20, 50, 100]; + + // 原型 .pager（卡外透明，pad 13 4 2，gap12）： + // 「每页 [pgsize-btn ▾] 条」 · 「显示 X–Y，共 N」 · 右侧 .pg 数字页码 ‹ 1 2 ›。 Widget _buildPager(dynamic t) { final total = widget.total!; - final pages = (total / widget.pageSize).ceil().clamp(1, 99999); + final pages = math.max(1, (total / widget.pageSize).ceil()); final start = total == 0 ? 0 : (widget.page - 1) * widget.pageSize + 1; final end = (widget.page * widget.pageSize).clamp(0, total); final labelStyle = TextStyle(fontSize: AppDims.fsSm, color: t.muted); - return Container( - padding: const EdgeInsets.fromLTRB(14, 10, 14, 10), + return Padding( + padding: const EdgeInsets.fromLTRB(4, 13, 4, 2), child: Row( children: [ if (widget.onPageSizeChanged != null && !context.isMobile) ...[ + // .pg-size：每页 [btn] 条（组内 gap6） Text('每页', style: labelStyle), const SizedBox(width: 6), - DropdownButtonHideUnderline( - child: DropdownButton( - value: const [10, 20, 50, 100].contains(widget.pageSize) - ? widget.pageSize - : 20, - isDense: true, - style: TextStyle( - fontSize: AppDims.fsSm, - color: t.text, - fontFamily: 'monospace'), - items: const [10, 20, 50, 100] - .map((n) => - DropdownMenuItem(value: n, child: Text('$n 条'))) - .toList(), - onChanged: (v) { - if (v != null) widget.onPageSizeChanged!(v); - }, - ), - ), - const SizedBox(width: 16), + _pgSizeBtn(t), + const SizedBox(width: 6), + Text('条', style: labelStyle), + const SizedBox(width: 12), ], Text('显示 $start–$end，共 $total', style: labelStyle), const Spacer(), - _pgBtn(t, Icons.chevron_left, - widget.page > 1 ? () => widget.onPageChanged?.call(widget.page - 1) : null), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 8), - child: Text('${widget.page} / $pages', - style: TextStyle( - fontSize: AppDims.fsSm, - color: t.text, - fontFamily: 'monospace')), - ), - _pgBtn(t, Icons.chevron_right, - widget.page < pages ? () => widget.onPageChanged?.call(widget.page + 1) : null), + _pgGroup(t, pages), ], ), ); } - Widget _pgBtn(dynamic t, IconData icon, VoidCallback? onTap) { - return SizedBox( - width: 30, - height: 30, - child: Material( - color: t.surface, - shape: RoundedRectangleBorder( - side: BorderSide(color: t.border), - borderRadius: BorderRadius.circular(AppDims.rSm), + // .pgsize-btn：h30 / pad 0 8 0 10 / border r-sm / surface / fs-sm mono + caret 12(muted)， + // 点击 openMenu（minW 88）单选每页条数。 + Widget _pgSizeBtn(dynamic t) { + return Builder( + builder: (bctx) => InkWell( + onTap: () async { + final v = await showDsMenu( + bctx, + minWidth: 88, + items: [ + for (final n in _pageSizes) + DsMenuItem( + value: n, label: '$n', selected: n == widget.pageSize), + ], + ); + if (v != null) widget.onPageSizeChanged!(v); + }, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Container( + height: 30, + padding: const EdgeInsets.fromLTRB(10, 0, 8, 0), + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rSm), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text('${widget.pageSize}', + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.text, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + const SizedBox(width: 6), + Icon(LucideIcons.chevronDown, size: 12, color: t.muted), + ], + ), ), - child: InkWell( - onTap: onTap, - child: Icon(icon, - size: 16, color: onTap == null ? t.faint : t.text), + ), + ); + } + + // .pg：gap4；‹ 数字页码 ›；cur=primary。页数多时开窗（1 … 邻域 … 末页）。 + Widget _pgGroup(dynamic t, int pages) { + final nums = _pageWindow(pages); + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + _pgBtn(t, '‹', + onTap: widget.page > 1 + ? () => widget.onPageChanged?.call(widget.page - 1) + : null), + for (final n in nums) ...[ + const SizedBox(width: 4), + if (n == -1) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 2), + child: Text('…', + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.muted, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ) + else + _pgBtn(t, '$n', + cur: n == widget.page, + onTap: n == widget.page + ? null + : () => widget.onPageChanged?.call(n)), + ], + const SizedBox(width: 4), + _pgBtn(t, '›', + onTap: widget.page < pages + ? () => widget.onPageChanged?.call(widget.page + 1) + : null), + ], + ); + } + + // 页码开窗：≤7 页全显（同原型全量循环）；更多时 1 … cur±1 … last，-1 表示省略号。 + List _pageWindow(int pages) { + if (pages <= 7) return [for (var p = 1; p <= pages; p++) p]; + final cur = widget.page.clamp(1, pages); + final set = {1, pages, cur - 1, cur, cur + 1} + ..removeWhere((p) => p < 1 || p > pages); + final sorted = set.toList()..sort(); + final out = []; + for (var i = 0; i < sorted.length; i++) { + if (i > 0 && sorted[i] - sorted[i - 1] > 1) out.add(-1); + out.add(sorted[i]); + } + return out; + } + + // .pg button：minW30 h30 pad 0 6 border r-sm mono fs-sm；cur→primary 底反白；disabled→faint。 + Widget _pgBtn(dynamic t, String label, + {bool cur = false, VoidCallback? onTap}) { + final fg = cur ? t.onPrimary : (onTap == null && !cur ? t.faint : t.text); + return Material( + color: cur ? t.primary : t.surface, + shape: RoundedRectangleBorder( + side: BorderSide(color: cur ? t.primary : t.border), + borderRadius: BorderRadius.circular(AppDims.rSm), + ), + child: InkWell( + onTap: onTap, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Container( + constraints: const BoxConstraints(minWidth: 30), + height: 30, + padding: const EdgeInsets.symmetric(horizontal: 6), + alignment: Alignment.center, + child: Text(label, + style: TextStyle( + fontSize: AppDims.fsSm, + color: fg, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ), + ), + ); + } +} + +/// 原型 thead th .fh 漏斗列头：label + funnel(12, sw1.6)，有筛选值时整体 primary。 +/// 点击回调携带列头自身 BuildContext（供 showDsMenu 锚定）。 +class DsFilterHeader extends StatelessWidget { + final String label; + final bool filtered; + final void Function(BuildContext anchorContext) onOpen; + const DsFilterHeader( + {super.key, + required this.label, + required this.filtered, + required this.onOpen}); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final color = filtered ? t.primary : t.muted; + return Builder( + builder: (bctx) => InkWell( + onTap: () => onOpen(bctx), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text(label, + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: color)), + const SizedBox(width: 5), + Icon(LucideIcons.funnel, size: 12, color: color), + ], ), ), ); diff --git a/client/lib/widgets/ds/ds_toast.dart b/client/lib/widgets/ds/ds_toast.dart new file mode 100644 index 0000000..f6d7aac --- /dev/null +++ b/client/lib/widgets/ds/ds_toast.dart @@ -0,0 +1,92 @@ +// widgets/ds/ds_toast.dart — 原型 .toast（atoms.css）1:1： +// fixed bottom:26 水平居中 / --toast-bg 底 + 白字 fs-body / pad 11 18 / r-md / +// **内容自适应宽**（不定宽、不贯穿）/ .25s 淡入+上滑 / 2.2s 自动消失。 +// 单例复用：新消息顶替旧消息（对齐原型同一 #toast 节点 + 计时器重置）， +// 天然避免多条提示叠罗汉。语义底色（成功/失败）由调用点传 [bg] 覆盖。 +import 'dart:async'; + +import 'package:flutter/material.dart'; + +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/context_tokens.dart'; + +OverlayEntry? _entry; +Timer? _timer; + +void showDsToast( + BuildContext context, + String message, { + Color? bg, + Duration duration = const Duration(milliseconds: 2200), +}) { + final overlay = Overlay.maybeOf(context, rootOverlay: true); + if (overlay == null) return; + final color = bg ?? context.tokens.toastBg; + + _timer?.cancel(); + if (_entry?.mounted ?? false) _entry!.remove(); + _entry = null; + final entry = OverlayEntry( + builder: (_) => _DsToast(message: message, bg: color), + ); + _entry = entry; + overlay.insert(entry); + _timer = Timer(duration, () { + if (_entry == entry) { + if (entry.mounted) entry.remove(); + _entry = null; + } + }); +} + +class _DsToast extends StatelessWidget { + final String message; + final Color bg; + const _DsToast({required this.message, required this.bg}); + + @override + Widget build(BuildContext context) { + return Positioned( + left: 0, + right: 0, + bottom: 26, + child: IgnorePointer( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + TweenAnimationBuilder( + tween: Tween(begin: 0, end: 1), + duration: const Duration(milliseconds: 250), + curve: Curves.easeOut, + builder: (_, v, child) => Opacity( + opacity: v, + child: Transform.translate( + offset: Offset(0, 20 * (1 - v)), child: child), + ), + child: Material( + color: Colors.transparent, + child: Container( + constraints: const BoxConstraints(maxWidth: 560), + padding: + const EdgeInsets.symmetric(horizontal: 18, vertical: 11), + decoration: BoxDecoration( + color: bg, + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + child: Text( + message, + style: const TextStyle( + fontSize: AppDims.fsBody, + color: Colors + .white, // ds-ignore: toast 白字固定（承 toast-bg/语义色底） + ), + ), + ), + ), + ), + ], + ), + ), + ); + } +} diff --git a/client/lib/widgets/ds/grid_combo_cell.dart b/client/lib/widgets/ds/grid_combo_cell.dart new file mode 100644 index 0000000..6f8f778 --- /dev/null +++ b/client/lib/widgets/ds/grid_combo_cell.dart @@ -0,0 +1,737 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import '../../core/theme/app_dims.g.dart'; +import '../../core/theme/app_tokens.dart'; +import '../../core/theme/context_tokens.dart'; +import '../searchable_option_field.dart' show OptionItem; +import '../../core/theme/app_fonts.dart'; + +/// 内联可键盘操作的下拉选择格（对齐原型 `.combo` / `.combo.cell` + `.combo-pop`）。 +/// +/// - 聚焦即打开浮层；输入即过滤（名称 / 全拼 / 首字母 / 编码）。 +/// - ↑↓ 移动高亮，Enter 选中并回调 [onPickedByKeyboard]（供上层推进到下一格）， +/// Esc 关闭，Tab 交由上层 [onTab] 决定前进/后退。 +/// - [allowCreate] 时，输入无匹配可「新增到基础数据」，走 [onCreate]。 +/// - [commonIds] 命中的选项在无关键字时置顶为「常用」组（对齐系列/规格默认）。 +class GridComboCell extends StatefulWidget { + final FocusNode focusNode; + final List options; + final int? selectedId; + final String hint; + + /// true=网格单元格样式（透明、32 高）；false=独立表单 combo（描边、38 高）。 + final bool cell; + + /// 浮层是否置顶持久搜索框（对齐原型 .combo-pop > .cp-search，触发框只读展示）。 + /// null=沿用默认（单据头 combo 用弹层搜索、网格 combo 用单元格内联输入）； + /// 传 true 可让网格单元格也走弹层搜索（如入库明细的商品名/系列/规格）。 + final bool? popupSearch; + final bool hasError; + final bool enabled; + final bool allowCreate; + + /// 无关键字时置顶显示的「常用」选项 id（如按商品名带出的默认系列/规格）。 + final Set commonIds; + + /// 选项数、供应商/客户等大字典时置底显示计数（对齐原型单据头 combo 的 cp-foot）。 + final bool showCount; + + /// 单据头 combo（cell=false）浮层顶部 .cp-search 的占位文案；空则回退到 [hint]。 + final String? searchHint; + + /// 服务端搜索（供供应商/客户/库存商品等）；提供时输入 debounce 调它取结果。 + final Future> Function(String keyword)? onSearch; + + /// 新增到基础数据；返回新选项 id（自动选中）。 + final Future Function(String keyword)? onCreate; + + final void Function(int? id) onChanged; + + /// 通过键盘 Enter 选中后触发（上层据此推进到下一格 / 加行）。 + final VoidCallback? onPickedByKeyboard; + + /// Tab（shift=后退）；返回 true 表示已处理。 + final bool Function({required bool backward})? onTab; + + const GridComboCell({ + super.key, + required this.focusNode, + required this.options, + required this.selectedId, + required this.hint, + required this.onChanged, + this.cell = false, + this.popupSearch, + this.hasError = false, + this.enabled = true, + this.allowCreate = false, + this.commonIds = const {}, + this.showCount = false, + this.searchHint, + this.onSearch, + this.onCreate, + this.onPickedByKeyboard, + this.onTab, + }); + + @override + State createState() => _GridComboCellState(); +} + +/// 浮层里可高亮/选中的一项：既有选项，或「新增」行。 +class _PopEntry { + final OptionItem? opt; // null → 新增行 + final String? createKw; + const _PopEntry.opt(this.opt) : createKw = null; + const _PopEntry.create(this.createKw) : opt = null; + bool get isCreate => opt == null; +} + +class _GridComboCellState extends State { + final _ctrl = TextEditingController(); + final _link = LayerLink(); + final _listScroll = ScrollController(); + // 单据头 combo：浮层顶部持久搜索框的焦点（网格 combo 不用，走单元格内联输入）。 + final _searchFocus = FocusNode(); + OverlayEntry? _entry; + Timer? _debounce; + + /// 弹层搜索模式：浮层置顶显式搜索框，触发框保持只读展示（对齐原型 scope==='doc'）； + /// 反之走网格单元格内联输入过滤。默认单据头(cell=false)开、网格(cell=true)关， + /// 可由 [GridComboCell.popupSearch] 显式覆盖。 + bool get _docHead => widget.popupSearch ?? !widget.cell; + + bool _open = false; + String _kw = ''; + int _cursor = -1; + List<_PopEntry> _entries = const []; + List? _remote; // onSearch 结果；null=用本地 options + + @override + void initState() { + super.initState(); + widget.focusNode.addListener(_onFocusChange); + } + + @override + void didUpdateWidget(GridComboCell old) { + super.didUpdateWidget(old); + if (old.focusNode != widget.focusNode) { + old.focusNode.removeListener(_onFocusChange); + widget.focusNode.addListener(_onFocusChange); + } + if (_open) _rebuildEntries(); + } + + @override + void dispose() { + _debounce?.cancel(); + widget.focusNode.removeListener(_onFocusChange); + _removeOverlay(); + _ctrl.dispose(); + _searchFocus.dispose(); + _listScroll.dispose(); + super.dispose(); + } + + String get _selectedName => + widget.options + .where((o) => o.id == widget.selectedId) + .firstOrNull + ?.name ?? + ''; + + void _onFocusChange() { + if (widget.focusNode.hasFocus) { + _openPop(); + if (_docHead) { + // 触发框获焦即打开浮层，随后把输入焦点移进浮层顶部搜索框。 + WidgetsBinding.instance.addPostFrameCallback((_) { + if (_open && mounted) _searchFocus.requestFocus(); + }); + } + } else if (!_docHead) { + // 网格 combo：单元格失焦即收起。弹层搜索 combo 的收起改由 选中 / Esc / Tab / + // 点浮层外（TapRegion.onTapOutside）显式驱动——不再监听搜索框失焦， + // 避免点选项时「按下即失焦→微任务提前拆浮层→onTap 落空」的竞态（选中不填充）。 + _closePop(); + } + } + + void _dismiss() { + _searchFocus.unfocus(); + widget.focusNode.unfocus(); + _closePop(); + } + + // ── 浮层开合 ──────────────────────────────────────────────────────────── + void _openPop() { + if (_open || !widget.enabled) return; + _open = true; + _kw = ''; + _remote = null; + _ctrl.text = ''; + _rebuildEntries(); + _entry = OverlayEntry(builder: _buildPop); + Overlay.of(context).insert(_entry!); + } + + void _closePop() { + if (!_open) return; + _open = false; + _debounce?.cancel(); + _ctrl.text = ''; + _removeOverlay(); + if (mounted) setState(() {}); + } + + void _removeOverlay() { + _entry?.remove(); + _entry = null; + } + + List get _sourceOptions => _remote ?? widget.options; + + void _rebuildEntries() { + final kw = _kw.trim(); + final matched = kw.isEmpty + ? _sourceOptions + : _sourceOptions.where((o) => o.matches(kw)).toList(); + final list = <_PopEntry>[]; + for (final o in matched) { + list.add(_PopEntry.opt(o)); + } + final canCreate = widget.allowCreate && + widget.onCreate != null && + kw.isNotEmpty && + !_sourceOptions.any((o) => o.name == kw); + if (canCreate) list.add(_PopEntry.create(kw)); + _entries = list; + // 当前高亮：选中项优先，否则首项 + _cursor = + list.indexWhere((e) => !e.isCreate && e.opt!.id == widget.selectedId); + if (_cursor < 0) _cursor = list.isEmpty ? -1 : 0; + _entry?.markNeedsBuild(); + } + + void _onInput(String v) { + _kw = v; + if (widget.onSearch != null) { + _debounce?.cancel(); + _debounce = Timer(const Duration(milliseconds: 250), () async { + final res = await widget.onSearch!(v.trim()); + if (!mounted || !_open) return; + _remote = res; + _rebuildEntries(); + }); + // 本地即时反馈（用已有 options 过滤） + _rebuildEntries(); + } else { + _rebuildEntries(); + } + } + + void _move(int d) { + if (_entries.isEmpty) return; + _cursor = (_cursor + d + _entries.length) % _entries.length; + _entry?.markNeedsBuild(); + _scrollToCursor(); + } + + void _scrollToCursor() { + if (!_listScroll.hasClients || _cursor < 0) return; + const itemH = 36.0; + final target = _cursor * itemH; + final vp = _listScroll.position.viewportDimension; + final off = _listScroll.offset; + if (target < off) { + _listScroll.jumpTo(target); + } else if (target + itemH > off + vp) { + _listScroll.jumpTo( + (target + itemH - vp).clamp(0, _listScroll.position.maxScrollExtent)); + } + } + + Future _pickCursor({required bool byKeyboard}) async { + if (_cursor < 0 || _cursor >= _entries.length) return; + final e = _entries[_cursor]; + if (e.isCreate) { + final id = await widget.onCreate!(e.createKw!); + if (id != null) { + widget.onChanged(id); + if (byKeyboard) widget.onPickedByKeyboard?.call(); + } + _dismiss(); + return; + } + widget.onChanged(e.opt!.id); + _dismiss(); + if (byKeyboard) widget.onPickedByKeyboard?.call(); + } + + KeyEventResult _onKey(FocusNode node, KeyEvent event) { + if (event is! KeyDownEvent && event is! KeyRepeatEvent) { + return KeyEventResult.ignored; + } + final key = event.logicalKey; + if (!_open) { + if (key == LogicalKeyboardKey.enter || + key == LogicalKeyboardKey.arrowDown) { + _openPop(); + return KeyEventResult.handled; + } + return KeyEventResult.ignored; + } + if (key == LogicalKeyboardKey.arrowDown) { + _move(1); + return KeyEventResult.handled; + } + if (key == LogicalKeyboardKey.arrowUp) { + _move(-1); + return KeyEventResult.handled; + } + if (key == LogicalKeyboardKey.enter || + key == LogicalKeyboardKey.numpadEnter) { + _pickCursor(byKeyboard: true); + return KeyEventResult.handled; + } + if (key == LogicalKeyboardKey.escape) { + _dismiss(); + return KeyEventResult.handled; + } + if (key == LogicalKeyboardKey.tab) { + final backward = HardwareKeyboard.instance.isShiftPressed; + // 先按当前高亮选中（若有），再收起本浮层并交给上层移动焦点。 + // 收起必须显式做：已移除搜索框失焦监听，Tab 走后不再自动关闭。 + if (_cursor >= 0 && !_entries[_cursor].isCreate) { + widget.onChanged(_entries[_cursor].opt!.id); + } + _closePop(); + final handled = widget.onTab?.call(backward: backward) ?? false; + return handled ? KeyEventResult.handled : KeyEventResult.ignored; + } + return KeyEventResult.ignored; + } + + void _clear() { + widget.onChanged(null); + } + + // ── 浮层内容 ─────────────────────────────────────────────────────────── + Widget _buildPop(BuildContext ctx) { + final t = context.tokens; + final field = context.findRenderObject() as RenderBox?; + final width = (field?.size.width ?? 200).clamp(200.0, 420.0); + return Positioned( + width: width, + child: CompositedTransformFollower( + link: _link, + showWhenUnlinked: false, + targetAnchor: Alignment.bottomLeft, + followerAnchor: Alignment.topLeft, + offset: const Offset(0, 4), + child: TapRegion( + onTapOutside: (_) => _dismiss(), + child: Material( + elevation: 6, + borderRadius: BorderRadius.circular(AppDims.rMd), + color: t.surface, + child: Container( + decoration: BoxDecoration( + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + clipBehavior: Clip.antiAlias, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (_docHead) _buildSearch(t), + Flexible(child: _buildList(t)), + if (widget.showCount) _buildCount(t), + ], + ), + ), + ), + ), + ), + ); + } + + // 浮层顶部持久搜索框（对齐原型 .combo-pop > .cp-search，仅单据头 combo）。 + Widget _buildSearch(AppTokens t) { + final hint = widget.searchHint ?? widget.hint; + return Container( + padding: const EdgeInsets.fromLTRB(11, 9, 11, 9), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle)), + ), + child: Row( + children: [ + Icon(LucideIcons.search, size: 14, color: t.faint), + const SizedBox(width: 8), + Expanded( + child: Focus( + canRequestFocus: false, + onKeyEvent: _onKey, + child: TextField( + controller: _ctrl, + focusNode: _searchFocus, + autofocus: true, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text), + cursorColor: t.primary, + onChanged: _onInput, + onSubmitted: (_) => _pickCursor(byKeyboard: true), + decoration: InputDecoration( + isCollapsed: true, + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + hintText: hint, + hintStyle: + TextStyle(fontSize: AppDims.fsBody, color: t.faint), + ), + ), + ), + ), + ], + ), + ); + } + + Widget _buildList(AppTokens t) { + if (_entries.isEmpty) { + return Padding( + padding: const EdgeInsets.all(20), + child: Text('无匹配结果', + textAlign: TextAlign.center, + style: TextStyle(fontSize: AppDims.fsSm, color: t.muted)), + ); + } + final kw = _kw.trim(); + final commonMode = kw.isEmpty && widget.commonIds.isNotEmpty; + return ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 264), + child: ListView.builder( + controller: _listScroll, + padding: const EdgeInsets.all(5), + shrinkWrap: true, + itemCount: _entries.length + (commonMode ? _groupHeaderCount() : 0), + itemBuilder: (c, i) => _rowAt(t, i, commonMode, kw), + ), + ); + } + + // 「常用 / 全部」分组时插入两个 header，索引需换算。 + int _commonCount() => _entries + .where((e) => !e.isCreate && widget.commonIds.contains(e.opt!.id)) + .length; + int _groupHeaderCount() { + final c = _commonCount(); + final r = _entries.where((e) => !e.isCreate).length - c; + return (c > 0 ? 1 : 0) + (r > 0 ? 1 : 0); + } + + Widget _rowAt(AppTokens t, int i, bool commonMode, String kw) { + if (!commonMode) return _entryRow(t, i, kw); + // 分组渲染：常用组 header + 常用项，全部组 header + 其余项 + final common = []; + final rest = []; + for (var k = 0; k < _entries.length; k++) { + final e = _entries[k]; + if (e.isCreate) { + rest.add(k); + } else if (widget.commonIds.contains(e.opt!.id)) { + common.add(k); + } else { + rest.add(k); + } + } + final seq = []; + if (common.isNotEmpty) { + seq.add(() => _groupHeader(t, '常用')); + for (final k in common) { + seq.add(() => _entryRow(t, k, kw)); + } + } + if (rest.isNotEmpty) { + seq.add(() => _groupHeader(t, '全部')); + for (final k in rest) { + seq.add(() => _entryRow(t, k, kw)); + } + } + return seq[i](); + } + + Widget _groupHeader(AppTokens t, String label) => Padding( + padding: const EdgeInsets.fromLTRB(9, 8, 9, 4), + child: Text(label, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + fontWeight: FontWeight.w600, + letterSpacing: 0.5)), + ); + + Widget _entryRow(AppTokens t, int idx, String kw) { + final e = _entries[idx]; + final cur = idx == _cursor; + if (e.isCreate) { + return _PopRow( + cur: cur, + onTap: () => _pickCursor(byKeyboard: false), + onHover: () => _setCursor(idx), + topBorder: t.borderSubtle, + child: Row(children: [ + Icon(LucideIcons.plus, size: 14, color: t.primary), + const SizedBox(width: 8), + Expanded( + child: Text('新增「${e.createKw}」到基础数据', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.primary, + fontWeight: FontWeight.w600)), + ), + ]), + ); + } + final o = e.opt!; + final sel = o.id == widget.selectedId; + return _PopRow( + cur: cur, + onTap: () { + _setCursor(idx); + _pickCursor(byKeyboard: false); + }, + onHover: () => _setCursor(idx), + child: Row(children: [ + Expanded( + child: _highlight(o.name, kw, t, sel ? t.primary : t.text, + sel ? FontWeight.w600 : FontWeight.w400), + ), + if (o.code != null && o.code!.isNotEmpty) ...[ + const SizedBox(width: 12), + Text(o.code!, + style: TextStyle( + fontSize: AppDims.fsXs, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.faint)), + ], + if (sel) ...[ + const SizedBox(width: 8), + Icon(LucideIcons.check, size: 15, color: t.primary), + ], + ]), + ); + } + + void _setCursor(int i) { + if (_cursor == i) return; + _cursor = i; + _entry?.markNeedsBuild(); + } + + Widget _highlight( + String name, String kw, AppTokens t, Color base, FontWeight w) { + if (kw.isEmpty) { + return Text(name, + overflow: TextOverflow.ellipsis, + style: + TextStyle(fontSize: AppDims.fsBody, color: base, fontWeight: w)); + } + final lower = name.toLowerCase(); + final i = lower.indexOf(kw.toLowerCase()); + if (i < 0) { + return Text(name, + overflow: TextOverflow.ellipsis, + style: + TextStyle(fontSize: AppDims.fsBody, color: base, fontWeight: w)); + } + return RichText( + overflow: TextOverflow.ellipsis, + text: TextSpan( + style: TextStyle(fontSize: AppDims.fsBody, color: base, fontWeight: w), + children: [ + TextSpan(text: name.substring(0, i)), + TextSpan( + text: name.substring(i, i + kw.length), + style: TextStyle(color: t.primary, fontWeight: FontWeight.w700)), + TextSpan(text: name.substring(i + kw.length)), + ], + ), + ); + } + + Widget _buildCount(AppTokens t) { + final total = _sourceOptions.length; + final kw = _kw.trim(); + final matched = _entries.where((e) => !e.isCreate).length; + return Container( + width: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7), + decoration: BoxDecoration( + color: t.bg, + border: Border(top: BorderSide(color: t.borderSubtle)), + ), + child: Text( + kw.isEmpty ? '共 $total 条结果' : '匹配 $matched 条 · 共 $total 条', + style: TextStyle(fontSize: AppDims.fsXs, color: t.muted), + ), + ); + } + + // ── 输入框本体 ───────────────────────────────────────────────────────── + @override + Widget build(BuildContext context) { + final t = context.tokens; + final has = widget.selectedId != null; + final height = widget.cell ? 32.0 : 38.0; + final borderColor = widget.hasError + ? t.danger + : (_open ? t.primary : (widget.cell ? Colors.transparent : t.border)); + return CompositedTransformTarget( + link: _link, + child: Container( + height: height, + decoration: BoxDecoration( + color: widget.cell + ? (_open ? t.surface : Colors.transparent) + : t.surface, + border: Border.all(color: borderColor), + borderRadius: BorderRadius.circular(widget.cell ? 5 : AppDims.rMd), + boxShadow: _open + ? [ + BoxShadow( + color: t.brand50, + blurRadius: 0, + spreadRadius: widget.cell ? 2 : 3) + ] + : null, + ), + child: Row( + children: [ + Expanded( + child: Focus( + focusNode: widget.focusNode, + onKeyEvent: _onKey, + child: Builder(builder: (context) { + // 单据头 combo：触发框始终只读展示（输入在浮层顶部搜索框）； + // 网格 combo：聚焦时就地变为可输入过滤框。 + if (!_open || _docHead) { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: widget.enabled + ? () => widget.focusNode.requestFocus() + : null, + child: Padding( + padding: EdgeInsets.only( + left: widget.cell ? 8 : 11, right: 4), + child: Align( + alignment: Alignment.centerLeft, + child: Text( + has ? _selectedName : widget.hint, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsBody, + color: has ? t.text : t.faint), + ), + ), + ), + ); + } + return TextField( + controller: _ctrl, + autofocus: true, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text), + cursorColor: t.primary, + decoration: InputDecoration( + isCollapsed: true, + contentPadding: + EdgeInsets.only(left: widget.cell ? 8 : 11, right: 4), + border: InputBorder.none, + filled: false, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + hintText: has ? _selectedName : widget.hint, + hintStyle: + TextStyle(fontSize: AppDims.fsBody, color: t.faint), + ), + onChanged: _onInput, + ); + }), + ), + ), + // caf：有值→X 清除；无值→chevron + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: widget.enabled + ? () { + if (has) { + _clear(); + } else { + widget.focusNode.requestFocus(); + } + } + : null, + child: Padding( + padding: EdgeInsets.only(right: widget.cell ? 6 : 8, left: 2), + child: Icon( + has ? LucideIcons.x : LucideIcons.chevronDown, + size: 14, + color: t.faint, + ), + ), + ), + ], + ), + ), + ); + } +} + +class _PopRow extends StatelessWidget { + final bool cur; + final Widget child; + final VoidCallback onTap; + final VoidCallback onHover; + final Color? topBorder; + const _PopRow({ + required this.cur, + required this.child, + required this.onTap, + required this.onHover, + this.topBorder, + }); + + @override + Widget build(BuildContext context) { + final t = context.tokens; + return MouseRegion( + onEnter: (_) => onHover(), + child: GestureDetector( + onTap: onTap, + behavior: HitTestBehavior.opaque, + child: Container( + height: 36, + padding: const EdgeInsets.symmetric(horizontal: 10), + alignment: Alignment.centerLeft, + decoration: BoxDecoration( + color: cur ? t.rowHover : Colors.transparent, + borderRadius: BorderRadius.circular(AppDims.rSm), + border: topBorder != null + ? Border(top: BorderSide(color: topBorder!)) + : null, + ), + child: child, + ), + ), + ); + } +} diff --git a/client/lib/widgets/finance_entry_dialog.dart b/client/lib/widgets/finance_entry_dialog.dart new file mode 100644 index 0000000..3464fbd --- /dev/null +++ b/client/lib/widgets/finance_entry_dialog.dart @@ -0,0 +1,164 @@ +// widgets/finance_entry_dialog.dart — 登记收支弹窗（财务屏 head 按钮 + 往来抽屉共用）。 +// 字段：类型(收款/付款) + 往来单位(可搜索，选填) + 金额 + 日期 + 备注。 +// 相比旧版补上了往来单位选择（修复手动收付款 partner_id 恒 NULL 的缺口）。 +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; + +import '../core/responsive/responsive.dart'; +import '../core/theme/context_tokens.dart'; +import '../core/utils/clock.dart'; +import '../core/utils/dialog_util.dart'; +import '../providers/finance_provider.dart'; +import '../providers/partner_provider.dart'; +import 'date_picker_field.dart'; +import 'ds/ds_atoms.dart'; +import 'searchable_option_field.dart'; +import 'ds/ds_toast.dart'; + +/// 打开登记收支弹窗；[type]='receipt'|'payment' 预选类型，[partnerId] 预选往来单位。 +Future showFinanceEntryDialog( + BuildContext context, { + String type = 'receipt', + int? partnerId, +}) { + return showAppDialog( + context: context, + builder: (_) => _FinanceEntryDialog(type: type, partnerId: partnerId), + ); +} + +class _FinanceEntryDialog extends ConsumerStatefulWidget { + final String type; + final int? partnerId; + const _FinanceEntryDialog({required this.type, this.partnerId}); + + @override + ConsumerState<_FinanceEntryDialog> createState() => + _FinanceEntryDialogState(); +} + +class _FinanceEntryDialogState extends ConsumerState<_FinanceEntryDialog> { + final _formKey = GlobalKey(); + final _amountCtrl = TextEditingController(); + final _remarkCtrl = TextEditingController(); + late String _type = widget.type; + late int? _partnerId = widget.partnerId; + late String _date = DateFormat('yyyy-MM-dd').format(appNow()); + bool _saving = false; + + @override + void dispose() { + _amountCtrl.dispose(); + _remarkCtrl.dispose(); + super.dispose(); + } + + Future _save() async { + if (!_formKey.currentState!.validate()) return; + setState(() => _saving = true); + try { + await ref.read(financeRepositoryProvider).create({ + 'type': _type, + 'amount': double.parse(_amountCtrl.text.trim()), + 'record_date': _date, + if (_partnerId != null) 'partner_id': _partnerId, + if (_remarkCtrl.text.trim().isNotEmpty) + 'remark': _remarkCtrl.text.trim(), + }); + // 刷新流水 + 汇总 + ref.read(financeListProvider.notifier).reload(); + ref.invalidate(financePartnerRowsProvider); + if (mounted) { + Navigator.of(context).pop(); + showDsToast(context, _type == 'receipt' ? '收款已登记 ✓' : '付款已登记 ✓', + bg: context.tokens.success); + } + } catch (e) { + if (mounted) { + showDsToast(context, '登记失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _saving = false); + } + } + + @override + Widget build(BuildContext context) { + final partners = ref.watch(allPartnersProvider).valueOrNull?.data ?? []; + return AlertDialog( + title: const Text('登记收支'), + content: SizedBox( + width: context.dialogWidth(420), + child: Form( + key: _formKey, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Expanded( + child: DsField('类型', + required: true, + input: DsSelect( + value: _type, + options: const [('receipt', '收款'), ('payment', '付款')], + onChanged: (v) => setState(() => _type = v), + )), + ), + const SizedBox(width: 14), + Expanded( + child: DsField('金额', + required: true, + input: TextFormField( + controller: _amountCtrl, + keyboardType: const TextInputType.numberWithOptions( + decimal: true), + decoration: const InputDecoration( + hintText: '0.00', prefixText: '¥ '), + validator: (v) { + final n = double.tryParse((v ?? '').trim()); + return (n == null || n <= 0) ? '请输入正确金额' : null; + }, + )), + ), + ]), + const SizedBox(height: 14), + DsField('往来单位（选填）', + input: SearchableOptionField( + options: [ + for (final p in partners) + OptionItem(id: p.id, name: p.name), + ], + selectedId: _partnerId, + hint: '选择或搜索往来单位…', + dialogTitle: '选择往来单位', + onChanged: (id) => setState(() => _partnerId = id), + )), + const SizedBox(height: 14), + DsField('日期', + required: true, + input: DatePickerField( + value: _date, + isRequired: true, + onChanged: (v) => setState(() => _date = v ?? _date), + )), + const SizedBox(height: 14), + DsField('备注', + input: TextFormField( + controller: _remarkCtrl, + decoration: const InputDecoration(hintText: '备注说明（选填）'), + maxLines: 2, + )), + ], + ), + ), + ), + actions: [ + DsButton('取消', + onPressed: _saving ? null : () => Navigator.of(context).pop()), + DsButton(_saving ? '保存中…' : '保存', + variant: DsBtnVariant.primary, onPressed: _saving ? null : _save), + ], + ); + } +} diff --git a/client/lib/widgets/finance_partner_drawer.dart b/client/lib/widgets/finance_partner_drawer.dart new file mode 100644 index 0000000..6d32bdd --- /dev/null +++ b/client/lib/widgets/finance_partner_drawer.dart @@ -0,0 +1,234 @@ +// widgets/finance_partner_drawer.dart — 财务屏往来流水抽屉（镜像原型 finance.html +// openPartner）：应收/应付/净额 3 行 + 近期流水（类型徽章 + ±金额）+ 登记收款/付款。 +import 'dart:math' as math; + +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../core/theme/app_chrome.g.dart'; +import '../core/theme/app_dims.g.dart'; +import '../core/theme/context_tokens.dart'; +import '../models/finance.dart'; +import '../providers/finance_provider.dart'; +import 'ds/ds_atoms.dart'; +import 'finance_entry_dialog.dart'; +import 'write_guard.dart'; +import '../core/theme/app_fonts.dart'; + +/// 该往来单位近期财务流水（抽屉内展示，最多 8 条）。 +final _partnerFlowsProvider = + FutureProvider.family, int>((ref, partnerId) async { + final page = await ref + .read(financeRepositoryProvider) + .listRecords(partnerId: partnerId, pageSize: 8); + return page.data; +}); + +String _yuan(double v) => '¥${NumberFormat.decimalPattern().format( + v == v.roundToDouble() ? v.round() : v, + )}'; + +/// 净额带符号（原型 net-pos 前缀 +、负数自带 -）。 +String signedYuan(double net) { + if (net > 0) return '+${_yuan(net)}'; + if (net < 0) return '-${_yuan(net.abs())}'; + return _yuan(0); +} + +/// 财务流水类型徽章（b-收款=ok / b-付款=danger / 应收=warn / 应付=info）。 +DsBadge financeTypeBadge(FinanceRecord r) => DsBadge(r.typeLabel, + tone: switch (r.type) { + 'receipt' => DsBadgeTone.ok, + 'payment' => DsBadgeTone.danger, + 'receivable' => DsBadgeTone.warn, + _ => DsBadgeTone.info, + }); + +Future showFinancePartnerDrawer( + BuildContext context, { + required PartnerFinanceRow row, +}) { + return showGeneralDialog( + context: context, + useRootNavigator: false, + barrierDismissible: true, + barrierLabel: '关闭', + barrierColor: AppChrome.scrim, + transitionDuration: const Duration(milliseconds: 250), + pageBuilder: (ctx, _, __) { + final w = math.min(480.0, MediaQuery.of(ctx).size.width * 0.94); + return Align( + alignment: Alignment.centerRight, + child: Material( + color: ctx.tokens.surface, + elevation: 16, + child: SelectionArea( + child: SizedBox( + width: w, + height: double.infinity, + child: _FinancePartnerDrawer(row: row), + ), + ), + ), + ); + }, + transitionBuilder: (ctx, anim, _, child) => SlideTransition( + position: Tween(begin: const Offset(1, 0), end: Offset.zero) + .animate(CurvedAnimation(parent: anim, curve: Curves.easeOutCubic)), + child: child, + ), + ); +} + +class _FinancePartnerDrawer extends ConsumerWidget { + final PartnerFinanceRow row; + const _FinancePartnerDrawer({required this.row}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final t = context.tokens; + final flows = row.partnerId != null + ? ref.watch(_partnerFlowsProvider(row.partnerId!)) + : const AsyncValue>.data([]); + final net = row.net; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // .drawer-head + Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 18), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.border))), + child: Row(children: [ + Expanded( + child: Text(row.name, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + ), + IconButton( + onPressed: () => Navigator.of(context).pop(), + icon: Icon(LucideIcons.x, size: 18, color: t.muted), + tooltip: '关闭', + ), + ]), + ), + Expanded( + child: SingleChildScrollView( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 18), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _drow(t, '应收账款', _yuan(row.recv)), + _drow(t, '应付账款', _yuan(row.pay)), + _drow(t, '净额', signedYuan(net), + color: net > 0 ? t.success : (net < 0 ? t.danger : null)), + Padding( + padding: const EdgeInsets.only(top: 18, bottom: 8), + child: Text('近期流水', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.muted)), + ), + flows.when( + loading: () => const Padding( + padding: EdgeInsets.all(20), + child: Center( + child: SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator(strokeWidth: 2))), + ), + error: (e, _) => Text('流水加载失败', + style: TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + data: (list) => list.isEmpty + ? Text('本期暂无流水记录', + style: TextStyle( + color: t.faint, fontSize: AppDims.fsBody)) + : Column(children: [ + for (final r in list) _flowRow(t, r), + ]), + ), + ], + ), + ), + ), + // 底部：登记收款 / 登记付款 + Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14), + decoration: + BoxDecoration(border: Border(top: BorderSide(color: t.border))), + child: WriteGuard( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + DsButton('登记收款', small: true, onPressed: () { + Navigator.of(context).pop(); + showFinanceEntryDialog(context, + type: 'receipt', partnerId: row.partnerId); + }), + const SizedBox(width: 10), + DsButton('登记付款', small: true, onPressed: () { + Navigator.of(context).pop(); + showFinanceEntryDialog(context, + type: 'payment', partnerId: row.partnerId); + }), + ], + ), + ), + ), + ], + ); + } + + Widget _drow(dynamic t, String label, String value, {Color? color}) => + Container( + padding: const EdgeInsets.symmetric(vertical: 11), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row(children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsBody, color: t.muted)), + const Spacer(), + Text(value, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: color ?? t.text)), + ]), + ); + + Widget _flowRow(dynamic t, FinanceRecord r) { + final isIn = r.type == 'receipt' || r.type == 'receivable'; + return Container( + padding: const EdgeInsets.symmetric(vertical: 10), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row(children: [ + Text((r.recordDate ?? '').split('T').first, + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.muted, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + const SizedBox(width: 8), + financeTypeBadge(r), + const Spacer(), + Text('${isIn ? '+' : '-'}${_yuan(r.amount.abs())}', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + color: t.heading)), + ]), + ); + } +} diff --git a/client/lib/widgets/form_dialog.dart b/client/lib/widgets/form_dialog.dart deleted file mode 100644 index 62cb3d3..0000000 --- a/client/lib/widgets/form_dialog.dart +++ /dev/null @@ -1,121 +0,0 @@ -import 'package:flutter/material.dart'; -import '../core/theme/context_tokens.dart'; - -/// Generic dialog wrapper for forms -class FormDialog extends StatelessWidget { - final String title; - final Widget content; - final String confirmLabel; - final VoidCallback? onConfirm; - final bool loading; - final double width; - - const FormDialog({ - super.key, - required this.title, - required this.content, - this.confirmLabel = '保存', - this.onConfirm, - this.loading = false, - this.width = 560, - }); - - @override - Widget build(BuildContext context) { - return Dialog( - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)), - child: SizedBox( - width: width, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Title bar - Container( - height: 48, - padding: const EdgeInsets.symmetric(horizontal: 20), - decoration: BoxDecoration( - color: context.tokens.primary, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(4), - topRight: Radius.circular(4), - ), - ), - child: Row( - children: [ - Text( - title, - style: const TextStyle( - color: Colors.white, - fontSize: 15, - fontWeight: FontWeight.w500), - ), - const Spacer(), - IconButton( - icon: const Icon(Icons.close, color: Colors.white, size: 18), - onPressed: () => Navigator.of(context).pop(), - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 28, minHeight: 28), - ), - ], - ), - ), - // Content - Flexible( - child: SingleChildScrollView( - padding: const EdgeInsets.all(20), - child: content, - ), - ), - // Action bar - const Divider(height: 1), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - OutlinedButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - const SizedBox(width: 12), - ElevatedButton( - onPressed: loading ? null : onConfirm, - child: loading - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) - : Text(confirmLabel), - ), - ], - ), - ), - ], - ), - ), - ); - } -} - -/// Show a form dialog and return the result -Future showFormDialog({ - required BuildContext context, - required String title, - required Widget content, - String confirmLabel = '保存', - VoidCallback? onConfirm, - double width = 560, -}) { - return showDialog( - context: context, - builder: (_) => FormDialog( - title: title, - content: content, - confirmLabel: confirmLabel, - onConfirm: onConfirm, - width: width, - ), - ); -} diff --git a/client/lib/widgets/fullscreen_image_viewer.dart b/client/lib/widgets/fullscreen_image_viewer.dart index da40a82..cdd43a0 100644 --- a/client/lib/widgets/fullscreen_image_viewer.dart +++ b/client/lib/widgets/fullscreen_image_viewer.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; /// 全屏图片查看器：黑底 modal + 多图左右翻页（PageView）+ 双指缩放/拖拽（InteractiveViewer）。 @@ -12,7 +13,7 @@ void showFullscreenImages(BuildContext context, List urls, if (urls.isEmpty) return; Navigator.of(context).push(PageRouteBuilder( opaque: false, - barrierColor: Colors.black87, + barrierColor: Colors.black87, // ds-ignore: 全屏媒体查看器黑底白控固定色 pageBuilder: (_, __, ___) => FullscreenImageViewer(urls: urls, initialIndex: initialIndex), )); @@ -56,11 +57,12 @@ class _FullscreenImageViewerState extends State { itemCount: widget.urls.length, itemBuilder: (_, i) => Center( child: InteractiveViewer( - child: Image.network(widget.urls[i], fit: BoxFit.contain, + child: Image.network(widget.urls[i], + fit: BoxFit.contain, errorBuilder: (_, __, ___) => const Icon( - Icons.broken_image, + LucideIcons.imageOff, size: 64, - color: Colors.white54)), + color: Colors.white54)), // ds-ignore: 全屏媒体查看器黑底白控固定色 ), ), ), @@ -72,9 +74,11 @@ class _FullscreenImageViewerState extends State { child: Container( padding: const EdgeInsets.all(8), decoration: BoxDecoration( - color: Colors.black54, + color: Colors.black54, // ds-ignore: 全屏媒体查看器黑底白控固定色 borderRadius: BorderRadius.circular(20)), - child: const Icon(Icons.close, color: Colors.white, size: 20), + child: const Icon(LucideIcons.x, + color: Colors.white, // ds-ignore: 全屏媒体查看器黑底白控固定色 + size: 20), // ds-ignore: 全屏媒体查看器黑底白控固定色 ), ), ), diff --git a/client/lib/widgets/kpi_card.dart b/client/lib/widgets/kpi_card.dart index 72e8140..99b5822 100644 --- a/client/lib/widgets/kpi_card.dart +++ b/client/lib/widgets/kpi_card.dart @@ -1,4 +1,4 @@ -import 'dart:ui' show FontFeature; +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; import '../core/theme/app_dims.g.dart'; @@ -58,7 +58,8 @@ class KpiCard extends StatelessWidget { }; final card = Container( - padding: const EdgeInsets.symmetric(horizontal: AppDims.sp4, vertical: 15), + padding: + const EdgeInsets.symmetric(horizontal: AppDims.sp4, vertical: 15), decoration: BoxDecoration( color: t.surface, border: Border.all(color: t.border), @@ -105,13 +106,14 @@ class KpiCard extends StatelessWidget { if (trend != KpiTrend.none) Icon( trend == KpiTrend.up - ? Icons.arrow_drop_up - : Icons.arrow_drop_down, + ? LucideIcons.chevronUp + : LucideIcons.chevronDown, size: 16, color: deltaColor, ), Text(delta!, - style: TextStyle(fontSize: AppDims.fsXs, color: deltaColor)), + style: + TextStyle(fontSize: AppDims.fsXs, color: deltaColor)), ], ), ], diff --git a/client/lib/widgets/label_preview_dialog.dart b/client/lib/widgets/label_preview_dialog.dart index 8e0c986..11d1d67 100644 --- a/client/lib/widgets/label_preview_dialog.dart +++ b/client/lib/widgets/label_preview_dialog.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -5,7 +6,7 @@ import '../core/errors/error_reporter.dart'; import '../core/theme/context_tokens.dart'; import '../core/responsive/responsive.dart'; import '../core/utils/print_util.dart'; -import '../core/utils/label_data.dart'; +import 'ds/ds_atoms.dart'; const _kPrinterKey = 'label_printer'; @@ -42,8 +43,8 @@ class _LabelPreviewDialogState extends State { @override void initState() { super.initState(); - _previews = List.filled(widget.labels.length, null, - growable: false); + _previews = + List.filled(widget.labels.length, null, growable: false); _include = List.filled(widget.labels.length, true, growable: false); _init(); } @@ -203,11 +204,9 @@ class _LabelPreviewDialogState extends State { '${i + 1}', style: TextStyle( fontSize: 12, - color: isSelected - ? context.tokens.primary - : context.tokens.muted, - fontWeight: - isSelected ? FontWeight.w600 : FontWeight.normal, + color: + isSelected ? context.tokens.primary : context.tokens.muted, + fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, ), ), ], @@ -230,7 +229,7 @@ class _LabelPreviewDialogState extends State { decoration: BoxDecoration( border: Border.all(color: context.tokens.border), borderRadius: BorderRadius.circular(4), - color: Colors.white, + color: Colors.white, // ds-ignore: 打印纸面模拟固定色 ), child: ClipRRect( borderRadius: BorderRadius.circular(3), @@ -248,7 +247,7 @@ class _LabelPreviewDialogState extends State { children: [ const Text('打印份数：', style: TextStyle(fontSize: 13)), IconButton( - icon: const Icon(Icons.remove_circle_outline, size: 20), + icon: const Icon(LucideIcons.circleMinus, size: 20), onPressed: (_printing || label.copies <= 1) ? null : () => setState(() => label.copies--), @@ -261,13 +260,13 @@ class _LabelPreviewDialogState extends State { child: Text( '${label.copies}', textAlign: TextAlign.center, - style: const TextStyle( - fontSize: 15, fontWeight: FontWeight.w600), + style: + const TextStyle(fontSize: 15, fontWeight: FontWeight.w600), ), ), const SizedBox(width: 4), IconButton( - icon: const Icon(Icons.add_circle_outline, size: 20), + icon: const Icon(LucideIcons.circlePlus, size: 20), onPressed: _printing ? null : () => setState(() => label.copies++), padding: EdgeInsets.zero, @@ -295,8 +294,7 @@ class _LabelPreviewDialogState extends State { children: [ // ── 顶栏 ────────────────────────────────────────────────────────── Container( - padding: - const EdgeInsets.symmetric(horizontal: 20, vertical: 14), + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14), decoration: BoxDecoration( color: context.tokens.primary, borderRadius: const BorderRadius.only( @@ -310,10 +308,11 @@ class _LabelPreviewDialogState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white)), + color: Colors.white)), // ds-ignore: 打印纸面模拟固定色 const Spacer(), IconButton( - icon: const Icon(Icons.close, color: Colors.white), + icon: const Icon(LucideIcons.x, + color: Colors.white), // ds-ignore: 打印纸面模拟固定色 onPressed: () => Navigator.of(context).pop(), padding: EdgeInsets.zero, constraints: const BoxConstraints(), @@ -327,51 +326,24 @@ class _LabelPreviewDialogState extends State { padding: const EdgeInsets.fromLTRB(16, 12, 16, 0), child: Row( children: [ - const Text('打印机：', - style: TextStyle(fontSize: 13)), + const Text('打印机：', style: TextStyle(fontSize: 13)), const SizedBox(width: 8), Expanded( child: _printers.isEmpty - ? Text( - _printersChecked ? '无打印机可用' : '正在检测打印机...', + ? Text(_printersChecked ? '无打印机可用' : '正在检测打印机...', style: TextStyle( - fontSize: 13, - color: context.tokens.muted)) - : DropdownButtonHideUnderline( - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: 10, vertical: 4), - decoration: BoxDecoration( - border: Border.all(color: context.tokens.border), - borderRadius: BorderRadius.circular(6), - ), - child: DropdownButton( - value: _printer, - isExpanded: true, - isDense: true, - style: TextStyle( - fontSize: 13, - color: context.tokens.text), - items: _printers - .map((p) => DropdownMenuItem( - value: p, - child: Text(p, - overflow: - TextOverflow.ellipsis), - )) - .toList(), - onChanged: _printing - ? null - : (v) async { - if (v == null) return; - setState(() => _printer = v); - final prefs = await SharedPreferences - .getInstance(); - await prefs.setString( - _kPrinterKey, v); - }, - ), - ), + fontSize: 13, color: context.tokens.muted)) + : DsSelect( + value: _printer, + options: [for (final p in _printers) (p, p)], + onChanged: _printing + ? null + : (v) async { + setState(() => _printer = v); + final prefs = + await SharedPreferences.getInstance(); + await prefs.setString(_kPrinterKey, v); + }, ), ), ], @@ -423,11 +395,11 @@ class _LabelPreviewDialogState extends State { ), const SizedBox(width: 8), FilledButton( - onPressed: (_printing || totalCount == 0 || _printer == null) - ? null - : _doPrint, - child: Text( - _printing ? '打印中...' : '打印 $totalCount 张'), + onPressed: + (_printing || totalCount == 0 || _printer == null) + ? null + : _doPrint, + child: Text(_printing ? '打印中...' : '打印 $totalCount 张'), ), ], ), diff --git a/client/lib/widgets/mobile_list_card.dart b/client/lib/widgets/mobile_list_card.dart index 432f235..0c056ce 100644 --- a/client/lib/widgets/mobile_list_card.dart +++ b/client/lib/widgets/mobile_list_card.dart @@ -38,7 +38,7 @@ class MobileListCard extends StatelessWidget { elevation: 0, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), - side: BorderSide(color: Colors.grey.shade200), + side: BorderSide(color: context.tokens.borderSubtle), ), child: InkWell( borderRadius: BorderRadius.circular(8), @@ -67,8 +67,7 @@ class MobileListCard extends StatelessWidget { const SizedBox(height: 2), DefaultTextStyle( style: TextStyle( - fontSize: 12, - color: context.tokens.muted), + fontSize: 12, color: context.tokens.muted), child: subtitle!, ), ], @@ -112,16 +111,14 @@ class MobileListCard extends StatelessWidget { width: 64, child: Text( f.label, - style: TextStyle( - fontSize: 13, color: context.tokens.muted), + style: TextStyle(fontSize: 13, color: context.tokens.muted), ), ), Expanded( child: f.valueWidget ?? Text( f.value ?? '—', - style: TextStyle( - fontSize: 13, color: context.tokens.text), + style: TextStyle(fontSize: 13, color: context.tokens.text), ), ), ], diff --git a/client/lib/widgets/multi_select_dropdown.dart b/client/lib/widgets/multi_select_dropdown.dart index e2be041..cdb1f53 100644 --- a/client/lib/widgets/multi_select_dropdown.dart +++ b/client/lib/widgets/multi_select_dropdown.dart @@ -1,6 +1,8 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import '../core/utils/dialog_util.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; +import 'ds/ds_atoms.dart'; /// Compact button → dialog with checkboxes for multi-select filtering class MultiSelectDropdown extends StatelessWidget { @@ -24,7 +26,8 @@ class MultiSelectDropdown extends StatelessWidget { onPressed: options.isEmpty ? null : () => _show(context), style: OutlinedButton.styleFrom( foregroundColor: active ? context.tokens.primary : context.tokens.muted, - side: BorderSide(color: active ? context.tokens.primary : context.tokens.border), + side: BorderSide( + color: active ? context.tokens.primary : context.tokens.border), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), minimumSize: Size.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap, @@ -32,7 +35,7 @@ class MultiSelectDropdown extends StatelessWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - const Icon(Icons.filter_list, size: 13), + const Icon(LucideIcons.listFilter, size: 13), const SizedBox(width: 4), Text( active ? '$label (${selected.length})' : label, @@ -42,7 +45,7 @@ class MultiSelectDropdown extends StatelessWidget { const SizedBox(width: 4), GestureDetector( onTap: () => onChanged({}), - child: const Icon(Icons.close, size: 12), + child: const Icon(LucideIcons.x, size: 12), ), ], ], @@ -53,7 +56,7 @@ class MultiSelectDropdown extends StatelessWidget { void _show(BuildContext context) { showAppDialog( context: context, - barrierColor: Colors.black12, + barrierColor: Colors.black12, // ds-ignore: 弹层遮罩固定色（.mask） builder: (_) => _MultiSelectDialog( label: label, options: options, @@ -121,7 +124,7 @@ class _MultiSelectDialogState extends State<_MultiSelectDialog> { autofocus: true, decoration: const InputDecoration( hintText: '搜索…', - prefixIcon: Icon(Icons.search, size: 16), + prefixIcon: Icon(LucideIcons.search, size: 16), isDense: true, contentPadding: EdgeInsets.symmetric(vertical: 8), ), @@ -137,17 +140,28 @@ class _MultiSelectDialogState extends State<_MultiSelectDialog> { child: Wrap( spacing: 6, runSpacing: 4, - children: _selected.map((s) => Chip( - label: Text(s, style: const TextStyle(fontSize: 12)), - deleteIcon: const Icon(Icons.close, size: 14), - onDeleted: () => setState(() => _selected.remove(s)), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - visualDensity: VisualDensity.compact, - backgroundColor: context.tokens.primary.withOpacity(0.08), - side: BorderSide(color: context.tokens.primary.withOpacity(0.3), width: 0.5), - labelPadding: const EdgeInsets.symmetric(horizontal: 2), - padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 0), - )).toList(), + children: _selected + .map((s) => Chip( + label: + Text(s, style: const TextStyle(fontSize: 12)), + deleteIcon: const Icon(LucideIcons.x, size: 14), + onDeleted: () => + setState(() => _selected.remove(s)), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + visualDensity: VisualDensity.compact, + backgroundColor: + context.tokens.primary.withOpacity(0.08), + side: BorderSide( + color: + context.tokens.primary.withOpacity(0.3), + width: 0.5), + labelPadding: + const EdgeInsets.symmetric(horizontal: 2), + padding: const EdgeInsets.symmetric( + horizontal: 4, vertical: 0), + )) + .toList(), ), ), ), @@ -199,17 +213,11 @@ class _MultiSelectDialogState extends State<_MultiSelectDialog> { ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () { - widget.onApply(_selected); - Navigator.of(context).pop(); - }, - child: const Text('应用'), - ), + DsButton('取消', onPressed: () => Navigator.of(context).pop()), + DsButton('应用', variant: DsBtnVariant.primary, onPressed: () { + widget.onApply(_selected); + Navigator.of(context).pop(); + }), ], ); } @@ -254,7 +262,7 @@ class _FilterableColumnHeaderState extends State { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 3), child: Icon( - active ? Icons.filter_alt : Icons.filter_alt_outlined, + active ? LucideIcons.funnel : LucideIcons.funnel, size: 16, color: active ? context.tokens.primary : context.tokens.muted, ), @@ -264,8 +272,8 @@ class _FilterableColumnHeaderState extends State { InkWell( onTap: () => widget.onChanged({}), borderRadius: BorderRadius.circular(4), - child: Icon(Icons.cancel, size: 14, - color: context.tokens.primary), + child: Icon(LucideIcons.circleX, + size: 14, color: context.tokens.primary), ), ], ), @@ -276,7 +284,7 @@ class _FilterableColumnHeaderState extends State { void _show(BuildContext context) { showAppDialog( context: context, - barrierColor: Colors.black12, + barrierColor: Colors.black12, // ds-ignore: 弹层遮罩固定色（.mask） builder: (_) => _MultiSelectDialog( label: widget.text, options: widget.options, @@ -320,7 +328,7 @@ class ColumnToggleButton extends StatelessWidget { if (compact) { return IconButton( tooltip: '显示字段', - icon: const Icon(Icons.view_column_outlined, size: 20), + icon: const Icon(LucideIcons.columns3, size: 20), onPressed: () => _show(context), ); } @@ -336,7 +344,7 @@ class ColumnToggleButton extends StatelessWidget { child: const Row( mainAxisSize: MainAxisSize.min, children: [ - Icon(Icons.view_column_outlined, size: 13), + Icon(LucideIcons.columns3, size: 13), SizedBox(width: 4), Text('显示字段', style: TextStyle(fontSize: 12)), ], @@ -347,7 +355,7 @@ class ColumnToggleButton extends StatelessWidget { void _show(BuildContext context) { showAppDialog( context: context, - barrierColor: Colors.black12, + barrierColor: Colors.black12, // ds-ignore: 弹层遮罩固定色（.mask） builder: (_) => _ColumnToggleDialog( columns: columns, initial: hidden, @@ -392,8 +400,8 @@ class _ColumnToggleDialogState extends State<_ColumnToggleDialog> { mainAxisSize: MainAxisSize.min, children: widget.columns .map((col) => CheckboxListTile( - title: Text(col.label, - style: const TextStyle(fontSize: 13)), + title: + Text(col.label, style: const TextStyle(fontSize: 13)), value: !_hidden.contains(col.key), dense: true, onChanged: col.required @@ -410,17 +418,11 @@ class _ColumnToggleDialogState extends State<_ColumnToggleDialog> { ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('取消'), - ), - ElevatedButton( - onPressed: () { - widget.onApply(_hidden); - Navigator.of(context).pop(); - }, - child: const Text('应用'), - ), + DsButton('取消', onPressed: () => Navigator.of(context).pop()), + DsButton('应用', variant: DsBtnVariant.primary, onPressed: () { + widget.onApply(_hidden); + Navigator.of(context).pop(); + }), ], ); } diff --git a/client/lib/widgets/network_retry_button.dart b/client/lib/widgets/network_retry_button.dart index 7bd64b1..ddf0653 100644 --- a/client/lib/widgets/network_retry_button.dart +++ b/client/lib/widgets/network_retry_button.dart @@ -1,7 +1,9 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../core/theme/context_tokens.dart'; import '../providers/connectivity_provider.dart'; +import 'ds/ds_toast.dart'; /// 离线提示里的「重试」按钮： /// - 检测中显示转圈 +「重试中…」（过程可感知） @@ -10,7 +12,8 @@ import '../providers/connectivity_provider.dart'; /// [foreground] 适配不同底色（红色横幅用白字，琥珀框用深色）。 class NetworkRetryButton extends ConsumerWidget { final Color foreground; - const NetworkRetryButton({super.key, this.foreground = Colors.white}); + const NetworkRetryButton( + {super.key, this.foreground = Colors.white}); // ds-ignore: 横幅承载色上默认白字 @override Widget build(BuildContext context, WidgetRef ref) { @@ -20,17 +23,14 @@ class NetworkRetryButton extends ConsumerWidget { onPressed: checking ? null : () async { - final ok = - await ref.read(connectivityProvider.notifier).retry(); + final ok = await ref.read(connectivityProvider.notifier).retry(); if (!context.mounted) return; - ScaffoldMessenger.of(context) - ..hideCurrentSnackBar() - ..showSnackBar(SnackBar( - content: Text(ok ? '已重新连接服务器' : '仍无法连接服务器，请稍后重试'), - backgroundColor: ok ? context.tokens.success : context.tokens.danger, - duration: const Duration(seconds: 2), - behavior: SnackBarBehavior.floating, - )); + showDsToast( + context, + ok ? '已重新连接服务器' : '仍无法连接服务器，请稍后重试', + bg: ok ? context.tokens.success : context.tokens.danger, + duration: const Duration(seconds: 2), + ); }, style: TextButton.styleFrom( foregroundColor: foreground, @@ -51,7 +51,7 @@ class NetworkRetryButton extends ConsumerWidget { ), ) else - Icon(Icons.refresh, size: 16, color: foreground), + Icon(LucideIcons.refreshCw, size: 16, color: foreground), const SizedBox(width: 6), Text( checking ? '重试中…' : '重试', diff --git a/client/lib/widgets/notification_bell.dart b/client/lib/widgets/notification_bell.dart index ea8d845..e478d83 100644 --- a/client/lib/widgets/notification_bell.dart +++ b/client/lib/widgets/notification_bell.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; @@ -31,8 +32,7 @@ class NotificationBell extends StatelessWidget { const SizedBox(height: 10), Row( children: [ - Icon(Icons.notifications_off_outlined, - size: 16, color: t.faint), + Icon(LucideIcons.bellOff, size: 16, color: t.faint), const SizedBox(width: 8), Text('暂无通知', style: TextStyle(fontSize: 13, color: t.muted)), @@ -50,7 +50,7 @@ class NotificationBell extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), alignment: Alignment.center, - child: Icon(Icons.notifications_outlined, size: 19, color: t.topFg), + child: Icon(LucideIcons.bell, size: 19, color: t.topFg), ), ); } diff --git a/client/lib/widgets/order_detail_drawer.dart b/client/lib/widgets/order_detail_drawer.dart index 9f45269..27cd6c3 100644 --- a/client/lib/widgets/order_detail_drawer.dart +++ b/client/lib/widgets/order_detail_drawer.dart @@ -1,12 +1,16 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:math' as math; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; import '../core/theme/app_dims.g.dart'; +import '../core/theme/app_fonts.dart'; /// 右侧滑入抽屉呈现（对齐原型 .drawer / .drawer-mask）。 /// useRootNavigator:false → 只覆盖内容区（分支 Navigator），不盖侧栏/顶栏。 +const _kDrawerMask = Color(0x52000000); // ds-ignore: .drawer-mask 遮罩固定色（黑 32%） + Future showOrderDetailDrawer( BuildContext context, { required WidgetBuilder builder, @@ -16,7 +20,8 @@ Future showOrderDetailDrawer( useRootNavigator: false, barrierDismissible: true, barrierLabel: '关闭', - barrierColor: Colors.black.withValues(alpha: 0.32), // .drawer-mask scrim + // .drawer-mask scrim（抽屉遮罩固定色） + barrierColor: _kDrawerMask, transitionDuration: const Duration(milliseconds: 250), pageBuilder: (ctx, _, __) { final w = math.min(600.0, MediaQuery.of(ctx).size.width * 0.94); @@ -99,8 +104,8 @@ class OrderDetailDrawer extends StatelessWidget { // ── 头：单号 + 关闭 ──（.drawer-head） Container( padding: const EdgeInsets.fromLTRB(20, 18, 16, 18), - decoration: - BoxDecoration(border: Border(bottom: BorderSide(color: t.border))), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.border))), child: Row( children: [ Expanded( @@ -111,7 +116,7 @@ class OrderDetailDrawer extends StatelessWidget { color: t.heading)), ), IconButton( - icon: Icon(Icons.close, size: 22, color: t.muted), + icon: Icon(LucideIcons.x, size: 22, color: t.muted), splashRadius: 20, onPressed: () => Navigator.of(context).pop(), ), @@ -125,7 +130,8 @@ class OrderDetailDrawer extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ // ── 信息行（.drow）── - for (final r in infoRows) _DrawerRow(label: r.label, value: r.value), + for (final r in infoRows) + _DrawerRow(label: r.label, value: r.value), // ── 明细标题 ── Padding( padding: const EdgeInsets.fromLTRB(0, 16, 0, 8), @@ -146,7 +152,8 @@ class OrderDetailDrawer extends StatelessWidget { Text(totalText, style: TextStyle( fontSize: 18, - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontWeight: FontWeight.w700, color: t.accent)), ], @@ -217,7 +224,8 @@ class _LinesTable extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 9), decoration: BoxDecoration( color: t.thBg, - borderRadius: const BorderRadius.vertical(top: Radius.circular(6)), + borderRadius: + const BorderRadius.vertical(top: Radius.circular(6)), ), child: _lineRow( context, @@ -251,7 +259,8 @@ class _LinesTable extends StatelessWidget { Text(lines[i].code, style: TextStyle( fontSize: AppDims.fsXs, - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, color: t.faint)), ], ), @@ -269,7 +278,9 @@ class _LinesTable extends StatelessWidget { ), c3: Text(lines[i].qty, textAlign: TextAlign.right, - style: const TextStyle(fontFamily: 'monospace')), + style: const TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), c4: _priceCell(context, lines[i].price, lines[i].pending), c5: _priceCell(context, lines[i].amount, lines[i].pending, accent: true), @@ -297,7 +308,8 @@ class _LinesTable extends StatelessWidget { return Text(text, textAlign: TextAlign.right, style: TextStyle( - fontFamily: 'monospace', + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, fontWeight: accent ? FontWeight.w700 : FontWeight.w400, color: accent ? t.text : t.text)); } diff --git a/client/lib/widgets/order_print_preview_dialog.dart b/client/lib/widgets/order_print_preview_dialog.dart index bc1f1ea..bee446e 100644 --- a/client/lib/widgets/order_print_preview_dialog.dart +++ b/client/lib/widgets/order_print_preview_dialog.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:typed_data'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/material.dart'; @@ -110,8 +111,7 @@ class _OrderPrintPreviewDialogState extends State { children: [ // ── 顶栏 ────────────────────────────────────────────────────────── Container( - padding: - const EdgeInsets.symmetric(horizontal: 20, vertical: 14), + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14), decoration: BoxDecoration( color: context.tokens.primary, borderRadius: const BorderRadius.only( @@ -125,10 +125,13 @@ class _OrderPrintPreviewDialogState extends State { style: const TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Colors.white)), + color: Colors + .white)), // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） const Spacer(), IconButton( - icon: const Icon(Icons.close, color: Colors.white), + icon: const Icon(LucideIcons.x, + color: + Colors.white), // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） onPressed: _printing ? null : () => Navigator.of(context).pop(), padding: EdgeInsets.zero, @@ -142,7 +145,8 @@ class _OrderPrintPreviewDialogState extends State { Expanded( child: Container( width: double.infinity, - color: const Color(0xFFE9ECF1), + color: + const Color(0xFFE9ECF1), // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） child: _buildBody(), ), ), @@ -156,13 +160,11 @@ class _OrderPrintPreviewDialogState extends State { child: Text( _error.isNotEmpty ? _error - : (_rendering - ? '正在生成预览…' - : '共 ${_pages.length} 页'), + : (_rendering ? '正在生成预览…' : '共 ${_pages.length} 页'), style: TextStyle( fontSize: 12, color: _error.isNotEmpty - ? Colors.red + ? Colors.red // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） : context.tokens.muted), ), ), @@ -173,10 +175,9 @@ class _OrderPrintPreviewDialogState extends State { ), const SizedBox(width: 8), FilledButton.icon( - icon: const Icon(Icons.print, size: 18), - onPressed: (_pdfBytes == null || _printing) - ? null - : _doPrint, + icon: const Icon(LucideIcons.printer, size: 18), + onPressed: + (_pdfBytes == null || _printing) ? null : _doPrint, label: Text(_printing ? '打印中…' : '打印'), ), ], @@ -196,7 +197,9 @@ class _OrderPrintPreviewDialogState extends State { padding: const EdgeInsets.all(24), child: Text(_error, textAlign: TextAlign.center, - style: const TextStyle(color: Colors.red, fontSize: 13)), + style: const TextStyle( + color: Colors.red, // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） + fontSize: 13)), // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） ), ); } @@ -209,10 +212,11 @@ class _OrderPrintPreviewDialogState extends State { itemBuilder: (_, i) => Center( child: Container( decoration: BoxDecoration( - color: Colors.white, + color: Colors.white, // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） boxShadow: [ BoxShadow( - color: Colors.black.withOpacity(0.18), + color: Colors.black // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） + .withOpacity(0.18), // ds-ignore: 打印纸面模拟固定色（纸白/墨黑，不随主题） blurRadius: 8, offset: const Offset(0, 2), ), diff --git a/client/lib/widgets/order_return_dialog.dart b/client/lib/widgets/order_return_dialog.dart index 02dea30..6db230a 100644 --- a/client/lib/widgets/order_return_dialog.dart +++ b/client/lib/widgets/order_return_dialog.dart @@ -1,8 +1,11 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import '../core/responsive/responsive.dart'; import '../core/theme/context_tokens.dart'; import '../core/utils/dialog_util.dart'; +import 'ds/ds_atoms.dart'; +import 'ds/ds_toast.dart'; /// 退单状态小徽章（none 返回 null 不显示）。partial=部分退单(amber)，full=已退单(红)。 Widget? returnStateBadge(BuildContext context, String state) { @@ -20,7 +23,8 @@ Widget? returnStateBadge(BuildContext context, String state) { return Container( padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1), decoration: BoxDecoration( - color: c.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(8)), + color: c.withValues(alpha: 0.12), + borderRadius: BorderRadius.circular(8)), child: Text(t, style: TextStyle(fontSize: 10, color: c, fontWeight: FontWeight.w600)), ); @@ -97,7 +101,8 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { final Set _staged = {}; // 本次暂存要退的 itemId bool _submitting = false; - bool _isReturned(ReturnLine l) => l.alreadyReturned || _staged.contains(l.itemId); + bool _isReturned(ReturnLine l) => + l.alreadyReturned || _staged.contains(l.itemId); List get _selectable => widget.lines.where((l) => !l.alreadyReturned).toList(); @@ -109,7 +114,8 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { title: const Text('退单确认', style: TextStyle(fontSize: 16)), content: RichText( text: TextSpan( - style: TextStyle(fontSize: 13, color: context.tokens.text, height: 1.6), + style: TextStyle( + fontSize: 13, color: context.tokens.text, height: 1.6), children: [ const TextSpan(text: '确认退掉以下明细？\n'), TextSpan( @@ -123,15 +129,10 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { ), ), actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.pop(context, true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, foregroundColor: Colors.white), - child: const Text('退单'), - ), + DsButton('取消', onPressed: () => Navigator.pop(context, false)), + DsButton('退单', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.pop(context, true)), ], ), ); @@ -139,7 +140,8 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { } Future _confirmAll() async { - final pending = _selectable.where((l) => !_staged.contains(l.itemId)).toList(); + final pending = + _selectable.where((l) => !_staged.contains(l.itemId)).toList(); if (pending.isEmpty) return; final ok = await showAppDialog( context: context, @@ -148,15 +150,10 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { content: Text('确认退掉本单全部 ${pending.length} 条未退明细？', style: const TextStyle(fontSize: 13)), actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.pop(context, true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, foregroundColor: Colors.white), - child: const Text('全部退单'), - ), + DsButton('取消', onPressed: () => Navigator.pop(context, false)), + DsButton('全部退单', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.pop(context, true)), ], ), ); @@ -171,19 +168,13 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { context: context, builder: (_) => AlertDialog( title: const Text('提交退单', style: TextStyle(fontSize: 16)), - content: Text( - '确认提交退单？${widget.isOut ? '退回库存' : '从库存删除'} 将立即生效，且不可撤销。', + content: Text('确认提交退单？${widget.isOut ? '退回库存' : '从库存删除'} 将立即生效，且不可撤销。', style: const TextStyle(fontSize: 13)), actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('取消')), - ElevatedButton( - onPressed: () => Navigator.pop(context, true), - style: ElevatedButton.styleFrom( - backgroundColor: context.tokens.danger, foregroundColor: Colors.white), - child: const Text('提交退单'), - ), + DsButton('取消', onPressed: () => Navigator.pop(context, false)), + DsButton('提交退单', + variant: DsBtnVariant.danger, + onPressed: () => Navigator.pop(context, true)), ], ), ); @@ -192,15 +183,13 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { try { await widget.onSubmit(_staged.toList()); if (mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: const Text('退单成功'), backgroundColor: context.tokens.success)); + showDsToast(context, '退单成功', bg: context.tokens.success); Navigator.pop(context, true); } } catch (e) { if (mounted) { setState(() => _submitting = false); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('退单失败：$e'), backgroundColor: context.tokens.danger)); + showDsToast(context, '退单失败：$e', bg: context.tokens.danger); } } } @@ -239,7 +228,7 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { child: const Text('全部退单', style: TextStyle(fontSize: 12)), ), IconButton( - icon: const Icon(Icons.close, size: 20), + icon: const Icon(LucideIcons.x, size: 20), onPressed: () => Navigator.pop(context), ), ], @@ -255,10 +244,13 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { children: [ for (final (k, v) in widget.meta) Text.rich(TextSpan( - style: TextStyle(fontSize: 12, color: context.tokens.muted), + style: + TextStyle(fontSize: 12, color: context.tokens.muted), children: [ TextSpan(text: '$k：'), - TextSpan(text: v, style: TextStyle(color: context.tokens.text)), + TextSpan( + text: v, + style: TextStyle(color: context.tokens.text)), ], )), ], @@ -271,14 +263,16 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), decoration: BoxDecoration( color: context.tokens.infoSoft, - border: Border(left: BorderSide(color: context.tokens.primary, width: 3)), + border: Border( + left: BorderSide(color: context.tokens.primary, width: 3)), borderRadius: BorderRadius.circular(4), ), child: Text( widget.isOut ? '提交后，已退单明细的数量将「加回库存」。退单的明细不会删除，以红色「已退单」标注。' : '提交后，已退单明细对应的库存将「从库存删除」。退单的明细不会删除，以红色「已退单」标注。', - style: TextStyle(fontSize: 12, color: context.tokens.primaryDark), + style: + TextStyle(fontSize: 12, color: context.tokens.primaryDark), ), ), // 明细列表 @@ -310,21 +304,24 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { ), ), OutlinedButton( - onPressed: _submitting ? null : () => Navigator.pop(context), + onPressed: + _submitting ? null : () => Navigator.pop(context), child: const Text('取消'), ), const SizedBox(width: 8), ElevatedButton( - onPressed: (_staged.isEmpty || _submitting) ? null : _submit, + onPressed: + (_staged.isEmpty || _submitting) ? null : _submit, style: ElevatedButton.styleFrom( backgroundColor: context.tokens.danger, - foregroundColor: Colors.white), + foregroundColor: context.tokens.onPrimary), child: _submitting - ? const SizedBox( + ? SizedBox( width: 16, height: 16, child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)) + strokeWidth: 2, + color: context.tokens.onPrimary)) : const Text('提交退单'), ), ], @@ -350,30 +347,33 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { decoration: returned ? TextDecoration.lineThrough : null, ); return Container( - color: returned ? const Color(0xFFFFF4F4) : null, + color: returned ? context.tokens.dangerBg : null, padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 9), child: Row( children: [ SizedBox( width: 24, child: Text('${idx + 1}', - style: TextStyle( - fontSize: 12, color: context.tokens.muted))), + style: TextStyle(fontSize: 12, color: context.tokens.muted))), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Row(children: [ - Flexible(child: Text(l.name, style: nameStyle, overflow: TextOverflow.ellipsis)), + Flexible( + child: Text(l.name, + style: nameStyle, overflow: TextOverflow.ellipsis)), if (returned) ...[ const SizedBox(width: 6), Container( - padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1), + padding: const EdgeInsets.symmetric( + horizontal: 6, vertical: 1), decoration: BoxDecoration( color: context.tokens.danger, borderRadius: BorderRadius.circular(8)), - child: const Text('已退单', - style: TextStyle(fontSize: 10, color: Colors.white)), + child: Text('已退单', + style: TextStyle( + fontSize: 10, color: context.tokens.onPrimary)), ), ], ]), @@ -397,7 +397,8 @@ class _OrderReturnDialogState extends State<_OrderReturnDialog> { ? null : () => setState(() => _staged.remove(l.itemId)), child: Text('撤销', - style: TextStyle(fontSize: 12, color: context.tokens.primary)), + style: TextStyle( + fontSize: 12, color: context.tokens.primary)), ) : OutlinedButton( onPressed: _submitting ? null : () => _confirmLine(l), diff --git a/client/lib/widgets/order_row_actions.dart b/client/lib/widgets/order_row_actions.dart index 09dc8f8..93761ab 100644 --- a/client/lib/widgets/order_row_actions.dart +++ b/client/lib/widgets/order_row_actions.dart @@ -30,14 +30,16 @@ List buildOrderRowActions({ bool canReturn = false, List afterPrint = const [], }) { - TextButton btn(String text, Color color, VoidCallback onPressed, {Key? key}) => + TextButton btn(String text, Color color, VoidCallback onPressed, + {Key? key}) => TextButton( key: key, onPressed: onPressed, child: Text(text, style: TextStyle(fontSize: 12, color: color)), ); // 实心强调按钮（用于「退单」这类需突出的危险操作，与原型一致）。 - Widget filledBtn(String text, Color color, VoidCallback onPressed, {Key? key}) => + Widget filledBtn(String text, Color color, VoidCallback onPressed, + {Key? key}) => Padding( padding: const EdgeInsets.symmetric(horizontal: 4), child: ElevatedButton( @@ -45,13 +47,14 @@ List buildOrderRowActions({ onPressed: onPressed, style: ElevatedButton.styleFrom( backgroundColor: color, - foregroundColor: Colors.white, + foregroundColor: context.tokens.onPrimary, elevation: 0, visualDensity: VisualDensity.compact, tapTargetSize: MaterialTapTargetSize.shrinkWrap, minimumSize: const Size(0, 30), padding: const EdgeInsets.symmetric(horizontal: 12), - textStyle: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), + textStyle: + const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), ), child: Text(text), ), diff --git a/client/lib/widgets/page_scaffold.dart b/client/lib/widgets/page_scaffold.dart deleted file mode 100644 index fdbbd10..0000000 --- a/client/lib/widgets/page_scaffold.dart +++ /dev/null @@ -1,81 +0,0 @@ -import 'package:flutter/material.dart'; -import '../core/theme/context_tokens.dart'; - -class PageScaffold extends StatefulWidget { - final String title; - final List tabs; - final List tabViews; - final int initialTab; - final ValueChanged? onTabChanged; - - const PageScaffold({ - super.key, - required this.title, - required this.tabs, - required this.tabViews, - this.initialTab = 0, - this.onTabChanged, - }); - - @override - State createState() => _PageScaffoldState(); -} - -class _PageScaffoldState extends State - with SingleTickerProviderStateMixin { - late TabController _controller; - - @override - void initState() { - super.initState(); - _controller = TabController( - length: widget.tabs.length, - initialIndex: widget.initialTab.clamp(0, widget.tabs.length - 1), - vsync: this, - ); - if (widget.onTabChanged != null) { - _controller.addListener(() { - if (!_controller.indexIsChanging) { - widget.onTabChanged!(_controller.index); - } - }); - } - } - - @override - void dispose() { - _controller.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - color: context.tokens.surface, - child: TabBar( - controller: _controller, - isScrollable: true, - tabAlignment: TabAlignment.start, - labelColor: context.tokens.primary, - unselectedLabelColor: context.tokens.muted, - indicatorColor: context.tokens.primary, - indicatorWeight: 2, - labelStyle: - const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), - tabs: widget.tabs, - ), - ), - const Divider(height: 1), - Expanded( - child: TabBarView( - controller: _controller, - children: widget.tabViews, - ), - ), - ], - ); - } -} diff --git a/client/lib/widgets/partner_detail_drawer.dart b/client/lib/widgets/partner_detail_drawer.dart new file mode 100644 index 0000000..bc9bffa --- /dev/null +++ b/client/lib/widgets/partner_detail_drawer.dart @@ -0,0 +1,300 @@ +// widgets/partner_detail_drawer.dart — 往来单位详情抽屉（镜像原型 partners.html openDetail）。 +// 结构照 atoms .drawer/.dsec/.drow/.dli：联系信息 / 应收应付（应收染 success、应付染 accent） +// / 近期单据（财务流水，已覆盖入库应付、出库应收与收付款）/ 底部 对账单+编辑。 +import 'dart:math' as math; + +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../core/theme/app_chrome.g.dart'; +import '../core/theme/app_dims.g.dart'; +import '../core/theme/context_tokens.dart'; +import '../models/finance.dart'; +import '../models/partner.dart'; +import '../providers/partner_provider.dart'; +import 'ds/ds_atoms.dart'; +import 'write_guard.dart'; +import '../core/theme/app_fonts.dart'; +import 'ds/ds_toast.dart'; + +/// 打开往来单位详情抽屉。应收/应付由列表页的 partnerBalancesProvider 传入； +/// 近期单据抽屉内经 partnerRecentDocsProvider 拉取。 +Future showPartnerDetailDrawer( + BuildContext context, { + required Partner partner, + ({double recv, double pay})? balance, + VoidCallback? onEdit, +}) { + return showGeneralDialog( + context: context, + useRootNavigator: false, + barrierDismissible: true, + barrierLabel: '关闭', + barrierColor: AppChrome.scrim, // .drawer-mask --scrim + transitionDuration: const Duration(milliseconds: 250), + pageBuilder: (ctx, _, __) { + final w = math.min(480.0, MediaQuery.of(ctx).size.width * 0.94); + return Align( + alignment: Alignment.centerRight, + child: Material( + color: ctx.tokens.surface, + elevation: 16, + child: SelectionArea( + child: SizedBox( + width: w, + height: double.infinity, + child: _PartnerDetailDrawer( + partner: partner, balance: balance, onEdit: onEdit), + ), + ), + ), + ); + }, + transitionBuilder: (ctx, anim, _, child) => SlideTransition( + position: Tween(begin: const Offset(1, 0), end: Offset.zero) + .animate(CurvedAnimation(parent: anim, curve: Curves.easeOutCubic)), + child: child, + ), + ); +} + +/// 金额：原型预格式化字符串风格 ¥x,xxx（整数无小数，非整保留两位）。 +String fmtYuan(double v) { + final money = v == v.roundToDouble() + ? NumberFormat.decimalPattern().format(v.round()) + : NumberFormat('#,##0.00').format(v); + return '¥$money'; +} + +class _PartnerDetailDrawer extends ConsumerWidget { + final Partner partner; + final ({double recv, double pay})? balance; + final VoidCallback? onEdit; + const _PartnerDetailDrawer( + {required this.partner, this.balance, this.onEdit}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final t = context.tokens; + final docs = ref.watch(partnerRecentDocsProvider(partner.id)); + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // ── .drawer-head：名称 + X ── + Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 18), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.border))), + child: Row( + children: [ + Expanded( + child: Text(partner.name, + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w700, + color: t.heading)), + ), + IconButton( + onPressed: () => Navigator.of(context).pop(), + icon: Icon(LucideIcons.x, size: 18, color: t.muted), + tooltip: '关闭', + ), + ], + ), + ), + // ── .drawer-body ── + Expanded( + child: SingleChildScrollView( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 18), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _dsec(t, '联系信息', first: true), + _drow(t, '类型', badge: partnerTypeBadge(partner)), + _drow(t, '联系人', + text: (partner.contact?.isNotEmpty == true) + ? partner.contact! + : '—'), + _drow(t, '电话', + text: (partner.phone?.isNotEmpty == true) + ? partner.phone! + : '—', + mono: true), + _drow(t, '地址', + text: (partner.address?.isNotEmpty == true) + ? partner.address! + : '—', + wrap: true), + _dsec(t, '应收 / 应付'), + _drow(t, '应收账款', + text: fmtYuan(balance?.recv ?? 0), + mono: true, + color: t.success), + _drow(t, '应付账款', + text: fmtYuan(balance?.pay ?? 0), + mono: true, + color: t.accent), + _dsec(t, '近期单据'), + docs.when( + loading: () => const Padding( + padding: EdgeInsets.all(20), + child: Center( + child: SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator(strokeWidth: 2))), + ), + error: (e, _) => Padding( + padding: const EdgeInsets.symmetric(vertical: 12), + child: Text('单据加载失败', + style: + TextStyle(color: t.muted, fontSize: AppDims.fsSm)), + ), + data: (rows) => rows.isEmpty + ? Padding( + padding: const EdgeInsets.symmetric(vertical: 12), + child: Text('暂无往来单据', + style: TextStyle( + color: t.muted, fontSize: AppDims.fsSm)), + ) + : Column(children: [for (final r in rows) _dli(t, r)]), + ), + ], + ), + ), + ), + // ── 底部操作（原型：对账单 / 编辑）── + Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14), + decoration: + BoxDecoration(border: Border(top: BorderSide(color: t.border))), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + DsButton('对账单', small: true, onPressed: () { + showDsToast(context, '对账单功能即将上线'); + }), + const SizedBox(width: 10), + if (onEdit != null) + WriteGuard( + child: DsButton('编辑', small: true, onPressed: () { + Navigator.of(context).pop(); + onEdit!(); + }), + ), + ], + ), + ), + ], + ); + } + + /// 原型 .dsec：区块小标题（fs-xs muted 600，上距 18）。 + Widget _dsec(dynamic t, String label, {bool first = false}) => Padding( + padding: EdgeInsets.only(top: first ? 0 : 18, bottom: 4), + child: Align( + alignment: Alignment.centerLeft, + child: Text(label, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.muted, + fontWeight: FontWeight.w600, + letterSpacing: .4)), + ), + ); + + /// 原型 .drow：label(muted) + b(text 600)，pad 11 0，下边 border-subtle。 + Widget _drow(dynamic t, String label, + {String? text, + Widget? badge, + bool mono = false, + bool wrap = false, + Color? color}) { + return Container( + padding: const EdgeInsets.symmetric(vertical: 11), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, + style: TextStyle(fontSize: AppDims.fsBody, color: t.muted)), + const Spacer(), + if (badge != null) + badge + else + ConstrainedBox( + // 原型地址行 max-width:200 右对齐显示完整地址 + constraints: BoxConstraints(maxWidth: wrap ? 200 : 260), + child: Text(text ?? '—', + textAlign: TextAlign.right, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: color ?? t.text, + fontFamily: mono ? 'monospace' : null)), + ), + ], + ), + ); + } + + /// 原型 .dli：近期单据行（左 标题+small 日期，右 金额 mono 600）。 + Widget _dli(dynamic t, FinanceRecord r) { + // 收款/付款是清账方向，按原型示例带负号 + final out = r.type == 'receipt' || r.type == 'payment'; + return Container( + padding: const EdgeInsets.symmetric(vertical: 10), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(r.docTitle, + style: TextStyle(fontSize: AppDims.fsSm, color: t.text)), + Padding( + padding: const EdgeInsets.only(top: 2), + child: Text( + [ + if ((r.recordDate ?? '').isNotEmpty) + r.recordDate!.split('T').first, + if ((r.remark ?? '').isNotEmpty) r.remark!, + ].join(' · '), + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ), + ], + ), + ), + const SizedBox(width: 12), + Text('${out ? '-' : ''}${fmtYuan(r.amount)}', + style: TextStyle( + fontSize: AppDims.fsSm, + fontWeight: FontWeight.w600, + color: t.heading, + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback)), + ], + ), + ); + } +} + +/// 类型徽章（原型 b-供应商=info / b-客户=accent / b-两者=warn），列表/卡片/抽屉共用。 +DsBadge partnerTypeBadge(Partner p) => DsBadge(p.typeLabel, + tone: switch (p.typeLabel) { + '两者' => DsBadgeTone.warn, + '客户' => DsBadgeTone.accent, + _ => DsBadgeTone.info, + }); diff --git a/client/lib/widgets/product_editor_drawer.dart b/client/lib/widgets/product_editor_drawer.dart new file mode 100644 index 0000000..91b4552 --- /dev/null +++ b/client/lib/widgets/product_editor_drawer.dart @@ -0,0 +1,668 @@ +// widgets/product_editor_drawer.dart — 商品编辑抽屉（镜像原型 product-editor.js + atoms.css .pe-*）。 +// 库存屏行点击 / 眼睛图标打开：商品信息(.drow) + 商品图片(3 槽 .pe-gallery) + 商品介绍(.pe-pick/.pe-text)。 +// 外壳对齐 .drawer：宽 480(≤94vw) / 右滑入 250ms / mask=--scrim。 +import 'dart:math' as math; + +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:go_router/go_router.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../core/config/app_config.dart'; +import '../core/theme/app_chrome.g.dart'; +import '../core/theme/app_dims.g.dart'; +import '../core/theme/context_tokens.dart'; +import '../models/product.dart'; +import '../models/product_image.dart'; +import '../providers/product_option_provider.dart'; +import '../providers/product_provider.dart'; +import 'ds/ds_atoms.dart'; +import 'ds/grid_combo_cell.dart'; +import 'searchable_option_field.dart'; +import 'fullscreen_image_viewer.dart'; +import 'write_guard.dart'; +import 'ds/ds_toast.dart'; + +/// 打开商品编辑抽屉。库存上下文（当前库存/成本价/状态）由调用方传入， +/// 商品档案（编码/系列/规格/分类/图片/介绍）抽屉内 getDetail 拉取。 +Future showProductEditorDrawer( + BuildContext context, { + required int productId, + double? qty, + String? unit, + double? cost, + String? status, // 在售 / 预警 / 缺货 +}) { + return showGeneralDialog( + context: context, + useRootNavigator: false, + barrierDismissible: true, + barrierLabel: '关闭', + barrierColor: AppChrome.scrim, // .drawer-mask --scrim + transitionDuration: const Duration(milliseconds: 250), + pageBuilder: (ctx, _, __) { + final w = math.min(480.0, MediaQuery.of(ctx).size.width * 0.94); + return Align( + alignment: Alignment.centerRight, + child: Material( + color: ctx.tokens.surface, + elevation: 16, + child: SelectionArea( + child: SizedBox( + width: w, + height: double.infinity, + child: _ProductEditorDrawer( + productId: productId, + qty: qty, + unit: unit, + cost: cost, + status: status), + ), + ), + ), + ); + }, + transitionBuilder: (ctx, anim, _, child) => SlideTransition( + position: Tween(begin: const Offset(1, 0), end: Offset.zero) + .animate(CurvedAnimation(parent: anim, curve: Curves.easeOutCubic)), + child: child, + ), + ); +} + +/// 原型 PE_TILE：3 个图片槽位标题。 +const _peTiles = ['主图', '细节图', '场景图']; + +class _ProductEditorDrawer extends ConsumerStatefulWidget { + final int productId; + final double? qty; + final String? unit; + final double? cost; + final String? status; + const _ProductEditorDrawer({ + required this.productId, + this.qty, + this.unit, + this.cost, + this.status, + }); + + @override + ConsumerState<_ProductEditorDrawer> createState() => + _ProductEditorDrawerState(); +} + +class _ProductEditorDrawerState extends ConsumerState<_ProductEditorDrawer> { + Product? _product; + Object? _error; + bool _uploading = false; + bool _saving = false; + + // 介绍选择态（.pe-pick / .pe-text） + String? _introTitle; // 已选介绍库标题；null → 占位「从介绍库选择…」 + int? _introDocId; + final _introCtrl = TextEditingController(); + final _introFocus = FocusNode(); + + @override + void initState() { + super.initState(); + _load(); + } + + @override + void dispose() { + _introCtrl.dispose(); + _introFocus.dispose(); + super.dispose(); + } + + Future _load() async { + try { + final p = + await ref.read(productRepositoryProvider).getDetail(widget.productId); + if (!mounted) return; + setState(() { + _product = p; + _introTitle = p.descriptionDocTitle; + _introCtrl.text = p.description ?? ''; + }); + } catch (e) { + if (mounted) setState(() => _error = e); + } + } + + @override + Widget build(BuildContext context) { + final t = context.tokens; + final p = _product; + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // ── .drawer-head：商品名 + 预览 + X ── + Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 18), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.border))), + child: Row( + children: [ + Expanded( + child: Text(p?.name ?? '商品', + style: TextStyle( + fontSize: AppDims.fsH2, + fontWeight: FontWeight.w600, + color: t.heading), + maxLines: 1, + overflow: TextOverflow.ellipsis), + ), + const SizedBox(width: 10), + DsButton('预览', + icon: LucideIcons.eye, + small: true, + onPressed: p == null || p.publicId.isEmpty + ? null + : () => context.push('/product/${p.publicId}')), + const SizedBox(width: 10), + InkWell( + onTap: () => Navigator.of(context).pop(), + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Icon(LucideIcons.x, size: 22, color: t.muted), + ), + ], + ), + ), + // ── .drawer-body ── + Expanded( + child: _error != null + ? Center( + child: Text('加载失败：$_error', + style: + TextStyle(fontSize: AppDims.fsBody, color: t.danger))) + : p == null + ? Center( + child: SizedBox( + width: 30, + height: 30, + child: CircularProgressIndicator( + strokeWidth: 3, color: t.primary))) + : SingleChildScrollView( + padding: const EdgeInsets.symmetric( + horizontal: 20, vertical: 18), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _peCard(t, LucideIcons.table, '商品信息', + body: _infoBody(t, p), + bodyPadding: const EdgeInsets.symmetric( + horizontal: 13, vertical: 2)), + _peCard(t, LucideIcons.image, '商品图片', + body: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _gallery(t, p), + const SizedBox(height: 9), + Text('建议主图为白底产品图，可再加细节图（瓶身/防伪）与场景图。', + style: TextStyle( + fontSize: AppDims.fsXs, + color: t.faint, + height: 1.6)), + ], + )), + _peCard(t, LucideIcons.menu, '商品介绍 / 卖点', + manage: () => context.push('/products?tab=intro'), + body: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _introPick(t), + _introText(t), + ], + )), + // ── .pe-foot ── + Padding( + padding: const EdgeInsets.only(top: 6), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + DsButton('取消', + onPressed: () => + Navigator.of(context).pop()), + const SizedBox(width: 10), + WriteGuard( + child: DsButton('保存', + icon: LucideIcons.check, + variant: DsBtnVariant.primary, + onPressed: _saving ? null : _save), + ), + ], + ), + ), + ], + ), + ), + ), + ], + ); + } + + // ── .pe-card：边框 r-lg 卡，.pe-h 头(图标块+标题+管理入口) + .pe-b 体 ── + Widget _peCard( + dynamic t, + IconData icon, + String title, { + required Widget body, + EdgeInsets bodyPadding = const EdgeInsets.all(13), + VoidCallback? manage, + }) { + return Container( + margin: const EdgeInsets.only(bottom: 14), + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: t.surface, + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rLg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Container( + padding: const EdgeInsets.symmetric(horizontal: 13, vertical: 11), + decoration: BoxDecoration( + border: Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row( + children: [ + Container( + width: 22, + height: 22, + decoration: BoxDecoration( + color: t.brand50, + borderRadius: BorderRadius.circular(AppDims.rSm)), + alignment: Alignment.center, + child: Icon(icon, size: 14, color: t.primary), + ), + const SizedBox(width: 8), + Text(title, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.heading)), + if (manage != null) ...[ + const Spacer(), + InkWell( + onTap: manage, + child: Text('管理介绍库', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.primary)), + ), + ], + ], + ), + ), + Padding(padding: bodyPadding, child: body), + ], + ), + ); + } + + // ── 商品信息 .drow 行（条件行，末行无底线，对齐 product-editor.js infoRows） ── + Widget _infoBody(dynamic t, Product p) { + final rows = <(String, Widget)>[]; + Widget b(String s, {bool mono = false}) => Text(s, + style: TextStyle( + fontSize: AppDims.fsBody, + fontWeight: FontWeight.w600, + color: t.text, + fontFamily: mono ? 'monospace' : null)); + if (p.code.isNotEmpty) rows.add(('编码', b(p.code, mono: true))); + if ((p.series ?? '').isNotEmpty) rows.add(('系列', b(p.series!))); + if ((p.spec ?? '').isNotEmpty) rows.add(('规格', b(p.spec!))); + if ((p.categoryName ?? '').isNotEmpty) rows.add(('分类', b(p.categoryName!))); + if (widget.qty != null) { + rows.add(( + '当前库存', + b('${_fmtQty(widget.qty!)} ${widget.unit ?? p.unit}'.trim()) + )); + } + final cost = widget.cost ?? p.purchasePrice; + if (cost != null && cost > 0) rows.add(('成本价', b(_fmtMoney(cost)))); + if (widget.qty != null && cost != null && cost > 0) { + rows.add(('库存货值', b(_fmtMoney(widget.qty! * cost)))); + } + if ((widget.status ?? '').isNotEmpty) { + rows.add(( + '状态', + DsBadge(widget.status!, + tone: switch (widget.status) { + '缺货' => DsBadgeTone.danger, + '预警' => DsBadgeTone.warn, + _ => DsBadgeTone.ok, + }) + )); + } + return Column( + children: [ + for (var i = 0; i < rows.length; i++) + Container( + padding: const EdgeInsets.symmetric(vertical: 11), + decoration: BoxDecoration( + border: i == rows.length - 1 + ? null + : Border(bottom: BorderSide(color: t.borderSubtle))), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(rows[i].$1, + style: TextStyle(fontSize: AppDims.fsBody, color: t.muted)), + rows[i].$2, + ], + ), + ), + ], + ); + } + + // ── .pe-gallery：3 槽 86×106，空=虚线+加号+槽名，有图=图+右上删+底部槽名 ── + Widget _gallery(dynamic t, Product p) { + final imgs = [...p.images]..sort((a, b) => a.sortOrder - b.sortOrder); + return Wrap( + spacing: 9, + runSpacing: 9, + children: [ + for (var i = 0; i < _peTiles.length; i++) + _tile(t, i, i < imgs.length ? imgs[i] : null, imgs), + ], + ); + } + + Widget _tile(dynamic t, int i, ProductImage? img, List imgs) { + final has = img != null; + return SizedBox( + width: 86, + height: 106, + child: Stack( + fit: StackFit.expand, + children: [ + InkWell( + onTap: has ? null : (_uploading ? null : _pickAndUpload), + // 双击已有图片 → 全屏预览（多图可翻页） + onDoubleTap: has + ? () => showFullscreenImages( + context, + [for (final m in imgs) AppConfig.baseUrl + m.url], + initialIndex: imgs.indexOf(img), + ) + : null, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: has ? null : t.bg, + border: Border.all( + color: t.border, + width: 1.5, + style: has ? BorderStyle.solid : BorderStyle.none), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), + // 空槽虚线边框：Flutter 无原生 dashed，用 CustomPaint 描 + child: has + ? Image.network(AppConfig.baseUrl + img.url, + fit: BoxFit.cover) + : CustomPaint( + painter: _DashedBorderPainter( + color: t.border, + radius: AppDims.rMd, + strokeWidth: 1.5), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(LucideIcons.plus, size: 20, color: t.faint), + const SizedBox(height: 5), + Text(_peTiles[i], + style: TextStyle( + fontSize: AppDims.fsXs, color: t.faint)), + ], + ), + ), + ), + ), + if (has) ...[ + // .cap 底部槽名（scrim 底白字） + Positioned( + left: 0, + right: 0, + bottom: 0, + child: Container( + padding: const EdgeInsets.symmetric(vertical: 1), + color: AppChrome.scrim, + alignment: Alignment.center, + child: Text(_peTiles[i], + style: + TextStyle(fontSize: AppDims.fsXs, color: t.onPrimary)), + ), + ), + // .rm 右上删除 + Positioned( + top: 3, + right: 3, + child: InkWell( + onTap: () => _removeImage(img), + child: Container( + width: 18, + height: 18, + decoration: + BoxDecoration(color: t.danger, shape: BoxShape.circle), + alignment: Alignment.center, + child: Icon(LucideIcons.x, size: 11, color: t.onPrimary), + ), + ), + ), + ], + ], + ), + ); + } + + // ── .pe-pick：从介绍库选择——搜索下拉（GridComboCell 表单形态，供应商选择器同款； + // 原型为普通菜单，搜索为用户要求的增强，差异记 design/CONTRACT.md）── + Widget _introPick(dynamic t) { + final docs = + ref.watch(productDescriptionDocListProvider).valueOrNull ?? const []; + // 商品上只存标题快照（无 doc id）：编辑已有商品时按标题回配选中态 + final selectedId = _introDocId ?? + docs.where((d) => d.title == _introTitle).map((d) => d.id).firstOrNull; + return GridComboCell( + focusNode: _introFocus, + hint: _introTitle ?? '从介绍库选择…', + searchHint: '搜索介绍标题…', + showCount: true, + options: [for (final d in docs) OptionItem(id: d.id, name: d.title)], + selectedId: selectedId, + onChanged: (id) { + final doc = docs.where((d) => d.id == id).firstOrNull; + if (doc == null) return; + setState(() { + _introTitle = doc.title; + _introDocId = doc.id; + _introCtrl.text = doc.content ?? ''; + }); + }, + ); + } + + // ── .pe-text：介绍正文 ── + Widget _introText(dynamic t) { + return Container( + margin: const EdgeInsets.only(top: 10), + constraints: const BoxConstraints(minHeight: 84), + child: TextField( + controller: _introCtrl, + maxLines: null, + minLines: 3, + style: TextStyle(fontSize: AppDims.fsBody, color: t.text, height: 1.7), + decoration: InputDecoration( + isDense: true, + hintText: '一句话卖点 + 商品介绍，可在选用后直接编辑…', + hintStyle: TextStyle(fontSize: AppDims.fsBody, color: t.faint), + contentPadding: + const EdgeInsets.symmetric(horizontal: 11, vertical: 10), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.border), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(AppDims.rMd), + borderSide: BorderSide(color: t.primary), + ), + ), + ), + ); + } + + // ── 图片上传/删除（沿用商品详情页的取图管线） ── + bool get _isMobilePlatform => + !kIsWeb && + (defaultTargetPlatform == TargetPlatform.android || + defaultTargetPlatform == TargetPlatform.iOS); + + Future _pickAndUpload() async { + if (_isMobilePlatform) { + final source = await showModalBottomSheet( + context: context, + builder: (ctx) => SafeArea( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + leading: const Icon(LucideIcons.camera), + title: const Text('拍照'), + onTap: () => Navigator.pop(ctx, ImageSource.camera), + ), + ListTile( + leading: const Icon(LucideIcons.images), + title: const Text('从相册选择'), + onTap: () => Navigator.pop(ctx, ImageSource.gallery), + ), + ], + ), + ), + ); + if (source == null) return; + final xfile = await ImagePicker() + .pickImage(source: source, maxWidth: 2000, imageQuality: 85); + if (xfile == null) return; + await _uploadImage(filePath: xfile.path, fileName: xfile.name); + } else { + final result = await FilePicker.platform.pickFiles( + type: FileType.image, allowMultiple: false, withData: true); + if (result == null || result.files.isEmpty) return; + final file = result.files.first; + final String? filePath = kIsWeb ? null : file.path; + if (filePath == null && file.bytes == null) return; + await _uploadImage( + filePath: filePath, bytes: file.bytes, fileName: file.name); + } + } + + Future _uploadImage( + {String? filePath, Uint8List? bytes, required String fileName}) async { + setState(() => _uploading = true); + try { + await ref.read(productRepositoryProvider).uploadImage( + widget.productId, filePath, + bytes: bytes, fileName: fileName); + await _load(); + } catch (e) { + if (mounted) { + showDsToast(context, '上传失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _uploading = false); + } + } + + Future _removeImage(ProductImage img) async { + try { + await ref + .read(productRepositoryProvider) + .deleteImage(widget.productId, img.id); + await _load(); + } catch (e) { + if (mounted) { + showDsToast(context, '删除失败：$e', bg: context.tokens.danger); + } + } + } + + // ── 保存：介绍正文 +（选了的话）介绍库文档 ── + Future _save() async { + setState(() => _saving = true); + try { + await ref.read(productRepositoryProvider).update(widget.productId, { + 'description': _introCtrl.text, + if (_introDocId != null) 'description_doc_id': _introDocId, + }); + if (!mounted) return; + Navigator.of(context).pop(); + showDsToast(context, '商品介绍已保存 ✓'); + } catch (e) { + if (mounted) { + showDsToast(context, '保存失败：$e', bg: context.tokens.danger); + } + } finally { + if (mounted) setState(() => _saving = false); + } + } + + String _fmtQty(double v) => + v == v.roundToDouble() ? v.toInt().toString() : v.toString(); + + String _fmtMoney(double v) { + if (v >= 100000) return '¥${(v / 10000).toStringAsFixed(1)}万'; + final s = + v == v.roundToDouble() ? v.toInt().toString() : v.toStringAsFixed(2); + // 千分位 + final parts = s.split('.'); + final buf = StringBuffer(); + final digits = parts[0]; + for (var i = 0; i < digits.length; i++) { + if (i > 0 && (digits.length - i) % 3 == 0) buf.write(','); + buf.write(digits[i]); + } + return '¥$buf${parts.length > 1 ? '.${parts[1]}' : ''}'; + } +} + +/// 空图片槽虚线边框（.pe-tile border:1.5 dashed）。 +class _DashedBorderPainter extends CustomPainter { + final Color color; + final double radius; + final double strokeWidth; + _DashedBorderPainter( + {required this.color, required this.radius, required this.strokeWidth}); + + @override + void paint(Canvas canvas, Size size) { + final paint = Paint() + ..color = color + ..style = PaintingStyle.stroke + ..strokeWidth = strokeWidth; + final rrect = + RRect.fromRectAndRadius(Offset.zero & size, Radius.circular(radius)); + final path = Path()..addRRect(rrect); + const dash = 5.0, gap = 4.0; + for (final metric in path.computeMetrics()) { + var d = 0.0; + while (d < metric.length) { + canvas.drawPath( + metric.extractPath(d, math.min(d + dash, metric.length)), paint); + d += dash + gap; + } + } + } + + @override + bool shouldRepaint(_DashedBorderPainter old) => + old.color != color || old.radius != radius; +} diff --git a/client/lib/widgets/search_chip.dart b/client/lib/widgets/search_chip.dart deleted file mode 100644 index 51262c9..0000000 --- a/client/lib/widgets/search_chip.dart +++ /dev/null @@ -1,52 +0,0 @@ -import 'package:flutter/material.dart'; - -/// 搜索框内嵌的「已生效搜索词」标签：紧凑圆角 chip + ✕ 删除按钮。 -/// -/// 用于列表屏搜索框 [InputDecoration.prefix]，仅展示单个搜索词； -/// 点 ✕ 触发 [onDeleted] 清除搜索。 -class SearchChip extends StatelessWidget { - const SearchChip({super.key, required this.label, required this.onDeleted}); - - final String label; - final VoidCallback onDeleted; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final bg = theme.colorScheme.primary.withValues(alpha: 0.12); - final fg = theme.colorScheme.primary; - return Container( - padding: const EdgeInsets.only(left: 8, right: 2, top: 2, bottom: 2), - decoration: BoxDecoration( - color: bg, - borderRadius: BorderRadius.circular(12), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 120), - child: Text( - label, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12, - color: fg, - fontWeight: FontWeight.w500, - ), - ), - ), - InkResponse( - onTap: onDeleted, - radius: 14, - child: Padding( - padding: const EdgeInsets.all(2), - child: Icon(Icons.close, size: 14, color: fg), - ), - ), - ], - ), - ); - } -} diff --git a/client/lib/widgets/searchable_option_field.dart b/client/lib/widgets/searchable_option_field.dart index 51fc49b..24f3651 100644 --- a/client/lib/widgets/searchable_option_field.dart +++ b/client/lib/widgets/searchable_option_field.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'dart:async'; import '../core/utils/dialog_util.dart'; @@ -5,6 +6,8 @@ import 'package:flutter/material.dart'; import '../core/responsive/responsive.dart'; import 'package:lpinyin/lpinyin.dart'; import '../core/theme/context_tokens.dart'; +import 'ds/ds_atoms.dart'; +import 'ds/ds_toast.dart'; class OptionItem { final int id; @@ -106,10 +109,10 @@ class SearchableOptionField extends StatelessWidget { suffixIcon: selected ? GestureDetector( onTap: () => onChanged(null), - child: Icon(Icons.close, + child: Icon(LucideIcons.x, size: 14, color: context.tokens.muted), ) - : Icon(Icons.arrow_drop_down, + : Icon(LucideIcons.chevronDown, size: 16, color: context.tokens.muted), ), isEmpty: !selected, @@ -117,7 +120,7 @@ class SearchableOptionField extends StatelessWidget { selected ? _displayText : hint, style: TextStyle( fontSize: 12, - color: selected ? Colors.black87 : context.tokens.muted, + color: selected ? context.tokens.text : context.tokens.muted, ), overflow: TextOverflow.ellipsis, ), @@ -190,18 +193,14 @@ class _SearchDialogState extends State<_SearchDialog> { child: TextField( controller: nameCtrl, autofocus: true, - decoration: const InputDecoration(labelText: '名称', isDense: true), + decoration: const InputDecoration(hintText: '名称', isDense: true), ), ), actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(false), - child: const Text('取消'), - ), - TextButton( - onPressed: () => Navigator.of(context).pop(true), - child: const Text('确认新增'), - ), + DsButton('取消', onPressed: () => Navigator.of(context).pop(false)), + DsButton('确认新增', + variant: DsBtnVariant.primary, + onPressed: () => Navigator.of(context).pop(true)), ], ), ); @@ -216,16 +215,12 @@ class _SearchDialogState extends State<_SearchDialog> { Navigator.of(context).pop(newId); // 回填并自动选中 } else { setState(() => _creating = false); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('新增失败，请重试')), - ); + showDsToast(context, '新增失败，请重试'); } } catch (e) { if (!mounted) return; setState(() => _creating = false); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('新增失败：$e')), - ); + showDsToast(context, '新增失败：$e'); } } @@ -254,7 +249,7 @@ class _SearchDialogState extends State<_SearchDialog> { autofocus: true, decoration: InputDecoration( hintText: '搜索...', - prefixIcon: const Icon(Icons.search, size: 18), + prefixIcon: const Icon(LucideIcons.search, size: 18), suffixIcon: _searching ? const Padding( padding: EdgeInsets.all(10), @@ -310,7 +305,7 @@ class _SearchDialogState extends State<_SearchDialog> { height: 14, child: CircularProgressIndicator(strokeWidth: 2), ) - : const Icon(Icons.add, size: 16), + : const Icon(LucideIcons.plus, size: 16), label: Text('新增「$kw」到基础数据', style: const TextStyle(fontSize: 12)), ), @@ -320,15 +315,8 @@ class _SearchDialogState extends State<_SearchDialog> { ), actions: [ if (widget.selectedId != null) - TextButton( - onPressed: () => Navigator.of(context).pop(-1), - child: Text('清除选择', - style: TextStyle(color: context.tokens.muted)), - ), - TextButton( - onPressed: () => Navigator.of(context).pop(null), - child: const Text('取消'), - ), + DsButton('清除选择', onPressed: () => Navigator.of(context).pop(-1)), + DsButton('取消', onPressed: () => Navigator.of(context).pop(null)), ], ); } diff --git a/client/lib/widgets/select_product_dialog.dart b/client/lib/widgets/select_product_dialog.dart deleted file mode 100644 index 98f66d6..0000000 --- a/client/lib/widgets/select_product_dialog.dart +++ /dev/null @@ -1,184 +0,0 @@ -import 'package:flutter/material.dart'; -import '../core/responsive/responsive.dart'; -import 'package:lpinyin/lpinyin.dart'; -import '../models/product.dart'; - -class SelectProductDialog extends StatefulWidget { - final List products; - final int? selectedId; - - const SelectProductDialog({ - super.key, - required this.products, - this.selectedId, - }); - - @override - State createState() => _SelectProductDialogState(); -} - -class _SelectProductDialogState extends State { - final _searchCtrl = TextEditingController(); - List _filtered = []; - - // 缓存每个商品的拼音索引，避免搜索时重复计算 - late final Map _pinyinCache; - - @override - void initState() { - super.initState(); - _pinyinCache = { - for (final p in widget.products) p.id: _PinyinIndex.from(p), - }; - _filtered = widget.products; - _searchCtrl.addListener(_onSearch); - } - - @override - void dispose() { - _searchCtrl.dispose(); - super.dispose(); - } - - void _onSearch() { - final q = _searchCtrl.text.trim().toLowerCase(); - setState(() { - if (q.isEmpty) { - _filtered = widget.products; - } else { - _filtered = widget.products.where((p) { - // 原文匹配（名称、规格、编码、条码） - if (p.name.toLowerCase().contains(q)) return true; - if (p.spec?.toLowerCase().contains(q) ?? false) return true; - if (p.code.toLowerCase().contains(q)) return true; - if (p.barcode?.toLowerCase().contains(q) ?? false) return true; - // 拼音匹配（全拼 or 首字母） - final idx = _pinyinCache[p.id]!; - if (idx.fullPinyin.contains(q)) return true; - if (idx.initials.contains(q)) return true; - return false; - }).toList(); - } - }); - } - - @override - Widget build(BuildContext context) { - // 每行约 56px，窗口默认显示约 6 行，可滚动查看全部 - const listHeight = 56.0 * 6; - - return Dialog( - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), - child: SizedBox( - width: context.dialogWidth(480), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - // 标题栏 - Padding( - padding: const EdgeInsets.fromLTRB(20, 16, 8, 0), - child: Row( - children: [ - const Text('选择商品', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)), - const Spacer(), - IconButton( - onPressed: () => Navigator.pop(context), - icon: const Icon(Icons.close, size: 20), - visualDensity: VisualDensity.compact, - ), - ], - ), - ), - // 搜索框 - Padding( - padding: const EdgeInsets.fromLTRB(16, 8, 16, 8), - child: TextField( - controller: _searchCtrl, - autofocus: true, - decoration: InputDecoration( - hintText: '搜索名称 / 规格 / 编码 / 拼音首字母...', - prefixIcon: const Icon(Icons.search, size: 18), - suffixIcon: _searchCtrl.text.isNotEmpty - ? IconButton( - onPressed: _searchCtrl.clear, - icon: const Icon(Icons.clear, size: 16), - visualDensity: VisualDensity.compact, - ) - : null, - isDense: true, - contentPadding: const EdgeInsets.symmetric(vertical: 10), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - ), - ), - ), - ), - const Divider(height: 1), - // 商品列表（固定高度，可滚动） - if (_filtered.isEmpty) - const SizedBox( - height: listHeight, - child: Center( - child: Text('无匹配商品', style: TextStyle(color: Colors.grey)), - ), - ) - else - SizedBox( - height: listHeight, - child: ListView.separated( - itemCount: _filtered.length, - separatorBuilder: (_, __) => - const Divider(height: 1, indent: 16, endIndent: 16), - itemBuilder: (context, i) { - final p = _filtered[i]; - final isSelected = p.id == widget.selectedId; - return ListTile( - dense: true, - selected: isSelected, - selectedTileColor: Colors.blue.shade50, - title: Text( - p.name, - style: const TextStyle(fontSize: 13), - ), - subtitle: Text( - [ - if (p.spec != null && p.spec!.isNotEmpty) p.spec!, - p.unit, - if (p.code.isNotEmpty) '编码: ${p.code}', - ].join(' · '), - style: const TextStyle(fontSize: 12, color: Colors.grey), - ), - trailing: isSelected - ? const Icon(Icons.check, color: Colors.blue, size: 18) - : null, - onTap: () => Navigator.pop(context, p), - ); - }, - ), - ), - const SizedBox(height: 8), - ], - ), - ), - ); - } -} - -/// 每个商品的拼音索引：全拼 + 首字母，在 initState 时一次性计算并缓存 -class _PinyinIndex { - final String fullPinyin; // "longjingcha" - final String initials; // "ljc" - - const _PinyinIndex({required this.fullPinyin, required this.initials}); - - factory _PinyinIndex.from(Product p) { - // 拼接名称 + 规格作为拼音转换源 - final text = '${p.name}${p.spec ?? ''}'; - final full = PinyinHelper.getPinyinE(text, separator: '', defPinyin: '') - .toLowerCase(); - final init = PinyinHelper.getShortPinyin(text).toLowerCase(); - return _PinyinIndex(fullPinyin: full, initials: init); - } -} diff --git a/client/lib/widgets/theme_picker_pill.dart b/client/lib/widgets/theme_picker_pill.dart index 08086d8..51296ef 100644 --- a/client/lib/widgets/theme_picker_pill.dart +++ b/client/lib/widgets/theme_picker_pill.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../core/theme/context_tokens.dart'; @@ -5,8 +6,11 @@ import '../core/theme/theme_controller.dart'; /// 顶栏主题选择器 pill（原型 .theme-pill）：衬衫图标 + 当前主题名 + ▾。 /// 点开 A/B/C 菜单切换主题（持久化），从「系统设置」迁来的入口。 +/// [onSurface]：浅色变体（surface/border/muted），供登录注册等白底卡片使用 +/// （默认深色顶栏配色 topControl/topBorder/topFg）。 class ThemePickerPill extends ConsumerWidget { - const ThemePickerPill({super.key}); + final bool onSurface; + const ThemePickerPill({super.key, this.onSurface = false}); // 主题键 → 中文名（与原型 shell.js THEMES 一致）。 static const _names = {'a': '经典蓝', 'b': '琥珀', 'c': '酒窖'}; @@ -35,7 +39,7 @@ class ThemePickerPill extends ConsumerWidget { SizedBox( width: 18, child: sel - ? Icon(Icons.check, size: 16, color: t.primary) + ? Icon(LucideIcons.check, size: 16, color: t.primary) : null, ), const SizedBox(width: 4), @@ -55,18 +59,22 @@ class ThemePickerPill extends ConsumerWidget { height: 30, padding: const EdgeInsets.symmetric(horizontal: 11), decoration: BoxDecoration( - color: t.topControl, - border: Border.all(color: t.topBorder), + color: onSurface ? t.surface : t.topControl, + border: Border.all(color: onSurface ? t.border : t.topBorder), borderRadius: BorderRadius.circular(999), ), child: Row( mainAxisSize: MainAxisSize.min, children: [ - Icon(Icons.checkroom, size: 15, color: t.sideFg), + Icon(LucideIcons.shirt, + size: 15, color: onSurface ? t.muted : t.sideFg), const SizedBox(width: 7), - Text(name, style: TextStyle(fontSize: 12, color: t.topFg)), + Text(name, + style: TextStyle( + fontSize: 12, color: onSurface ? t.text : t.topFg)), const SizedBox(width: 7), - Icon(Icons.keyboard_arrow_down, size: 14, color: t.topFg), + Icon(LucideIcons.chevronDown, + size: 14, color: onSurface ? t.muted : t.topFg), ], ), ), diff --git a/client/lib/widgets/wheel_date_picker.dart b/client/lib/widgets/wheel_date_picker.dart index e74c073..c504ae7 100644 --- a/client/lib/widgets/wheel_date_picker.dart +++ b/client/lib/widgets/wheel_date_picker.dart @@ -1,109 +1,207 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../core/theme/context_tokens.dart'; +import '../core/theme/app_tokens.dart'; import '../core/theme/app_dims.g.dart'; -import '../core/responsive/responsive.dart'; import '../core/utils/dialog_util.dart'; +import '../core/theme/app_fonts.dart'; -/// 年/月/日 滚轮日期选择器（对齐原型 .wheel-pop）。选中返回 DateTime，取消返回 null。 -/// 「今天」快速跳到今天；「确定」确认。范围选择由调用方调两次（起/止）拼成。 -Future showWheelDatePicker( - BuildContext context, { - DateTime? initial, - String title = '选择日期', -}) { - return showAppDialog( - context: context, - builder: (_) => _WheelDateDialog(initial: initial ?? DateTime.now(), title: title), - ); -} - -class _WheelDateDialog extends StatefulWidget { +/// 年/月/日 滚轮日期选择面板（对齐原型单一真源 .wheel-pop / datewheel.js）。 +/// 三列纯数字（年 4 位、月/日补零两位，等宽字体），中间高亮带 = .wheel-center， +/// 居中项为 primary 加粗 16px；底部「今天」+「确定」，无取消（点外部取消）。 +/// +/// 本体是自包含的 248px 卡片（Material 描边+阴影），既可放进锚定浮层（单据/生产日期， +/// 挂在字段下方，对齐原型 datewheel.js 的 pop 定位），也可放进居中弹窗（范围选择）。 +/// 「确定」时回调 [onCommit]；「今天」仅在面板内滚动到今天，不提交。 +class WheelDatePanel extends StatefulWidget { final DateTime initial; + final ValueChanged onCommit; + + /// 可选标题（范围选择用「起始/结束日期」区分）；空则不渲染（对齐原型无标题）。 final String title; - const _WheelDateDialog({required this.initial, required this.title}); + + const WheelDatePanel({ + super.key, + required this.initial, + required this.onCommit, + this.title = '', + }); @override - State<_WheelDateDialog> createState() => _WheelDateDialogState(); + State createState() => _WheelDatePanelState(); } -class _WheelDateDialogState extends State<_WheelDateDialog> { - late DateTime _value; +const double _kItem = 36; // .wheel-item 行高 +const double _kColsH = 180; // .wheel-cols 高度（5 行） +const double _kWidth = 248; // .wheel-pop 宽度 + +String _pad2(int n) => n.toString().padLeft(2, '0'); +int _daysIn(int y, int m) => DateTime(y, m + 1, 0).day; // m: 1-12 + +class _WheelDatePanelState extends State { + late final List _years; // now-15 .. now+2（对齐 datewheel.js） + late int _yIdx, _mIdx, _dIdx; + late final FixedExtentScrollController _yCtrl, _mCtrl, _dCtrl; + + int get _year => _years[_yIdx]; + int get _month => _mIdx + 1; @override void initState() { super.initState(); - _value = DateTime(widget.initial.year, widget.initial.month, widget.initial.day); + final now = DateTime.now(); + _years = [for (var y = now.year - 15; y <= now.year + 2; y++) y]; + final v = widget.initial; + _yIdx = _years.indexOf(v.year); + if (_yIdx < 0) _yIdx = _years.indexOf(now.year); + if (_yIdx < 0) _yIdx = 0; + _mIdx = (v.month - 1).clamp(0, 11); + _dIdx = (v.day - 1).clamp(0, _daysIn(v.year, v.month) - 1); + _yCtrl = FixedExtentScrollController(initialItem: _yIdx); + _mCtrl = FixedExtentScrollController(initialItem: _mIdx); + _dCtrl = FixedExtentScrollController(initialItem: _dIdx); + } + + @override + void dispose() { + _yCtrl.dispose(); + _mCtrl.dispose(); + _dCtrl.dispose(); + super.dispose(); + } + + // 年/月变化后重算当月天数，超界则回夹并吸附。 + void _onYearOrMonth() { + final n = _daysIn(_year, _month); + if (_dIdx > n - 1) { + _dIdx = n - 1; + _dCtrl.jumpToItem(_dIdx); + } + setState(() {}); + } + + void _goToday() { + final now = DateTime.now(); + final yi = _years.indexOf(now.year); + if (yi >= 0) _yIdx = yi; + _mIdx = now.month - 1; + _dIdx = now.day - 1; + const d = Duration(milliseconds: 250); + _yCtrl.animateToItem(_yIdx, duration: d, curve: Curves.easeOut); + _mCtrl.animateToItem(_mIdx, duration: d, curve: Curves.easeOut); + _dCtrl.animateToItem(_dIdx, duration: d, curve: Curves.easeOut); + setState(() {}); } @override Widget build(BuildContext context) { final t = context.tokens; - return Dialog( - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(AppDims.rXl)), - child: SizedBox( - width: context.dialogWidth(320), + final days = _daysIn(_year, _month); + return Material( + color: t.surface, + elevation: 6, + borderRadius: BorderRadius.circular(AppDims.rMd), + child: Container( + width: _kWidth, + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + border: Border.all(color: t.border), + borderRadius: BorderRadius.circular(AppDims.rMd), + ), child: Column( mainAxisSize: MainAxisSize.min, children: [ - Padding( - padding: const EdgeInsets.fromLTRB(16, 14, 16, 4), - child: Row( - children: [ - Text(widget.title, + if (widget.title.isNotEmpty) + Padding( + padding: const EdgeInsets.fromLTRB(4, 2, 4, 8), + child: Align( + alignment: Alignment.centerLeft, + child: Text(widget.title, style: TextStyle( fontSize: AppDims.fsTitle, fontWeight: FontWeight.w600, color: t.heading)), + ), + ), + // 三列滚轮 + 中间高亮带 + SizedBox( + height: _kColsH, + child: Stack( + children: [ + Positioned( + left: 4, + right: 4, + top: (_kColsH - _kItem) / 2, + height: _kItem, + child: IgnorePointer( + child: Container( + decoration: BoxDecoration( + color: t.bg, + borderRadius: BorderRadius.circular(AppDims.rMd), + border: Border( + top: BorderSide(color: t.border), + bottom: BorderSide(color: t.border), + ), + ), + ), + ), + ), + Row( + children: [ + _col(t, _yCtrl, _years.length, + (i) => _years[i].toString(), _yIdx, (i) { + _yIdx = i; + _onYearOrMonth(); + }), + _col(t, _mCtrl, 12, (i) => _pad2(i + 1), _mIdx, (i) { + _mIdx = i; + _onYearOrMonth(); + }), + _col(t, _dCtrl, days, (i) => _pad2(i + 1), _dIdx, + (i) => setState(() => _dIdx = i)), + ], + ), ], ), ), - // 三列滚轮（年/月/日），中间高亮行由 CupertinoDatePicker 提供。 - SizedBox( - height: 200, - child: CupertinoTheme( - data: CupertinoThemeData( - textTheme: CupertinoTextThemeData( - dateTimePickerTextStyle: TextStyle(fontSize: 18, color: t.text), - ), - ), - child: CupertinoDatePicker( - mode: CupertinoDatePickerMode.date, - initialDateTime: _value, - minimumYear: 2015, - maximumYear: 2035, - onDateTimeChanged: (d) => - _value = DateTime(d.year, d.month, d.day), - ), + // 底栏：今天（左） / 确定（右，无取消，点外部取消） + Container( + margin: const EdgeInsets.only(top: 6), + padding: const EdgeInsets.fromLTRB(4, 8, 4, 2), + decoration: BoxDecoration( + border: Border(top: BorderSide(color: t.borderSubtle)), ), - ), - const Divider(height: 1), - Padding( - padding: const EdgeInsets.fromLTRB(12, 8, 12, 10), child: Row( children: [ - TextButton( - onPressed: () { - final now = DateTime.now(); - setState(() => _value = DateTime(now.year, now.month, now.day)); - }, - child: Text('今天', style: TextStyle(color: t.muted)), + InkWell( + onTap: _goToday, + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 10, vertical: 4), + child: Text('今天', + style: TextStyle( + fontSize: AppDims.fsSm, color: t.muted)), + ), ), const Spacer(), - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('取消', style: TextStyle(color: t.muted)), - ), - const SizedBox(width: 4), - ElevatedButton( - onPressed: () => Navigator.of(context).pop(_value), - style: ElevatedButton.styleFrom( - backgroundColor: t.primary, - foregroundColor: t.onPrimary, - elevation: 0, + InkWell( + onTap: () => + widget.onCommit(DateTime(_year, _month, _dIdx + 1)), + borderRadius: BorderRadius.circular(AppDims.rSm), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 16, vertical: 5), + decoration: BoxDecoration( + color: t.primary, + borderRadius: BorderRadius.circular(AppDims.rSm), + ), + child: Text('确定', + style: TextStyle( + fontSize: AppDims.fsSm, + color: t.onPrimary, + fontWeight: FontWeight.w600)), ), - child: const Text('确定'), ), ], ), @@ -113,6 +211,63 @@ class _WheelDateDialogState extends State<_WheelDateDialog> { ), ); } + + Widget _col( + AppTokens t, + FixedExtentScrollController ctrl, + int count, + String Function(int) label, + int selIdx, + ValueChanged onSel, + ) { + return Expanded( + child: ListWheelScrollView.useDelegate( + controller: ctrl, + itemExtent: _kItem, + physics: const FixedExtentScrollPhysics(), + diameterRatio: 100, // 近似平面，去掉滚轮弧度 + perspective: 0.0001, + onSelectedItemChanged: onSel, + childDelegate: ListWheelChildBuilderDelegate( + childCount: count, + builder: (c, i) { + final on = i == selIdx; + return Center( + child: Text( + label(i), + style: TextStyle( + fontFamily: AppFonts.mono, + fontFamilyFallback: AppFonts.monoFallback, + fontSize: on ? 16 : AppDims.fsBody, + fontWeight: on ? FontWeight.w700 : FontWeight.w400, + color: on ? t.primary : t.muted, + ), + ), + ); + }, + ), + ), + ); + } +} + +/// 居中弹窗形式（范围选择用）。锚定字段的用法见 DsDateCell（直接嵌 WheelDatePanel 到浮层）。 +Future showWheelDatePicker( + BuildContext context, { + DateTime? initial, + String title = '', +}) { + return showAppDialog( + context: context, + builder: (dctx) => Align( + alignment: Alignment.center, + child: WheelDatePanel( + initial: initial ?? DateTime.now(), + title: title, + onCommit: (d) => Navigator.of(dctx).pop(d), + ), + ), + ); } /// 范围选择：先选起始日、再选结束日；任一取消则返回 null。 @@ -126,7 +281,6 @@ Future showWheelDateRange( final end = await showWheelDatePicker(context, initial: initial?.end ?? start, title: '结束日期'); if (end == null) return null; - // 保证 start <= end return end.isBefore(start) ? DateTimeRange(start: end, end: start) : DateTimeRange(start: start, end: end); diff --git a/client/lib/widgets/write_guard.dart b/client/lib/widgets/write_guard.dart index 829aa09..56691b5 100644 --- a/client/lib/widgets/write_guard.dart +++ b/client/lib/widgets/write_guard.dart @@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../core/auth/auth_state.dart'; import '../core/config/license_copy.dart'; import '../providers/license_provider.dart'; +import 'ds/ds_toast.dart'; /// 写操作守卫：按「角色只读」和「授权过期」两种受限场景**区分处理**被包裹的写控件 /// （新增/编辑/删除/审核/提交/结清/导入…）： @@ -79,12 +80,7 @@ class _DisabledByLicense extends StatelessWidget { child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { - final messenger = ScaffoldMessenger.maybeOf(context); - messenger - ?..clearSnackBars() - ..showSnackBar( - SnackBar(content: Text(LicenseCopy.writeBlockedToast(lic))), - ); + showDsToast(context, LicenseCopy.writeBlockedToast(lic)); }, ), ), diff --git a/client/pubspec.lock b/client/pubspec.lock index 110e76a..982149f 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -265,7 +265,7 @@ packages: source: sdk version: "0.0.0" flutter_web_plugins: - dependency: transitive + dependency: "direct main" description: flutter source: sdk version: "0.0.0" diff --git a/client/pubspec.yaml b/client/pubspec.yaml index f59b35c..f1687a7 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -32,6 +32,9 @@ dependencies: # GBK 编码（TSPL TEXT 内置中文字体需要），支持 macOS/Windows/Linux charset_converter: ^2.1.0 lucide_icons_flutter: ^3.1.14+2 + # Web 端去 URL # 前缀（usePathUrlStrategy），Flutter SDK 内置包 + flutter_web_plugins: + sdk: flutter dev_dependencies: flutter_test: @@ -71,3 +74,10 @@ flutter: - family: NotoSansSC fonts: - asset: assets/fonts/NotoSansSC.ttf + # 等宽真相源（原型 --font-mono 首选 JetBrains Mono，OFL 可再分发）： + # 打包进 app → 原型截图 / golden / 三端真机等宽渲染完全同源。 + - family: JetBrainsMono + fonts: + - asset: assets/fonts/JetBrainsMono-Regular.ttf + - asset: assets/fonts/JetBrainsMono-Bold.ttf + weight: 700 diff --git a/client/test/api_forbidden_flow_test.dart b/client/test/api_forbidden_flow_test.dart index c1bcace..b1147a7 100644 --- a/client/test/api_forbidden_flow_test.dart +++ b/client/test/api_forbidden_flow_test.dart @@ -19,7 +19,8 @@ void main() { ); adapter.onPost( '/products', - (server) => server.reply(403, {'error': 'readonly user', 'code': 'READONLY_USER'}), + (server) => server + .reply(403, {'error': 'readonly user', 'code': 'READONLY_USER'}), data: {'name': '测试'}, ); @@ -44,7 +45,8 @@ void main() { ); adapter.onPost( '/stock-in', - (server) => server.reply(403, {'error': 'license expired', 'phase': 'readonly'}), + (server) => server + .reply(403, {'error': 'license expired', 'phase': 'readonly'}), data: {'x': 1}, ); diff --git a/client/test/auth_repository_test.dart b/client/test/auth_repository_test.dart index 77952be..604e01d 100644 --- a/client/test/auth_repository_test.dart +++ b/client/test/auth_repository_test.dart @@ -58,7 +58,8 @@ void main() { test('401 response maps to AuthException with server message', () async { adapter.onPost( '/auth/login', - (server) => server.reply(401, {'error': 'invalid username or password'}), + (server) => + server.reply(401, {'error': 'invalid username or password'}), data: { 'shop_code': 'S001', 'username': 'admin', diff --git a/client/test/date_picker_field_test.dart b/client/test/date_picker_field_test.dart index 7af1b8a..2ff1e75 100644 --- a/client/test/date_picker_field_test.dart +++ b/client/test/date_picker_field_test.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:jiu_client/core/theme/themes.dart'; @@ -41,7 +42,7 @@ void main() { )); await tester.pumpAndSettle(); expect(find.byType(TextField), findsOneWidget); - expect(find.byIcon(Icons.calendar_today), findsOneWidget); + expect(find.byIcon(LucideIcons.calendar), findsOneWidget); }); testWidgets('初始值回显到输入框', (tester) async { diff --git a/client/test/golden/about_golden_test.dart b/client/test/golden/about_golden_test.dart index a3f2633..c6657cf 100644 --- a/client/test/golden/about_golden_test.dart +++ b/client/test/golden/about_golden_test.dart @@ -1,44 +1,116 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:package_info_plus/package_info_plus.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:jiu_client/providers/update_provider.dart'; +import 'package:jiu_client/core/utils/clock.dart'; +import 'package:jiu_client/providers/changelog_provider.dart'; +import 'package:jiu_client/providers/license_provider.dart'; import 'package:jiu_client/screens/about/about_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -// 覆盖更新检查器，避免其后台 Timer 在 golden 结束后仍 pending。 -class _FakeUpdateNotifier extends UpdateNotifier { +/// design-distill 阶段4：关于我们 golden × 三主题（回归闸 + 保真基准）。 +/// Hero/产品信息/授权信息/更新日志 数据照抄原型 screens/about.html +/// （授权 2027-03-15 · CHANGELOG 4 条，默认 2 条展示）： +/// node tools/fidelity.mjs about +/// 更新基准：flutter test --update-goldens test/golden/about_golden_test.dart + +class _FakeLicense extends LicenseNotifier { @override - Future build() async => null; + Future build() async => LicenseInfo( + id: 1, + type: 'annual', + isActive: true, + maxDevices: 3, + phase: 'normal', + expiresAt: DateTime(2027, 3, 15), + ); } +// 原型 CHANGELOG（4 条；v1.0.60/63 属折叠区，默认只展示前 2 条） +const _changelog = [ + ChangelogEntry(version: '1.0.72', date: '2026-06-22', sections: [ + ( + type: 'feat', + items: [ + '用户管理新增四级角色：超级管理员 / 管理员 / 操作员 / 只读', + '商品公开页编辑器：图片、品鉴笔记、适饮建议可视化编辑并实时预览', + ] + ), + ( + type: 'impr', + items: [ + '顶栏 / 侧栏 / 状态栏统一为单一来源，全局一处生效', + '金额卡片改用「万」单位展示，更符合阅读习惯', + ] + ), + ]), + ChangelogEntry(version: '1.0.66', date: '2026-06-18', sections: [ + ( + type: 'feat', + items: [ + '入库 / 出库列表新增搜索框，支持单号、商品、往来单位关键字检索', + '入库 / 出库 / 库存页新增一键刷新', + ] + ), + ( + type: 'fix', + items: [ + '入库审核库存沿用明细真实快照名', + '库存列表过滤软删商品，修复历史导入占位顶替', + ] + ), + ]), + ChangelogEntry(version: '1.0.63', date: '2026-06-05', sections: [ + ( + type: 'feat', + items: [ + '新增设备管理：标签机 / 小票机 / 扫码枪 / 电子秤接入与测试打印', + '商品名搜索支持全拼与首字母', + ] + ), + ]), + ChangelogEntry(version: '1.0.60', date: '2026-05-22', sections: [ + (type: 'feat', items: ['往来单位对账单与应收应付明细抽屉']), + ]), +]; + List _overrides() => [ - updateProvider.overrideWith(() => _FakeUpdateNotifier()), - appVersionProvider.overrideWith((ref) => 'v1.0.72'), + licenseProvider.overrideWith(() => _FakeLicense()), + changelogProvider.overrideWith((ref) async => _changelog), ]; -/// design-distill 阶段4：关于我们整屏 golden × 三主题（桌面 + 移动）。 -/// 该屏正文已全 token 化；golden 锁住版本/帮助/关于卡片随主题换色。 -/// 版本/更新 provider 在测试环境降级为默认值（无插件/无网络）。 -/// 更新基准：flutter test --update-goldens test/golden/about_golden_test.dart void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); + PackageInfo.setMockInitialValues( + appName: 'jiu', + packageName: 'com.yanmei.jiu', + version: '1.0.72', + buildNumber: '72', + buildSignature: '', + ); + // 冻结授权剩余天数基准 + appClock = () => DateTime(2026, 7, 13, 9, 30, 15); - goldenAcrossThemes( - 'about 整屏(桌面)', + // 桌面：外壳挂载整框 + shellGoldenAcrossThemes( + 'about 整框(桌面)', + path: '/about', + screen: (_) => const AboutScreen(), goldenPrefix: 'about', - child: () => const Scaffold(body: AboutScreen()), overrides: _overrides, - logical: const Size(1280, 1000), + logical: const Size(1280, 900), ); + // 移动：窄屏单列 goldenAcrossThemes( 'about 整屏(移动)', goldenPrefix: 'about_mobile', child: () => const Scaffold(body: AboutScreen()), overrides: _overrides, - logical: const Size(390, 1100), + logical: const Size(390, 1600), ); } diff --git a/client/test/golden/app_shell_golden_test.dart b/client/test/golden/app_shell_golden_test.dart index 961150a..f923fb2 100644 --- a/client/test/golden/app_shell_golden_test.dart +++ b/client/test/golden/app_shell_golden_test.dart @@ -25,8 +25,14 @@ class _FakeAuth extends AuthNotifier { _FakeAuth() { state = const AuthState( user: AuthUser( - accessToken: 't', refreshToken: 'r', id: 1, username: 'wang', - realName: '王经理', shopNo: 'DSJH-001', shopId: 1, role: 'admin'), + accessToken: 't', + refreshToken: 'r', + id: 1, + username: 'wang', + realName: '王经理', + shopNo: 'DSJH-001', + shopId: 1, + role: 'admin'), ); } } @@ -42,8 +48,12 @@ class _FakeLicense extends LicenseNotifier { } const _shop = ShopInfo( - id: 1, code: 'DSJH-001', name: '鼎晟酒行', - address: '浙江省杭州市', phone: '0571-88886666', managerName: '王经理'); + id: 1, + code: 'DSJH-001', + name: '鼎晟酒行', + address: '浙江省杭州市', + phone: '0571-88886666', + managerName: '王经理'); List _overrides() => [ authStateProvider.overrideWith((ref) => _FakeAuth()), diff --git a/client/test/golden/device_management_golden_test.dart b/client/test/golden/device_management_golden_test.dart index 0ae2d89..ae1fb10 100644 --- a/client/test/golden/device_management_golden_test.dart +++ b/client/test/golden/device_management_golden_test.dart @@ -2,62 +2,166 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:jiu_client/core/auth/auth_state.dart'; import 'package:jiu_client/models/session.dart'; +import 'package:jiu_client/models/shop.dart'; import 'package:jiu_client/providers/session_provider.dart'; +import 'package:jiu_client/providers/shop_provider.dart'; import 'package:jiu_client/screens/devices/device_management_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：设备管理整屏 golden × 三主题（桌面 + 移动）。 -/// 验证在线/离线状态 → StatusPill 随主题换色。 +/// design-distill 阶段4：设备管理 golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell，数据照抄原型 screens/devices.html 的 +/// SESSIONS（4 行会话）与 DEVICES（5 台外设 → 店级 custom_fields.peripherals）： +/// node tools/fidelity.mjs devices /// 更新基准：flutter test --update-goldens test/golden/device_management_golden_test.dart -List _sessions() => [ - DeviceSession( - id: 1, userId: 1, username: '王经理', realName: '王经理', - platform: 'macos', platformClass: 'desktop', deviceName: 'MacBook Pro', - ip: '192.168.1.12', createdAt: DateTime(2026, 6, 20, 9, 12), - lastSeenAt: DateTime(2026, 6, 25, 12, 50), online: true, isCurrent: true), - DeviceSession( - id: 2, userId: 2, username: '李销售', realName: '李销售', - platform: 'android', platformClass: 'mobile', deviceName: 'Xiaomi 14', - ip: '192.168.1.23', createdAt: DateTime(2026, 6, 24, 14, 30), - lastSeenAt: DateTime(2026, 6, 25, 11, 05), online: true, isCurrent: false), - DeviceSession( - id: 3, userId: 3, username: '张前台', realName: '张前台', - platform: 'windows', platformClass: 'desktop', deviceName: 'ThinkPad', - ip: '192.168.1.31', createdAt: DateTime(2026, 6, 22, 8, 40), - lastSeenAt: DateTime(2026, 6, 23, 18, 20), online: false, isCurrent: false), - ]; +// 原型 SESSIONS 4 行（时间 MM-DD HH:mm） +final _sessions = [ + DeviceSession( + id: 1, + userId: 1, + username: '王经理', + realName: '王经理', + platform: 'macos', + platformClass: 'desktop', + deviceName: 'macos', + ip: '192.168.1.20', + createdAt: DateTime(2026, 6, 20, 11, 23), + lastSeenAt: DateTime(2026, 6, 22, 17, 40), + online: true, + isCurrent: true), + DeviceSession( + id: 2, + userId: 1, + username: '王经理', + realName: '王经理', + platform: 'windows', + platformClass: 'desktop', + deviceName: 'windows', + ip: '192.168.1.21', + createdAt: DateTime(2026, 6, 20, 10, 47), + lastSeenAt: DateTime(2026, 6, 22, 17, 40), + online: true, + isCurrent: false), + DeviceSession( + id: 3, + userId: 2, + username: '李采购', + realName: '李采购', + platform: 'windows', + platformClass: 'desktop', + deviceName: 'windows', + ip: '192.168.1.35', + createdAt: DateTime(2026, 6, 20, 9, 13), + lastSeenAt: DateTime(2026, 6, 22, 17, 11), + online: false, + isCurrent: false), + DeviceSession( + id: 4, + userId: 3, + username: '张前台', + realName: '张前台', + platform: 'ios', + platformClass: 'mobile', + deviceName: 'ios', + ip: '10.0.0.8', + createdAt: DateTime(2026, 6, 21, 17, 9), + lastSeenAt: DateTime(2026, 6, 22, 16, 32), + online: false, + isCurrent: false), +]; + +// 原型 DEVICES 5 台外设（登记式存档） +const _peripherals = [ + { + 'name': '前台标签打印机', + 'kind': '标签打印机', + 'status': '在线', + 'model': 'Zebra GK888t', + 'conn': 'USB', + 'last': '2 分钟前' + }, + { + 'name': '收银台小票机', + 'kind': '小票打印机', + 'status': '在线', + 'model': '佳博 GP-58MB', + 'conn': '蓝牙', + 'last': '刚刚' + }, + { + 'name': '入库扫码枪', + 'kind': '扫码枪', + 'status': '在线', + 'model': 'Honeywell 1900', + 'conn': 'USB', + 'last': '5 分钟前' + }, + { + 'name': '仓库电子秤', + 'kind': '电子秤', + 'status': '离线', + 'model': '香山 ACS-30', + 'conn': 'WiFi 192.168.1.66', + 'last': '昨天 17:42' + }, + { + 'name': '备用标签机', + 'kind': '标签打印机', + 'status': '离线', + 'model': 'Brother QL-820', + 'conn': '网络 192.168.1.51', + 'last': '3 天前' + }, +]; + +const _shopWithPeripherals = ShopInfo( + id: 1, + code: 'DSJH-001', + name: '鼎晟酒行', + address: '浙江省杭州市拱墅区运河路 168 号 1 幢', + phone: '0571-8888 6666', + managerName: '王经理', + wechatId: 'dingsheng-wine', + customFields: {'peripherals': _peripherals}, +); class _FakeSessionNotifier extends SessionListNotifier { @override - Future> build() async => _sessions(); + Future> build() async => _sessions; @override Future reload() async {} } List _overrides() => [ sessionListProvider.overrideWith(() => _FakeSessionNotifier()), + shopInfoProvider.overrideWith((ref) => _shopWithPeripherals), + isReadonlyProvider.overrideWithValue(false), ]; void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'device management 整屏(桌面)', + // 桌面：外壳挂载整框，与原型整页同构 + shellGoldenAcrossThemes( + 'devices 整框(桌面)', + path: '/devices', + screen: (_) => const DeviceManagementScreen(), goldenPrefix: 'device_management', - child: () => const Scaffold(body: DeviceManagementScreen()), overrides: _overrides, logical: const Size(1280, 900), ); + // 移动：窄屏卡片流 goldenAcrossThemes( - 'device management 整屏(移动)', + 'devices 整屏(移动)', goldenPrefix: 'device_management_mobile', child: () => const Scaffold(body: DeviceManagementScreen()), overrides: _overrides, - logical: const Size(390, 1100), + logical: const Size(390, 1400), ); } diff --git a/client/test/golden/finance_golden_test.dart b/client/test/golden/finance_golden_test.dart index 049a8d1..874874e 100644 --- a/client/test/golden/finance_golden_test.dart +++ b/client/test/golden/finance_golden_test.dart @@ -2,73 +2,195 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:jiu_client/core/models/page_result.dart'; import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/core/models/page_result.dart'; +import 'package:jiu_client/core/utils/clock.dart'; import 'package:jiu_client/models/finance.dart'; +import 'package:jiu_client/models/stock_summary.dart'; import 'package:jiu_client/providers/finance_provider.dart'; -import 'package:jiu_client/repositories/finance_repository.dart'; +import 'package:jiu_client/providers/stock_in_provider.dart'; +import 'package:jiu_client/providers/stock_out_provider.dart'; import 'package:jiu_client/screens/finance/finance_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：财务整屏 golden × 三主题（桌面 + 移动）。 -/// 验证类型徽章（应收/应付/收款/付款）+ 结清状态徽章 → StatusPill 随主题换色。 +/// design-distill 阶段4：财务管理 golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell，数据照抄原型 screens/finance.html 的 +/// TREND（6 月）/ SUMMARY（8 单位）/ FLOWS（10 条）；KPI 环比经 stock summary +/// 假数据凑成 ▲8.4% / ▼3.1%： +/// node tools/fidelity.mjs finance /// 更新基准：flutter test --update-goldens test/golden/finance_golden_test.dart -const _records = [ - FinanceRecord( - id: 1, type: 'receivable', amount: 126800, balance: 126800, - status: 'open', partnerName: '鼎丰超市', recordDate: '2026-06-20'), - FinanceRecord( - id: 2, type: 'payable', amount: 152600, balance: 0, - status: 'closed', partnerName: '老窖酒水批发', recordDate: '2026-06-18'), - FinanceRecord( - id: 3, type: 'receipt', amount: 54200, balance: 0, - status: 'closed', partnerName: '金樽酒楼', recordDate: '2026-06-15'), - FinanceRecord( - id: 4, type: 'payment', amount: 88400, balance: 88400, - status: 'open', partnerName: '汾酒山西直营', recordDate: '2026-06-12'), +// 原型 TREND（万元 → 元） +const _trend = [ + TrendPoint(month: '2026-01', inAmount: 1420000, outAmount: 1180000), + TrendPoint(month: '2026-02', inAmount: 960000, outAmount: 880000), + TrendPoint(month: '2026-03', inAmount: 1680000, outAmount: 1210000), + TrendPoint(month: '2026-04', inAmount: 1540000, outAmount: 1090000), + TrendPoint(month: '2026-05', inAmount: 1720000, outAmount: 1360000), + TrendPoint(month: '2026-06', inAmount: 1860000, outAmount: 1320000), ]; -// 财务屏经 FutureBuilder 直读 repository，故覆盖 repo（implements + noSuchMethod -// 只实现 listRecords，其余方法 golden 静态渲染不会触达）。 -class _FakeFinanceRepo implements FinanceRepository { - @override - Future> listRecords({ - String? type, - String? month, - int page = 1, - int pageSize = 50, - }) async => - const PageResult(data: _records, total: 4, page: 1, pageSize: 20); +// 原型 SUMMARY 8 行 +const _rows = [ + PartnerFinanceRow(partnerId: 1, name: '华东酒类批发', recv: 128400, openCount: 2), + PartnerFinanceRow(partnerId: 2, name: '金樽商贸', recv: 86200, openCount: 1), + PartnerFinanceRow(partnerId: 3, name: '茅台华南经销', pay: 142800, openCount: 1), + PartnerFinanceRow(partnerId: 4, name: '鸿运餐饮连锁', recv: 74600, openCount: 1), + PartnerFinanceRow(partnerId: 5, name: '五粮液省级代理', pay: 96400, openCount: 1), + PartnerFinanceRow( + partnerId: 6, name: '盛世名酒城', recv: 52300, pay: 18600, openCount: 2), + PartnerFinanceRow(partnerId: 7, name: '御品烟酒行', recv: 31800, openCount: 1), + PartnerFinanceRow(partnerId: 8, name: '川渝糖酒集团', pay: 60400, openCount: 1), +]; +// 原型 FLOWS 10 条（收款→receipt / 付款→payment；原型 SK/FK 单号无对应 +// ref 模型 → 关联单号列显 —，属已知差异） +const _flows = [ + FinanceRecord( + id: 1, + type: 'receipt', + amount: 68000, + balance: 0, + status: 'closed', + partnerName: '华东酒类批发', + recordDate: '2026-06-20', + remark: '飞天茅台货款'), + FinanceRecord( + id: 2, + type: 'payment', + amount: 142800, + balance: 0, + status: 'closed', + partnerName: '茅台华南经销', + recordDate: '2026-06-19', + remark: '6月采购结算'), + FinanceRecord( + id: 3, + type: 'receipt', + amount: 42600, + balance: 0, + status: 'closed', + partnerName: '金樽商贸', + recordDate: '2026-06-18', + remark: '五粮液尾款'), + FinanceRecord( + id: 4, + type: 'receipt', + amount: 31500, + balance: 0, + status: 'closed', + partnerName: '鸿运餐饮连锁', + recordDate: '2026-06-17', + remark: '宴会用酒'), + FinanceRecord( + id: 5, + type: 'payment', + amount: 96400, + balance: 0, + status: 'closed', + partnerName: '五粮液省级代理', + recordDate: '2026-06-16', + remark: '普五补货'), + FinanceRecord( + id: 6, + type: 'receipt', + amount: 23800, + balance: 0, + status: 'closed', + partnerName: '盛世名酒城', + recordDate: '2026-06-15', + remark: '国窖1573'), + FinanceRecord( + id: 7, + type: 'payment', + amount: 60400, + balance: 0, + status: 'closed', + partnerName: '川渝糖酒集团', + recordDate: '2026-06-14', + remark: '剑南春进货'), + FinanceRecord( + id: 8, + type: 'receipt', + amount: 18900, + balance: 0, + status: 'closed', + partnerName: '御品烟酒行', + recordDate: '2026-06-13', + remark: '习酒窖藏'), + FinanceRecord( + id: 9, + type: 'payment', + amount: 18600, + balance: 0, + status: 'closed', + partnerName: '盛世名酒城', + recordDate: '2026-06-12', + remark: '退换货补差'), + FinanceRecord( + id: 10, + type: 'receipt', + amount: 55200, + balance: 0, + status: 'closed', + partnerName: '华东酒类批发', + recordDate: '2026-06-11', + remark: '梦之蓝M6'), +]; + +class _FakeFinanceList extends FinanceListNotifier { @override - dynamic noSuchMethod(Invocation invocation) => - super.noSuchMethod(invocation); + Future> build() async => + const PageResult(data: _flows, total: 10, page: 1, pageSize: 50); + @override + void setType(String type) {} + @override + void setMonth(String month) {} + @override + void setRange(String startDate, String endDate) {} + @override + void setPage(int page) {} + @override + void setPageSize(int pageSize) {} + @override + void reload() {} } List _overrides() => [ - financeRepositoryProvider.overrideWithValue(_FakeFinanceRepo()), + financeListProvider.overrideWith(() => _FakeFinanceList()), + financeTrendProvider.overrideWith((ref) async => _trend), + financePartnerRowsProvider.overrideWith((ref) async => _rows), + // 环比凑成原型 ▲8.4% / ▼3.1% + stockOutSummaryProvider.overrideWith((ref) async => + const StockSummary(monthAmount: 1860000, lastMonthAmount: 1715867)), + stockInSummaryProvider.overrideWith((ref) async => + const StockSummary(monthAmount: 1320000, lastMonthAmount: 1362229)), isReadonlyProvider.overrideWithValue(false), ]; void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); + appClock = () => DateTime(2026, 7, 13, 9, 30, 15); - goldenAcrossThemes( - 'finance 整屏(桌面)', + // 桌面：外壳挂载整框，与原型整页同构 + shellGoldenAcrossThemes( + 'finance 整框(桌面)', + path: '/finance', + screen: (_) => const FinanceScreen(), goldenPrefix: 'finance', - child: () => const Scaffold(body: FinanceScreen()), overrides: _overrides, logical: const Size(1280, 900), ); + // 移动：窄屏单列（KPI 横滚 + 卡片流） goldenAcrossThemes( 'finance 整屏(移动)', goldenPrefix: 'finance_mobile', child: () => const Scaffold(body: FinanceScreen()), overrides: _overrides, - logical: const Size(390, 1300), + logical: const Size(390, 1600), ); } diff --git a/client/test/golden/goldens/about_a.png b/client/test/golden/goldens/about_a.png index 3a916e4..29204f3 100644 Binary files a/client/test/golden/goldens/about_a.png and b/client/test/golden/goldens/about_a.png differ diff --git a/client/test/golden/goldens/about_b.png b/client/test/golden/goldens/about_b.png index c49bc11..188a693 100644 Binary files a/client/test/golden/goldens/about_b.png and b/client/test/golden/goldens/about_b.png differ diff --git a/client/test/golden/goldens/about_c.png b/client/test/golden/goldens/about_c.png index 1d30acb..2ff1a63 100644 Binary files a/client/test/golden/goldens/about_c.png and b/client/test/golden/goldens/about_c.png differ diff --git a/client/test/golden/goldens/about_mobile_a.png b/client/test/golden/goldens/about_mobile_a.png index b19ec70..fa0ea2c 100644 Binary files a/client/test/golden/goldens/about_mobile_a.png and b/client/test/golden/goldens/about_mobile_a.png differ diff --git a/client/test/golden/goldens/about_mobile_b.png b/client/test/golden/goldens/about_mobile_b.png index 0f6ae25..002600f 100644 Binary files a/client/test/golden/goldens/about_mobile_b.png and b/client/test/golden/goldens/about_mobile_b.png differ diff --git a/client/test/golden/goldens/about_mobile_c.png b/client/test/golden/goldens/about_mobile_c.png index 61ea1f6..38cd31e 100644 Binary files a/client/test/golden/goldens/about_mobile_c.png and b/client/test/golden/goldens/about_mobile_c.png differ diff --git a/client/test/golden/goldens/app_shell_a.png b/client/test/golden/goldens/app_shell_a.png index 53c5421..d9e85a0 100644 Binary files a/client/test/golden/goldens/app_shell_a.png and b/client/test/golden/goldens/app_shell_a.png differ diff --git a/client/test/golden/goldens/app_shell_b.png b/client/test/golden/goldens/app_shell_b.png index b0a290a..757b7fd 100644 Binary files a/client/test/golden/goldens/app_shell_b.png and b/client/test/golden/goldens/app_shell_b.png differ diff --git a/client/test/golden/goldens/app_shell_c.png b/client/test/golden/goldens/app_shell_c.png index efcce5d..dfa1489 100644 Binary files a/client/test/golden/goldens/app_shell_c.png and b/client/test/golden/goldens/app_shell_c.png differ diff --git a/client/test/golden/goldens/device_management_a.png b/client/test/golden/goldens/device_management_a.png index dda875f..b48920d 100644 Binary files a/client/test/golden/goldens/device_management_a.png and b/client/test/golden/goldens/device_management_a.png differ diff --git a/client/test/golden/goldens/device_management_b.png b/client/test/golden/goldens/device_management_b.png index 45571f0..31bd82d 100644 Binary files a/client/test/golden/goldens/device_management_b.png and b/client/test/golden/goldens/device_management_b.png differ diff --git a/client/test/golden/goldens/device_management_c.png b/client/test/golden/goldens/device_management_c.png index 6d51c59..79b1c2d 100644 Binary files a/client/test/golden/goldens/device_management_c.png and b/client/test/golden/goldens/device_management_c.png differ diff --git a/client/test/golden/goldens/device_management_mobile_a.png b/client/test/golden/goldens/device_management_mobile_a.png index 34d0543..a5b8b28 100644 Binary files a/client/test/golden/goldens/device_management_mobile_a.png and b/client/test/golden/goldens/device_management_mobile_a.png differ diff --git a/client/test/golden/goldens/device_management_mobile_b.png b/client/test/golden/goldens/device_management_mobile_b.png index d3c3672..93b34bd 100644 Binary files a/client/test/golden/goldens/device_management_mobile_b.png and b/client/test/golden/goldens/device_management_mobile_b.png differ diff --git a/client/test/golden/goldens/device_management_mobile_c.png b/client/test/golden/goldens/device_management_mobile_c.png index 38ce4be..184ca62 100644 Binary files a/client/test/golden/goldens/device_management_mobile_c.png and b/client/test/golden/goldens/device_management_mobile_c.png differ diff --git a/client/test/golden/goldens/finance_a.png b/client/test/golden/goldens/finance_a.png index 5d66b28..ddf73d7 100644 Binary files a/client/test/golden/goldens/finance_a.png and b/client/test/golden/goldens/finance_a.png differ diff --git a/client/test/golden/goldens/finance_b.png b/client/test/golden/goldens/finance_b.png index d970be3..cd628f7 100644 Binary files a/client/test/golden/goldens/finance_b.png and b/client/test/golden/goldens/finance_b.png differ diff --git a/client/test/golden/goldens/finance_c.png b/client/test/golden/goldens/finance_c.png index 5512354..75c01f8 100644 Binary files a/client/test/golden/goldens/finance_c.png and b/client/test/golden/goldens/finance_c.png differ diff --git a/client/test/golden/goldens/finance_mobile_a.png b/client/test/golden/goldens/finance_mobile_a.png index 43e49ab..8da3a91 100644 Binary files a/client/test/golden/goldens/finance_mobile_a.png and b/client/test/golden/goldens/finance_mobile_a.png differ diff --git a/client/test/golden/goldens/finance_mobile_b.png b/client/test/golden/goldens/finance_mobile_b.png index 79a0255..1ae9267 100644 Binary files a/client/test/golden/goldens/finance_mobile_b.png and b/client/test/golden/goldens/finance_mobile_b.png differ diff --git a/client/test/golden/goldens/finance_mobile_c.png b/client/test/golden/goldens/finance_mobile_c.png index 2f9e686..c271eba 100644 Binary files a/client/test/golden/goldens/finance_mobile_c.png and b/client/test/golden/goldens/finance_mobile_c.png differ diff --git a/client/test/golden/goldens/inventory_list_a.png b/client/test/golden/goldens/inventory_list_a.png index dc214e1..6b9800e 100644 Binary files a/client/test/golden/goldens/inventory_list_a.png and b/client/test/golden/goldens/inventory_list_a.png differ diff --git a/client/test/golden/goldens/inventory_list_b.png b/client/test/golden/goldens/inventory_list_b.png index e28c197..01b5d45 100644 Binary files a/client/test/golden/goldens/inventory_list_b.png and b/client/test/golden/goldens/inventory_list_b.png differ diff --git a/client/test/golden/goldens/inventory_list_c.png b/client/test/golden/goldens/inventory_list_c.png index 0c3e1e7..1a8ff93 100644 Binary files a/client/test/golden/goldens/inventory_list_c.png and b/client/test/golden/goldens/inventory_list_c.png differ diff --git a/client/test/golden/goldens/inventory_list_mobile_a.png b/client/test/golden/goldens/inventory_list_mobile_a.png index 11acbc5..ec3e544 100644 Binary files a/client/test/golden/goldens/inventory_list_mobile_a.png and b/client/test/golden/goldens/inventory_list_mobile_a.png differ diff --git a/client/test/golden/goldens/inventory_list_mobile_b.png b/client/test/golden/goldens/inventory_list_mobile_b.png index 5c91def..ae9b5f7 100644 Binary files a/client/test/golden/goldens/inventory_list_mobile_b.png and b/client/test/golden/goldens/inventory_list_mobile_b.png differ diff --git a/client/test/golden/goldens/inventory_list_mobile_c.png b/client/test/golden/goldens/inventory_list_mobile_c.png index 746508a..9b3b4a2 100644 Binary files a/client/test/golden/goldens/inventory_list_mobile_c.png and b/client/test/golden/goldens/inventory_list_mobile_c.png differ diff --git a/client/test/golden/goldens/login_a.png b/client/test/golden/goldens/login_a.png index 8ac5c11..48fb9b1 100644 Binary files a/client/test/golden/goldens/login_a.png and b/client/test/golden/goldens/login_a.png differ diff --git a/client/test/golden/goldens/login_b.png b/client/test/golden/goldens/login_b.png index 2d45fd6..d612df5 100644 Binary files a/client/test/golden/goldens/login_b.png and b/client/test/golden/goldens/login_b.png differ diff --git a/client/test/golden/goldens/login_c.png b/client/test/golden/goldens/login_c.png index 3110c24..d0d3a25 100644 Binary files a/client/test/golden/goldens/login_c.png and b/client/test/golden/goldens/login_c.png differ diff --git a/client/test/golden/goldens/partners_a.png b/client/test/golden/goldens/partners_a.png index acffe7a..4e8125d 100644 Binary files a/client/test/golden/goldens/partners_a.png and b/client/test/golden/goldens/partners_a.png differ diff --git a/client/test/golden/goldens/partners_b.png b/client/test/golden/goldens/partners_b.png index ac8a526..8cc93e4 100644 Binary files a/client/test/golden/goldens/partners_b.png and b/client/test/golden/goldens/partners_b.png differ diff --git a/client/test/golden/goldens/partners_c.png b/client/test/golden/goldens/partners_c.png index afadbc5..5e80f0a 100644 Binary files a/client/test/golden/goldens/partners_c.png and b/client/test/golden/goldens/partners_c.png differ diff --git a/client/test/golden/goldens/partners_mobile_a.png b/client/test/golden/goldens/partners_mobile_a.png index e58563f..4746621 100644 Binary files a/client/test/golden/goldens/partners_mobile_a.png and b/client/test/golden/goldens/partners_mobile_a.png differ diff --git a/client/test/golden/goldens/partners_mobile_b.png b/client/test/golden/goldens/partners_mobile_b.png index 19b73a0..40761ab 100644 Binary files a/client/test/golden/goldens/partners_mobile_b.png and b/client/test/golden/goldens/partners_mobile_b.png differ diff --git a/client/test/golden/goldens/partners_mobile_c.png b/client/test/golden/goldens/partners_mobile_c.png index a8f22bb..19523d8 100644 Binary files a/client/test/golden/goldens/partners_mobile_c.png and b/client/test/golden/goldens/partners_mobile_c.png differ diff --git a/client/test/golden/goldens/product_detail_a.png b/client/test/golden/goldens/product_detail_a.png index fe11594..c6e5ec2 100644 Binary files a/client/test/golden/goldens/product_detail_a.png and b/client/test/golden/goldens/product_detail_a.png differ diff --git a/client/test/golden/goldens/product_detail_b.png b/client/test/golden/goldens/product_detail_b.png index 81f3842..9aae1fa 100644 Binary files a/client/test/golden/goldens/product_detail_b.png and b/client/test/golden/goldens/product_detail_b.png differ diff --git a/client/test/golden/goldens/product_detail_c.png b/client/test/golden/goldens/product_detail_c.png index a4b33b8..081fc77 100644 Binary files a/client/test/golden/goldens/product_detail_c.png and b/client/test/golden/goldens/product_detail_c.png differ diff --git a/client/test/golden/goldens/products_archive_a.png b/client/test/golden/goldens/products_archive_a.png index 7264a0a..c882d57 100644 Binary files a/client/test/golden/goldens/products_archive_a.png and b/client/test/golden/goldens/products_archive_a.png differ diff --git a/client/test/golden/goldens/products_archive_b.png b/client/test/golden/goldens/products_archive_b.png index 5aa4046..f91c08e 100644 Binary files a/client/test/golden/goldens/products_archive_b.png and b/client/test/golden/goldens/products_archive_b.png differ diff --git a/client/test/golden/goldens/products_archive_c.png b/client/test/golden/goldens/products_archive_c.png index 665b712..22c4418 100644 Binary files a/client/test/golden/goldens/products_archive_c.png and b/client/test/golden/goldens/products_archive_c.png differ diff --git a/client/test/golden/goldens/products_archive_mobile_a.png b/client/test/golden/goldens/products_archive_mobile_a.png new file mode 100644 index 0000000..01d92af Binary files /dev/null and b/client/test/golden/goldens/products_archive_mobile_a.png differ diff --git a/client/test/golden/goldens/products_archive_mobile_b.png b/client/test/golden/goldens/products_archive_mobile_b.png new file mode 100644 index 0000000..002febb Binary files /dev/null and b/client/test/golden/goldens/products_archive_mobile_b.png differ diff --git a/client/test/golden/goldens/products_archive_mobile_c.png b/client/test/golden/goldens/products_archive_mobile_c.png new file mode 100644 index 0000000..ce22f63 Binary files /dev/null and b/client/test/golden/goldens/products_archive_mobile_c.png differ diff --git a/client/test/golden/goldens/register_a.png b/client/test/golden/goldens/register_a.png index ab7a435..f1127ee 100644 Binary files a/client/test/golden/goldens/register_a.png and b/client/test/golden/goldens/register_a.png differ diff --git a/client/test/golden/goldens/register_b.png b/client/test/golden/goldens/register_b.png index 292664e..3745006 100644 Binary files a/client/test/golden/goldens/register_b.png and b/client/test/golden/goldens/register_b.png differ diff --git a/client/test/golden/goldens/register_c.png b/client/test/golden/goldens/register_c.png index 23e0284..19f4aa5 100644 Binary files a/client/test/golden/goldens/register_c.png and b/client/test/golden/goldens/register_c.png differ diff --git a/client/test/golden/goldens/settings_a.png b/client/test/golden/goldens/settings_a.png new file mode 100644 index 0000000..7f793ac Binary files /dev/null and b/client/test/golden/goldens/settings_a.png differ diff --git a/client/test/golden/goldens/settings_b.png b/client/test/golden/goldens/settings_b.png new file mode 100644 index 0000000..8c8095d Binary files /dev/null and b/client/test/golden/goldens/settings_b.png differ diff --git a/client/test/golden/goldens/settings_c.png b/client/test/golden/goldens/settings_c.png new file mode 100644 index 0000000..4cce889 Binary files /dev/null and b/client/test/golden/goldens/settings_c.png differ diff --git a/client/test/golden/goldens/settings_mobile_a.png b/client/test/golden/goldens/settings_mobile_a.png new file mode 100644 index 0000000..f860706 Binary files /dev/null and b/client/test/golden/goldens/settings_mobile_a.png differ diff --git a/client/test/golden/goldens/settings_mobile_b.png b/client/test/golden/goldens/settings_mobile_b.png new file mode 100644 index 0000000..9bb0b16 Binary files /dev/null and b/client/test/golden/goldens/settings_mobile_b.png differ diff --git a/client/test/golden/goldens/settings_mobile_c.png b/client/test/golden/goldens/settings_mobile_c.png new file mode 100644 index 0000000..60a665d Binary files /dev/null and b/client/test/golden/goldens/settings_mobile_c.png differ diff --git a/client/test/golden/goldens/stock_in_form_a.png b/client/test/golden/goldens/stock_in_form_a.png index eb1bd8f..4f6d4cb 100644 Binary files a/client/test/golden/goldens/stock_in_form_a.png and b/client/test/golden/goldens/stock_in_form_a.png differ diff --git a/client/test/golden/goldens/stock_in_form_b.png b/client/test/golden/goldens/stock_in_form_b.png index aeeda40..c25ea0f 100644 Binary files a/client/test/golden/goldens/stock_in_form_b.png and b/client/test/golden/goldens/stock_in_form_b.png differ diff --git a/client/test/golden/goldens/stock_in_form_c.png b/client/test/golden/goldens/stock_in_form_c.png index 2653e52..d9a2ebe 100644 Binary files a/client/test/golden/goldens/stock_in_form_c.png and b/client/test/golden/goldens/stock_in_form_c.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_a.png b/client/test/golden/goldens/stock_in_form_mobile_a.png index a1ead43..86e9db1 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_a.png and b/client/test/golden/goldens/stock_in_form_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_b.png b/client/test/golden/goldens/stock_in_form_mobile_b.png index 2aee146..01902f9 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_b.png and b/client/test/golden/goldens/stock_in_form_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_c.png b/client/test/golden/goldens/stock_in_form_mobile_c.png index fafcab4..0871ed2 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_c.png and b/client/test/golden/goldens/stock_in_form_mobile_c.png differ diff --git a/client/test/golden/goldens/stock_in_list_a.png b/client/test/golden/goldens/stock_in_list_a.png index dc008ff..8475d66 100644 Binary files a/client/test/golden/goldens/stock_in_list_a.png and b/client/test/golden/goldens/stock_in_list_a.png differ diff --git a/client/test/golden/goldens/stock_in_list_b.png b/client/test/golden/goldens/stock_in_list_b.png index 1ce99c6..0530850 100644 Binary files a/client/test/golden/goldens/stock_in_list_b.png and b/client/test/golden/goldens/stock_in_list_b.png differ diff --git a/client/test/golden/goldens/stock_in_list_c.png b/client/test/golden/goldens/stock_in_list_c.png index 0615192..2981ce4 100644 Binary files a/client/test/golden/goldens/stock_in_list_c.png and b/client/test/golden/goldens/stock_in_list_c.png differ diff --git a/client/test/golden/goldens/stock_in_list_mobile_a.png b/client/test/golden/goldens/stock_in_list_mobile_a.png index 46d7203..faf9eb5 100644 Binary files a/client/test/golden/goldens/stock_in_list_mobile_a.png and b/client/test/golden/goldens/stock_in_list_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_in_list_mobile_b.png b/client/test/golden/goldens/stock_in_list_mobile_b.png index 5b56517..d7b13bd 100644 Binary files a/client/test/golden/goldens/stock_in_list_mobile_b.png and b/client/test/golden/goldens/stock_in_list_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_in_list_mobile_c.png b/client/test/golden/goldens/stock_in_list_mobile_c.png index c1bc085..5d169e3 100644 Binary files a/client/test/golden/goldens/stock_in_list_mobile_c.png and b/client/test/golden/goldens/stock_in_list_mobile_c.png differ diff --git a/client/test/golden/goldens/stock_out_form_a.png b/client/test/golden/goldens/stock_out_form_a.png index 6498baa..342778b 100644 Binary files a/client/test/golden/goldens/stock_out_form_a.png and b/client/test/golden/goldens/stock_out_form_a.png differ diff --git a/client/test/golden/goldens/stock_out_form_b.png b/client/test/golden/goldens/stock_out_form_b.png index 566735e..2f39ee9 100644 Binary files a/client/test/golden/goldens/stock_out_form_b.png and b/client/test/golden/goldens/stock_out_form_b.png differ diff --git a/client/test/golden/goldens/stock_out_form_c.png b/client/test/golden/goldens/stock_out_form_c.png index 92857f5..630f143 100644 Binary files a/client/test/golden/goldens/stock_out_form_c.png and b/client/test/golden/goldens/stock_out_form_c.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_a.png b/client/test/golden/goldens/stock_out_form_mobile_a.png index b6399a0..3b51648 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_a.png and b/client/test/golden/goldens/stock_out_form_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_b.png b/client/test/golden/goldens/stock_out_form_mobile_b.png index 4aa8516..9c15ad9 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_b.png and b/client/test/golden/goldens/stock_out_form_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_c.png b/client/test/golden/goldens/stock_out_form_mobile_c.png index bbc1ea4..7094a23 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_c.png and b/client/test/golden/goldens/stock_out_form_mobile_c.png differ diff --git a/client/test/golden/goldens/stock_out_list_a.png b/client/test/golden/goldens/stock_out_list_a.png index b8486a8..858f8b6 100644 Binary files a/client/test/golden/goldens/stock_out_list_a.png and b/client/test/golden/goldens/stock_out_list_a.png differ diff --git a/client/test/golden/goldens/stock_out_list_b.png b/client/test/golden/goldens/stock_out_list_b.png index 355ba57..8a3eb81 100644 Binary files a/client/test/golden/goldens/stock_out_list_b.png and b/client/test/golden/goldens/stock_out_list_b.png differ diff --git a/client/test/golden/goldens/stock_out_list_c.png b/client/test/golden/goldens/stock_out_list_c.png index 9d93975..73de09e 100644 Binary files a/client/test/golden/goldens/stock_out_list_c.png and b/client/test/golden/goldens/stock_out_list_c.png differ diff --git a/client/test/golden/goldens/stock_out_list_mobile_a.png b/client/test/golden/goldens/stock_out_list_mobile_a.png index 78989d6..3829f50 100644 Binary files a/client/test/golden/goldens/stock_out_list_mobile_a.png and b/client/test/golden/goldens/stock_out_list_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_out_list_mobile_b.png b/client/test/golden/goldens/stock_out_list_mobile_b.png index c7f748f..2e6dd10 100644 Binary files a/client/test/golden/goldens/stock_out_list_mobile_b.png and b/client/test/golden/goldens/stock_out_list_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_out_list_mobile_c.png b/client/test/golden/goldens/stock_out_list_mobile_c.png index a526d0d..a425bca 100644 Binary files a/client/test/golden/goldens/stock_out_list_mobile_c.png and b/client/test/golden/goldens/stock_out_list_mobile_c.png differ diff --git a/client/test/golden/goldens/users_a.png b/client/test/golden/goldens/users_a.png new file mode 100644 index 0000000..e74caaa Binary files /dev/null and b/client/test/golden/goldens/users_a.png differ diff --git a/client/test/golden/goldens/users_b.png b/client/test/golden/goldens/users_b.png new file mode 100644 index 0000000..67543b4 Binary files /dev/null and b/client/test/golden/goldens/users_b.png differ diff --git a/client/test/golden/goldens/users_c.png b/client/test/golden/goldens/users_c.png new file mode 100644 index 0000000..07e117e Binary files /dev/null and b/client/test/golden/goldens/users_c.png differ diff --git a/client/test/golden/goldens/users_mobile_a.png b/client/test/golden/goldens/users_mobile_a.png new file mode 100644 index 0000000..b774aaa Binary files /dev/null and b/client/test/golden/goldens/users_mobile_a.png differ diff --git a/client/test/golden/goldens/users_mobile_b.png b/client/test/golden/goldens/users_mobile_b.png new file mode 100644 index 0000000..a682f48 Binary files /dev/null and b/client/test/golden/goldens/users_mobile_b.png differ diff --git a/client/test/golden/goldens/users_mobile_c.png b/client/test/golden/goldens/users_mobile_c.png new file mode 100644 index 0000000..888a602 Binary files /dev/null and b/client/test/golden/goldens/users_mobile_c.png differ diff --git a/client/test/golden/inventory_list_golden_test.dart b/client/test/golden/inventory_list_golden_test.dart index de63302..434e230 100644 --- a/client/test/golden/inventory_list_golden_test.dart +++ b/client/test/golden/inventory_list_golden_test.dart @@ -11,40 +11,204 @@ import 'package:jiu_client/providers/product_option_provider.dart'; import 'package:jiu_client/screens/inventory/inventory_list_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：库存列表**整屏** golden × 三主题（回归闸）。 -/// 保真目检：另跑 shoot-prototype 截 screens/inventory.html，再用 montage.mjs -/// 与 goldens/inventory_list_.png 并排比对。 +/// design-distill 阶段4：库存列表 golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell（与原型整页截图同构），行数据照抄原型 +/// screens/inventory.html 的 ITEMS（12 SKU，每页 10），可与 proto 基准整屏 diff： +/// node tools/fidelity.mjs inventory /// 更新基准：flutter test --update-goldens test/golden/inventory_list_golden_test.dart +// 原型 ITEMS 前 10 行（page 1/12，perPage=10）。cost=unitPrice、price=salePrice。 +// 状态为派生（qty=0 缺货 / qty> build() async => - const PageResult(data: _items, total: 3, page: 1, pageSize: 20); + const PageResult(data: _items, total: 12, page: 1, pageSize: 10); @override void setPage(int page) {} @override @@ -54,6 +218,8 @@ class _FakeInvNotifier extends InventoryListNotifier { @override void setKeyword(String keyword) {} @override + void setCode(String code) {} + @override void setSeries(List series) {} @override void setSpec(List spec) {} @@ -82,6 +248,10 @@ List _overrides() => [ inStockQty: 18920, shortageCount: 17, warningCount: 6, + // 月初快照 → 环比 ▲2.3% / ▲1.1% / ▼0.6%（对齐原型示例文案） + lastMonthSku: 1255, + lastMonthValue: 2611276, + lastMonthQty: 19034, )), ]; @@ -89,11 +259,12 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - // 桌面：宽屏表格路径 - goldenAcrossThemes( - 'inventory list 整屏(桌面)', + // 桌面：外壳挂载整框（顶栏+侧栏+状态栏+屏），与原型整页同构 + shellGoldenAcrossThemes( + 'inventory list 整框(桌面)', + path: '/inventory', + screen: (_) => const InventoryListScreen(), goldenPrefix: 'inventory_list', - child: () => const Scaffold(body: InventoryListScreen()), overrides: _overrides, logical: const Size(1280, 900), ); diff --git a/client/test/golden/login_golden_test.dart b/client/test/golden/login_golden_test.dart index 85a3dcb..4bca4dd 100644 --- a/client/test/golden/login_golden_test.dart +++ b/client/test/golden/login_golden_test.dart @@ -1,27 +1,43 @@ import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:jiu_client/core/theme/theme_controller.dart'; import 'package:jiu_client/providers/connectivity_provider.dart'; import 'package:jiu_client/screens/auth/login_screen.dart'; import '../support/golden_harness.dart'; -/// design-distill 阶段4：登录屏 golden × 三主题（品牌 hero + 表单）。 -/// 锁住品牌 hero、表单、离线提示条（已 token 化）随主题换色。 +/// design-distill 阶段4：登录屏 golden × 三主题（照原型 login.html 重建： +/// 两栏卡片=品牌渐变面板+表单，右上角主题切换器）。1280×900 与 fidelity 注册一致。 +/// 历史账号 mock 成原型预填值（DSJH-001 / wang），记住我默认开 → 表单预填。 /// 更新基准：flutter test --update-goldens test/golden/login_golden_test.dart void main() { TestWidgetsFlutterBinding.ensureInitialized(); - SharedPreferences.setMockInitialValues({}); + SharedPreferences.setMockInitialValues({ + 'login_history_hotels': ['DSJH-001'], + 'login_history_usernames': ['wang'], + }); - goldenAcrossThemes( - 'login 整屏', - goldenPrefix: 'login', - child: () => const LoginScreen(), - overrides: () => [ - // 跳过联网首检，避免后台 Timer 在 golden 结束后仍 pending - connectivityProvider.overrideWith((ref) => ConnectivityNotifier(skipInit: true)), - ], - logical: const Size(1280, 860), - ); + for (final theme in const ['a', 'b', 'c']) { + testWidgets('login 整屏 · theme $theme', (tester) async { + await pumpGolden( + tester, + child: const LoginScreen(), + theme: theme, + goldenName: 'login_$theme', + overrides: [ + // 跳过联网首检，避免后台 Timer 在 golden 结束后仍 pending + connectivityProvider + .overrideWith((ref) => ConnectivityNotifier(skipInit: true)), + // 主题切换器选中态跟随当前主题（与原型 setTheme 同步高亮一致） + themeControllerProvider.overrideWith((ref) { + final c = ThemeController(); + c.set(theme); + return c; + }), + ], + logical: const Size(1280, 900), + ); + }); + } } diff --git a/client/test/golden/partners_golden_test.dart b/client/test/golden/partners_golden_test.dart index d563480..b1e9727 100644 --- a/client/test/golden/partners_golden_test.dart +++ b/client/test/golden/partners_golden_test.dart @@ -9,41 +9,106 @@ import 'package:jiu_client/providers/partner_provider.dart'; import 'package:jiu_client/screens/partners/partners_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：往来单位整屏 golden × 三主题（桌面 + 移动，回归闸）。 -/// 保真目检：shoot partners.html + montage 与 goldens/partners_*.png 并排。 +/// design-distill 阶段4：往来单位 golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell（与原型整页截图同构），行数据照抄原型 +/// screens/partners.html 的 PARTNERS（10 行），可与 proto 基准整屏 diff： +/// node tools/fidelity.mjs partners /// 更新基准：flutter test --update-goldens test/golden/partners_golden_test.dart -const _suppliers = [ +// 原型 PARTNERS 10 行（recv/pay 走 partnerBalancesProvider 假数据）。 +const _partners = [ Partner( - id: 1, code: 'GYS-001', name: '茅台华东总代', type: 'supplier', - contact: '张伟', phone: '138-0011-2233', address: '上海市黄浦区中山东路 8 号', - status: 'enabled'), + id: 1, + name: '茅台华东总代', + type: 'supplier', + contact: '张伟', + phone: '138-0011-2233', + address: '上海市青浦区华新镇酒类商城A12'), Partner( - id: 2, code: 'GYS-002', name: '老窖酒水批发', type: 'supplier', - contact: '李建国', phone: '139-2200-7788', address: '江苏省南京市建邺区江东中路', - status: 'enabled'), + id: 2, + name: '老李酒水批发', + type: 'supplier,customer', + contact: '李建国', + phone: '139-2200-7788', + address: '江苏省南京市江宁区秣陵街道'), Partner( - id: 3, code: 'GYS-003', name: '五粮液川南运营中心', type: 'supplier', - contact: '刘海涛', phone: '135-8899-0011', address: '四川省宜宾市翠屏区岷江路', - status: 'disabled'), + id: 3, + name: '鼎丰超市', + type: 'customer', + contact: '王芳', + phone: '137-6655-4321', + address: '浙江省杭州市拱墅区大关路88号'), + Partner( + id: 4, + name: '五粮液川南运营中心', + type: 'supplier', + contact: '刘德海', + phone: '135-8899-0011', + address: '四川省宜宾市翠屏区岷江路'), + Partner( + id: 5, + name: '金樽酒楼', + type: 'customer', + contact: '陈静', + phone: '136-2211-9900', + address: '江苏省苏州市姑苏区观前街'), + Partner( + id: 6, + name: '恒昌名酒行', + type: 'supplier,customer', + contact: '赵明', + phone: '138-7766-5544', + address: '安徽省合肥市蜀山区长江西路'), + Partner( + id: 7, + name: '汾酒山西直营', + type: 'supplier', + contact: '孙立', + phone: '134-5566-7788', + address: '山西省吕梁市汾阳市杏花村'), + Partner( + id: 8, + name: '喜宴婚庆服务', + type: 'customer', + contact: '周丽', + phone: '139-3344-5566', + address: '江苏省无锡市梁溪区中山路'), + Partner( + id: 9, + name: '郎酒华东仓储', + type: 'supplier', + contact: '吴强', + phone: '137-9900-1122', + address: '江苏省南京市六合区雄州街道'), + Partner( + id: 10, + name: '万家乐连锁便利', + type: 'customer', + contact: '郑涛', + phone: '135-1122-3344', + address: '浙江省宁波市海曙区中山东路'), ]; -const _customers = [ - Partner( - id: 11, code: 'KH-001', name: '鼎丰超市', type: 'customer', - contact: '王芳', phone: '137-6655-4321', address: '浙江省杭州市西湖区文三路', - status: 'enabled'), - Partner( - id: 12, code: 'KH-002', name: '金樽酒楼', type: 'customer', - contact: '陈静', phone: '136-2211-9900', address: '江苏省苏州市姑苏区干将路', - status: 'enabled'), -]; +// 原型 recv/pay 数值（id → (应收, 应付)） +const _balances = { + 1: (recv: 0, pay: 486200), + 2: (recv: 38400, pay: 152600), + 3: (recv: 126800, pay: 0), + 4: (recv: 0, pay: 298500), + 5: (recv: 54200, pay: 0), + 6: (recv: 72900, pay: 41000), + 7: (recv: 0, pay: 88400), + 8: (recv: 19600, pay: 0), + 9: (recv: 0, pay: 134700), + 10: (recv: 93500, pay: 0), +}; -class _FakeSupplierNotifier extends PartnerListNotifier { +class _FakePartnersNotifier extends PartnerListNotifier { @override - Future> build() async => const PageResult( - data: _suppliers, total: 3, page: 1, pageSize: 20); + Future> build() async => + const PageResult(data: _partners, total: 10, page: 1, pageSize: 1000); @override void setPage(int page) {} @override @@ -51,26 +116,14 @@ class _FakeSupplierNotifier extends PartnerListNotifier { @override void setKeyword(String keyword) {} @override - void reload() {} -} - -class _FakeCustomerNotifier extends PartnerListNotifier { - @override - Future> build() async => const PageResult( - data: _customers, total: 2, page: 1, pageSize: 20); - @override - void setPage(int page) {} - @override - void setPageSize(int pageSize) {} - @override - void setKeyword(String keyword) {} + void setType(String? t) {} @override void reload() {} } List _overrides() => [ - supplierListProvider.overrideWith(() => _FakeSupplierNotifier()), - customerListProvider.overrideWith(() => _FakeCustomerNotifier()), + partnersScreenProvider.overrideWith(() => _FakePartnersNotifier()), + partnerBalancesProvider.overrideWith((ref) async => _balances), isReadonlyProvider.overrideWithValue(false), ]; @@ -78,14 +131,17 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'partners 整屏(桌面)', + // 桌面：外壳挂载整框（顶栏+侧栏+状态栏+屏），与原型整页同构 + shellGoldenAcrossThemes( + 'partners 整框(桌面)', + path: '/partners', + screen: (_) => const PartnersScreen(), goldenPrefix: 'partners', - child: () => const Scaffold(body: PartnersScreen()), overrides: _overrides, logical: const Size(1280, 900), ); + // 移动：窄屏（<600）→ context.isMobile → MobileListCard 卡片流路径 goldenAcrossThemes( 'partners 整屏(移动)', goldenPrefix: 'partners_mobile', diff --git a/client/test/golden/product_detail_golden_test.dart b/client/test/golden/product_detail_golden_test.dart index ab257a7..8fba836 100644 --- a/client/test/golden/product_detail_golden_test.dart +++ b/client/test/golden/product_detail_golden_test.dart @@ -21,9 +21,15 @@ import '../support/golden_harness.dart'; class _FakeProductRepo implements ProductRepository { @override Future getDetail(int id) async => const Product( - id: 1, code: 'MT-FT-500', name: '茅台 飞天 53°', unit: '件', - series: '飞天', spec: '500ml×6', brand: '茅台', - purchasePrice: 2680, categoryName: '酱香'); + id: 1, + code: 'MT-FT-500', + name: '茅台 飞天 53°', + unit: '件', + series: '飞天', + spec: '500ml×6', + brand: '茅台', + purchasePrice: 2680, + categoryName: '酱香'); @override Future> getPriceHistory(int id) async => const [ @@ -33,8 +39,7 @@ class _FakeProductRepo implements ProductRepository { (date: '2025-11-15', price: 2580), ]; @override - dynamic noSuchMethod(Invocation invocation) => - super.noSuchMethod(invocation); + dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation); } class _FakeInvRepo implements InventoryRepository { @@ -43,6 +48,7 @@ class _FakeInvRepo implements InventoryRepository { int? warehouseId, int? productId, String? keyword, + String? code, List? series, List? spec, int page = 1, @@ -63,22 +69,33 @@ class _FakeInvRepo implements InventoryRepository { }) async => const PageResult(data: [ InventoryLog( - warehouseId: 1, productId: 1, direction: 'in', quantity: 24, + warehouseId: 1, + productId: 1, + direction: 'in', + quantity: 24, createdAt: '2026-06-20T09:00:00'), InventoryLog( - warehouseId: 1, productId: 1, direction: 'out', quantity: 12, + warehouseId: 1, + productId: 1, + direction: 'out', + quantity: 12, createdAt: '2026-06-18T09:00:00'), InventoryLog( - warehouseId: 2, productId: 1, direction: 'out', quantity: 18, + warehouseId: 2, + productId: 1, + direction: 'out', + quantity: 18, createdAt: '2026-06-15T09:00:00'), InventoryLog( - warehouseId: 1, productId: 1, direction: 'in', quantity: 36, + warehouseId: 1, + productId: 1, + direction: 'in', + quantity: 36, createdAt: '2026-06-12T09:00:00'), ], total: 4, page: 1, pageSize: 100); @override - dynamic noSuchMethod(Invocation invocation) => - super.noSuchMethod(invocation); + dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation); } List _overrides() => [ diff --git a/client/test/golden/products_archive_golden_test.dart b/client/test/golden/products_archive_golden_test.dart index dc7fcf0..c5468f3 100644 --- a/client/test/golden/products_archive_golden_test.dart +++ b/client/test/golden/products_archive_golden_test.dart @@ -9,27 +9,117 @@ import 'package:jiu_client/providers/product_provider.dart'; import 'package:jiu_client/screens/products/products_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：基础数据「商品档案」全量商品表 golden × 三主题。 -/// 锁住原型头牌 tab（商品 name+code / 系列 / 规格 / 分类 / 单位 / 默认成本价）。 +/// design-distill 阶段4：基础数据「商品档案」golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell，行数据照抄原型 screens/products.html 的 PRODUCTS（12 行， +/// 去掉分类/状态字段——香型弃用、无 status 后端，见 CONTRACT 已知差异）： +/// node tools/fidelity.mjs products /// 更新基准：flutter test --update-goldens test/golden/products_archive_golden_test.dart const _products = [ Product( - id: 1, code: 'MT-FT-500', name: '茅台 飞天 53°', unit: '件', - series: '飞天', spec: '500ml×6', categoryName: '酱香', purchasePrice: 2680), + id: 1, + code: 'MT-FT-500', + name: '茅台 飞天', + unit: '件', + series: '飞天', + spec: '500ml×6 · 53°', + purchasePrice: 2680), Product( - id: 2, code: 'WLY-PW-500', name: '五粮液 普五 52°', unit: '件', - series: '普五', spec: '500ml×6', categoryName: '浓香', purchasePrice: 1050), + id: 2, + code: 'MT-FT-100', + name: '茅台 飞天', + unit: '件', + series: '飞天', + spec: '100ml×24 · 53°', + purchasePrice: 620), Product( - id: 3, code: 'JNC-SJ-500', name: '剑南春 水晶剑', unit: '件', - series: '水晶剑', spec: '500ml×6', categoryName: '浓香', purchasePrice: 438), + id: 3, + code: 'WLY-PW-500', + name: '五粮液 普五', + unit: '件', + series: '第八代', + spec: '500ml×6 · 52°', + purchasePrice: 1050), + Product( + id: 4, + code: 'GJ-1573-500', + name: '国窖 1573', + unit: '件', + series: '经典装', + spec: '500ml×6 · 52°', + purchasePrice: 980), + Product( + id: 5, + code: 'JNC-SJ-500', + name: '剑南春 水晶剑', + unit: '件', + series: '水晶剑', + spec: '500ml×6 · 52°', + purchasePrice: 438), + Product( + id: 6, + code: 'YH-M6-500', + name: '洋河 梦之蓝', + unit: '件', + series: 'M6+', + spec: '550ml×6 · 45°', + purchasePrice: 620), + Product( + id: 7, + code: 'LZLJ-TQ-500', + name: '泸州老窖 特曲', + unit: '件', + series: '第十代', + spec: '500ml×6 · 52°', + purchasePrice: 320), + Product( + id: 8, + code: 'XJ-JC1988', + name: '习酒 窖藏', + unit: '件', + series: '1988', + spec: '500ml×6 · 53°', + purchasePrice: 760), + Product( + id: 9, + code: 'FJ-QH20-500', + name: '汾酒 青花', + unit: '件', + series: '青花20', + spec: '500ml×6 · 53°', + purchasePrice: 420), + Product( + id: 10, + code: 'LJ-HHL15', + name: '郎酒 红花郎', + unit: '件', + series: '红花郎15', + spec: '500ml×6 · 53°', + purchasePrice: 560), + Product( + id: 11, + code: 'XF-QJ-500', + name: '西凤酒 旗舰版', + unit: '件', + series: '旗舰', + spec: '500ml×6 · 52°', + purchasePrice: 280), + Product( + id: 12, + code: 'GJG-NF-500', + name: '古井贡 年份原浆', + unit: '件', + series: '古16', + spec: '500ml×6 · 50°', + purchasePrice: 390), ]; class _FakeProductList extends ProductListNotifier { @override Future> build() async => - const PageResult(data: _products, total: 3, page: 1, pageSize: 20); + const PageResult(data: _products, total: 12, page: 1, pageSize: 20); @override void setPage(int page) {} @override @@ -42,18 +132,31 @@ class _FakeProductList extends ProductListNotifier { void reload() {} } +List _overrides() => [ + productListProvider.overrideWith(() => _FakeProductList()), + isReadonlyProvider.overrideWithValue(false), + ]; + void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'products 商品档案 tab', + // 桌面：外壳挂载整框，与原型整页同构 + shellGoldenAcrossThemes( + 'products 商品档案 整框(桌面)', + path: '/products', + screen: (_) => const ProductsScreen(), goldenPrefix: 'products_archive', + overrides: _overrides, + logical: const Size(1280, 900), + ); + + // 移动：窄屏卡片流 + goldenAcrossThemes( + 'products 商品档案 整屏(移动)', + goldenPrefix: 'products_archive_mobile', child: () => const Scaffold(body: ProductsScreen()), - overrides: () => [ - productListProvider.overrideWith(() => _FakeProductList()), - isReadonlyProvider.overrideWithValue(false), - ], - logical: const Size(1280, 760), + overrides: _overrides, + logical: const Size(390, 1400), ); } diff --git a/client/test/golden/proto/about_a.png b/client/test/golden/proto/about_a.png new file mode 100644 index 0000000..7e656b0 Binary files /dev/null and b/client/test/golden/proto/about_a.png differ diff --git a/client/test/golden/proto/about_b.png b/client/test/golden/proto/about_b.png new file mode 100644 index 0000000..f3ae714 Binary files /dev/null and b/client/test/golden/proto/about_b.png differ diff --git a/client/test/golden/proto/about_c.png b/client/test/golden/proto/about_c.png new file mode 100644 index 0000000..e4ded53 Binary files /dev/null and b/client/test/golden/proto/about_c.png differ diff --git a/client/test/golden/proto/app_shell_a.png b/client/test/golden/proto/app_shell_a.png index 8ff8316..3ad7d4f 100644 Binary files a/client/test/golden/proto/app_shell_a.png and b/client/test/golden/proto/app_shell_a.png differ diff --git a/client/test/golden/proto/app_shell_b.png b/client/test/golden/proto/app_shell_b.png new file mode 100644 index 0000000..cc38858 Binary files /dev/null and b/client/test/golden/proto/app_shell_b.png differ diff --git a/client/test/golden/proto/app_shell_c.png b/client/test/golden/proto/app_shell_c.png new file mode 100644 index 0000000..935c1ef Binary files /dev/null and b/client/test/golden/proto/app_shell_c.png differ diff --git a/client/test/golden/proto/device_management_a.png b/client/test/golden/proto/device_management_a.png new file mode 100644 index 0000000..32beb60 Binary files /dev/null and b/client/test/golden/proto/device_management_a.png differ diff --git a/client/test/golden/proto/device_management_b.png b/client/test/golden/proto/device_management_b.png new file mode 100644 index 0000000..022f857 Binary files /dev/null and b/client/test/golden/proto/device_management_b.png differ diff --git a/client/test/golden/proto/device_management_c.png b/client/test/golden/proto/device_management_c.png new file mode 100644 index 0000000..39dc365 Binary files /dev/null and b/client/test/golden/proto/device_management_c.png differ diff --git a/client/test/golden/proto/finance_a.png b/client/test/golden/proto/finance_a.png new file mode 100644 index 0000000..6484803 Binary files /dev/null and b/client/test/golden/proto/finance_a.png differ diff --git a/client/test/golden/proto/finance_b.png b/client/test/golden/proto/finance_b.png new file mode 100644 index 0000000..ecd67d8 Binary files /dev/null and b/client/test/golden/proto/finance_b.png differ diff --git a/client/test/golden/proto/finance_c.png b/client/test/golden/proto/finance_c.png new file mode 100644 index 0000000..c82f93a Binary files /dev/null and b/client/test/golden/proto/finance_c.png differ diff --git a/client/test/golden/proto/inventory_list_a.png b/client/test/golden/proto/inventory_list_a.png index 6fda788..a366e09 100644 Binary files a/client/test/golden/proto/inventory_list_a.png and b/client/test/golden/proto/inventory_list_a.png differ diff --git a/client/test/golden/proto/inventory_list_b.png b/client/test/golden/proto/inventory_list_b.png new file mode 100644 index 0000000..96b5753 Binary files /dev/null and b/client/test/golden/proto/inventory_list_b.png differ diff --git a/client/test/golden/proto/inventory_list_c.png b/client/test/golden/proto/inventory_list_c.png new file mode 100644 index 0000000..dff4d32 Binary files /dev/null and b/client/test/golden/proto/inventory_list_c.png differ diff --git a/client/test/golden/proto/login_a.png b/client/test/golden/proto/login_a.png new file mode 100644 index 0000000..97aea02 Binary files /dev/null and b/client/test/golden/proto/login_a.png differ diff --git a/client/test/golden/proto/login_b.png b/client/test/golden/proto/login_b.png new file mode 100644 index 0000000..ba991b0 Binary files /dev/null and b/client/test/golden/proto/login_b.png differ diff --git a/client/test/golden/proto/login_c.png b/client/test/golden/proto/login_c.png new file mode 100644 index 0000000..9862fe9 Binary files /dev/null and b/client/test/golden/proto/login_c.png differ diff --git a/client/test/golden/proto/partners_a.png b/client/test/golden/proto/partners_a.png new file mode 100644 index 0000000..c8732f2 Binary files /dev/null and b/client/test/golden/proto/partners_a.png differ diff --git a/client/test/golden/proto/partners_b.png b/client/test/golden/proto/partners_b.png new file mode 100644 index 0000000..7670354 Binary files /dev/null and b/client/test/golden/proto/partners_b.png differ diff --git a/client/test/golden/proto/partners_c.png b/client/test/golden/proto/partners_c.png new file mode 100644 index 0000000..81cc482 Binary files /dev/null and b/client/test/golden/proto/partners_c.png differ diff --git a/client/test/golden/proto/products_archive_a.png b/client/test/golden/proto/products_archive_a.png new file mode 100644 index 0000000..93806a3 Binary files /dev/null and b/client/test/golden/proto/products_archive_a.png differ diff --git a/client/test/golden/proto/products_archive_b.png b/client/test/golden/proto/products_archive_b.png new file mode 100644 index 0000000..142379e Binary files /dev/null and b/client/test/golden/proto/products_archive_b.png differ diff --git a/client/test/golden/proto/products_archive_c.png b/client/test/golden/proto/products_archive_c.png new file mode 100644 index 0000000..ef311b3 Binary files /dev/null and b/client/test/golden/proto/products_archive_c.png differ diff --git a/client/test/golden/proto/register_a.png b/client/test/golden/proto/register_a.png new file mode 100644 index 0000000..8c17009 Binary files /dev/null and b/client/test/golden/proto/register_a.png differ diff --git a/client/test/golden/proto/register_b.png b/client/test/golden/proto/register_b.png new file mode 100644 index 0000000..da1a41a Binary files /dev/null and b/client/test/golden/proto/register_b.png differ diff --git a/client/test/golden/proto/register_c.png b/client/test/golden/proto/register_c.png new file mode 100644 index 0000000..9db3d63 Binary files /dev/null and b/client/test/golden/proto/register_c.png differ diff --git a/client/test/golden/proto/settings_a.png b/client/test/golden/proto/settings_a.png new file mode 100644 index 0000000..a9d387b Binary files /dev/null and b/client/test/golden/proto/settings_a.png differ diff --git a/client/test/golden/proto/settings_b.png b/client/test/golden/proto/settings_b.png new file mode 100644 index 0000000..4e48605 Binary files /dev/null and b/client/test/golden/proto/settings_b.png differ diff --git a/client/test/golden/proto/settings_c.png b/client/test/golden/proto/settings_c.png new file mode 100644 index 0000000..854a5a2 Binary files /dev/null and b/client/test/golden/proto/settings_c.png differ diff --git a/client/test/golden/proto/stock_in_list_a.png b/client/test/golden/proto/stock_in_list_a.png new file mode 100644 index 0000000..8751917 Binary files /dev/null and b/client/test/golden/proto/stock_in_list_a.png differ diff --git a/client/test/golden/proto/stock_in_list_b.png b/client/test/golden/proto/stock_in_list_b.png new file mode 100644 index 0000000..cd0658b Binary files /dev/null and b/client/test/golden/proto/stock_in_list_b.png differ diff --git a/client/test/golden/proto/stock_in_list_c.png b/client/test/golden/proto/stock_in_list_c.png new file mode 100644 index 0000000..1ad4dec Binary files /dev/null and b/client/test/golden/proto/stock_in_list_c.png differ diff --git a/client/test/golden/proto/stock_out_list_a.png b/client/test/golden/proto/stock_out_list_a.png new file mode 100644 index 0000000..bed6fe5 Binary files /dev/null and b/client/test/golden/proto/stock_out_list_a.png differ diff --git a/client/test/golden/proto/stock_out_list_b.png b/client/test/golden/proto/stock_out_list_b.png new file mode 100644 index 0000000..dfe80b9 Binary files /dev/null and b/client/test/golden/proto/stock_out_list_b.png differ diff --git a/client/test/golden/proto/stock_out_list_c.png b/client/test/golden/proto/stock_out_list_c.png new file mode 100644 index 0000000..49f79a9 Binary files /dev/null and b/client/test/golden/proto/stock_out_list_c.png differ diff --git a/client/test/golden/proto/users_a.png b/client/test/golden/proto/users_a.png new file mode 100644 index 0000000..65df995 Binary files /dev/null and b/client/test/golden/proto/users_a.png differ diff --git a/client/test/golden/proto/users_b.png b/client/test/golden/proto/users_b.png new file mode 100644 index 0000000..1f6986e Binary files /dev/null and b/client/test/golden/proto/users_b.png differ diff --git a/client/test/golden/proto/users_c.png b/client/test/golden/proto/users_c.png new file mode 100644 index 0000000..24a8bde Binary files /dev/null and b/client/test/golden/proto/users_c.png differ diff --git a/client/test/golden/register_golden_test.dart b/client/test/golden/register_golden_test.dart index b3fdddd..9a85f6f 100644 --- a/client/test/golden/register_golden_test.dart +++ b/client/test/golden/register_golden_test.dart @@ -1,20 +1,34 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:jiu_client/core/theme/theme_controller.dart'; import 'package:jiu_client/screens/auth/register_screen.dart'; import '../support/golden_harness.dart'; -/// design-distill 阶段4：应用内注册新门店 golden × 三主题（品牌面板 + 表单）。 +/// design-distill 阶段4：注册新门店 golden × 三主题（照原型 register.html 重建： +/// 品牌面板三步时间线 + grid2 表单）。1280×900 与 fidelity 注册一致。 /// 更新基准：flutter test --update-goldens test/golden/register_golden_test.dart void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'register 注册新门店', - goldenPrefix: 'register', - child: () => const RegisterScreen(), - logical: const Size(1100, 760), - ); + for (final theme in const ['a', 'b', 'c']) { + testWidgets('register 注册新门店 · theme $theme', (tester) async { + await pumpGolden( + tester, + child: const RegisterScreen(), + theme: theme, + goldenName: 'register_$theme', + overrides: [ + themeControllerProvider.overrideWith((ref) { + final c = ThemeController(); + c.set(theme); + return c; + }), + ], + logical: const Size(1280, 900), + ); + }); + } } diff --git a/client/test/golden/settings_golden_test.dart b/client/test/golden/settings_golden_test.dart index 3c510b4..d03b51b 100644 --- a/client/test/golden/settings_golden_test.dart +++ b/client/test/golden/settings_golden_test.dart @@ -3,23 +3,54 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/models/shop.dart'; +import 'package:jiu_client/providers/shop_provider.dart'; import 'package:jiu_client/screens/settings/settings_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; -/// design-distill 阶段4：系统设置「系统参数」Tab golden × 三主题。 -/// 验证外观主题选择器（三色板微缩预览）+ 参数卡随主题换色。 -/// （该 Tab 走本地 state，无需 mock 业务 provider。） +/// design-distill 阶段4：系统设置 golden × 三主题（回归闸 + 保真基准）。 +/// 桌面版挂进真 AppShell，默认「门店信息」面板，门店数据照抄原型 +/// screens/settings.html（鼎晟酒行 / DSJH-001 / 拱墅区运河路…）： +/// node tools/fidelity.mjs settings /// 更新基准：flutter test --update-goldens test/golden/settings_golden_test.dart + +const _shop = ShopInfo( + id: 1, + code: 'DSJH-001', + name: '鼎晟酒行', + address: '浙江省杭州市拱墅区运河路 168 号 1 幢', + phone: '0571-8888 6666', + managerName: '王经理', + wechatId: 'dingsheng-wine', +); + +List _overrides() => [ + shopInfoProvider.overrideWith((ref) => _shop), + isReadonlyProvider.overrideWithValue(false), + ]; + void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); + // 桌面：外壳挂载整框（默认门店信息面板） + shellGoldenAcrossThemes( + 'settings 门店信息 整框(桌面)', + path: '/settings', + screen: (_) => const SettingsScreen(), + goldenPrefix: 'settings', + overrides: _overrides, + logical: const Size(1280, 900), + ); + + // 移动：seg 横滚 + 单列面板 goldenAcrossThemes( - 'settings 系统参数 Tab', - goldenPrefix: 'settings_params', - child: () => const Scaffold(body: SettingsScreen(initialTab: 3)), - overrides: () => [isReadonlyProvider.overrideWithValue(false)], - logical: const Size(1280, 1000), + 'settings 门店信息 整屏(移动)', + goldenPrefix: 'settings_mobile', + child: () => const Scaffold(body: SettingsScreen()), + overrides: _overrides, + logical: const Size(390, 1200), ); } diff --git a/client/test/golden/stock_in_form_golden_test.dart b/client/test/golden/stock_in_form_golden_test.dart index 093f1f7..3af73a0 100644 --- a/client/test/golden/stock_in_form_golden_test.dart +++ b/client/test/golden/stock_in_form_golden_test.dart @@ -59,7 +59,7 @@ class _FakeSpecs extends ProductSpecListNotifier { List _overrides() => [ warehouseListProvider.overrideWith(() => _FakeWarehouses()), - supplierListProvider.overrideWith(() => _FakeSuppliers()), + allPartnersProvider.overrideWith(() => _FakeSuppliers()), productNameListProvider.overrideWith(() => _FakeNames()), productSeriesListProvider.overrideWith(() => _FakeSeries()), productSpecListProvider.overrideWith(() => _FakeSpecs()), diff --git a/client/test/golden/stock_in_list_golden_test.dart b/client/test/golden/stock_in_list_golden_test.dart index 8c5f952..6ffe5bf 100644 --- a/client/test/golden/stock_in_list_golden_test.dart +++ b/client/test/golden/stock_in_list_golden_test.dart @@ -9,6 +9,7 @@ import 'package:jiu_client/providers/stock_in_provider.dart'; import 'package:jiu_client/screens/stock_in/stock_in_list_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; /// design-distill 阶段4：入库列表整屏 golden × 三主题（桌面 + 移动）。 /// 重点验证 StatusBadge → StatusPill（草稿/待审核/已审核/已拒绝）随主题换色。 @@ -16,21 +17,47 @@ import '../support/golden_harness.dart'; const _orders = [ StockInOrder( - id: 1, orderNo: 'RK-20260620-014', warehouseId: 1, warehouseName: '主仓', - partnerName: '贵州茅台经销', operatorName: '王经理', reviewerName: '张管理', - status: 'approved', orderDate: '2026-06-20', totalAmount: 34320), + id: 1, + orderNo: 'RK-20260620-014', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '贵州茅台经销', + operatorName: '王经理', + reviewerName: '张管理', + status: 'approved', + orderDate: '2026-06-20', + totalAmount: 34320), StockInOrder( - id: 2, orderNo: 'RK-20260618-009', warehouseId: 1, warehouseName: '主仓', - partnerName: '宜宾五粮液', operatorName: '李销售', - status: 'pending', orderDate: '2026-06-18', totalAmount: 6700), + id: 2, + orderNo: 'RK-20260618-009', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '宜宾五粮液', + operatorName: '李销售', + status: 'pending', + orderDate: '2026-06-18', + totalAmount: 6700), StockInOrder( - id: 3, orderNo: 'RK-20260615-003', warehouseId: 1, warehouseName: '二号仓', - partnerName: '泸州老窖', operatorName: '王经理', - status: 'draft', orderDate: '2026-06-15', totalAmount: 5000), + id: 3, + orderNo: 'RK-20260615-003', + warehouseId: 1, + warehouseName: '二号仓', + partnerName: '泸州老窖', + operatorName: '王经理', + status: 'draft', + orderDate: '2026-06-15', + totalAmount: 5000), StockInOrder( - id: 4, orderNo: 'RK-20260612-001', warehouseId: 1, warehouseName: '主仓', - partnerName: '绵竹剑南春', operatorName: '李销售', reviewerName: '张管理', - status: 'rejected', orderDate: '2026-06-12', totalAmount: 3500), + id: 4, + orderNo: 'RK-20260612-001', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '绵竹剑南春', + operatorName: '李销售', + reviewerName: '张管理', + status: 'rejected', + orderDate: '2026-06-12', + totalAmount: 3500), ]; class _FakeStockInNotifier extends StockInListNotifier { @@ -60,10 +87,12 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'stock-in list 整屏(桌面)', + // 桌面：外壳挂载整框（与原型整页同构，供 fidelity 对比） + shellGoldenAcrossThemes( + 'stock-in list 整框(桌面)', + path: '/stock-in', + screen: (_) => const StockInListScreen(), goldenPrefix: 'stock_in_list', - child: () => const Scaffold(body: StockInListScreen()), overrides: _overrides, logical: const Size(1280, 900), ); diff --git a/client/test/golden/stock_out_form_golden_test.dart b/client/test/golden/stock_out_form_golden_test.dart index a826d41..12e199a 100644 --- a/client/test/golden/stock_out_form_golden_test.dart +++ b/client/test/golden/stock_out_form_golden_test.dart @@ -42,7 +42,7 @@ class _FakeCustomers extends PartnerListNotifier { List _overrides() => [ warehouseListProvider.overrideWith(() => _FakeWarehouses()), - customerListProvider.overrideWith(() => _FakeCustomers()), + allPartnersProvider.overrideWith(() => _FakeCustomers()), isReadonlyProvider.overrideWithValue(false), ]; diff --git a/client/test/golden/stock_out_list_golden_test.dart b/client/test/golden/stock_out_list_golden_test.dart index 8536a59..25491dd 100644 --- a/client/test/golden/stock_out_list_golden_test.dart +++ b/client/test/golden/stock_out_list_golden_test.dart @@ -9,6 +9,7 @@ import 'package:jiu_client/providers/stock_out_provider.dart'; import 'package:jiu_client/screens/stock_out/stock_out_list_screen.dart'; import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; /// design-distill 阶段4：出库列表整屏 golden × 三主题（桌面 + 移动）。 /// 复用共享 StatusBadge → StatusPill（草稿/待审核/已审核/已拒绝）。 @@ -16,21 +17,47 @@ import '../support/golden_harness.dart'; const _orders = [ StockOutOrder( - id: 1, orderNo: 'CK-20260620-031', warehouseId: 1, warehouseName: '主仓', - partnerName: '鼎丰超市', operatorName: '李销售', reviewerName: '张管理', - status: 'approved', orderDate: '2026-06-20', totalAmount: 12800), + id: 1, + orderNo: 'CK-20260620-031', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '鼎丰超市', + operatorName: '李销售', + reviewerName: '张管理', + status: 'approved', + orderDate: '2026-06-20', + totalAmount: 12800), StockOutOrder( - id: 2, orderNo: 'CK-20260618-022', warehouseId: 1, warehouseName: '主仓', - partnerName: '金樽酒楼', operatorName: '张前台', - status: 'pending', orderDate: '2026-06-18', totalAmount: 5400), + id: 2, + orderNo: 'CK-20260618-022', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '金樽酒楼', + operatorName: '张前台', + status: 'pending', + orderDate: '2026-06-18', + totalAmount: 5400), StockOutOrder( - id: 3, orderNo: 'CK-20260615-017', warehouseId: 1, warehouseName: '二号仓', - partnerName: '恒昌名酒行', operatorName: '李销售', - status: 'draft', orderDate: '2026-06-15', totalAmount: 3200), + id: 3, + orderNo: 'CK-20260615-017', + warehouseId: 1, + warehouseName: '二号仓', + partnerName: '恒昌名酒行', + operatorName: '李销售', + status: 'draft', + orderDate: '2026-06-15', + totalAmount: 3200), StockOutOrder( - id: 4, orderNo: 'CK-20260612-009', warehouseId: 1, warehouseName: '主仓', - partnerName: '喜宴婚庆服务', operatorName: '张前台', reviewerName: '张管理', - status: 'rejected', orderDate: '2026-06-12', totalAmount: 1960), + id: 4, + orderNo: 'CK-20260612-009', + warehouseId: 1, + warehouseName: '主仓', + partnerName: '喜宴婚庆服务', + operatorName: '张前台', + reviewerName: '张管理', + status: 'rejected', + orderDate: '2026-06-12', + totalAmount: 1960), ]; class _FakeStockOutNotifier extends StockOutListNotifier { @@ -62,10 +89,12 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); SharedPreferences.setMockInitialValues({}); - goldenAcrossThemes( - 'stock-out list 整屏(桌面)', + // 桌面：外壳挂载整框（与原型整页同构，供 fidelity 对比） + shellGoldenAcrossThemes( + 'stock-out list 整框(桌面)', + path: '/stock-out', + screen: (_) => const StockOutListScreen(), goldenPrefix: 'stock_out_list', - child: () => const Scaffold(body: StockOutListScreen()), overrides: _overrides, logical: const Size(1280, 900), ); diff --git a/client/test/golden/users_golden_test.dart b/client/test/golden/users_golden_test.dart new file mode 100644 index 0000000..56652d1 --- /dev/null +++ b/client/test/golden/users_golden_test.dart @@ -0,0 +1,95 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/core/utils/clock.dart'; +import 'package:jiu_client/models/user.dart'; +import 'package:jiu_client/providers/user_provider.dart'; +import 'package:jiu_client/screens/settings/users_screen.dart'; + +import '../support/golden_harness.dart'; +import '../support/shell_harness.dart'; + +/// design-distill 阶段4：用户管理独立页 golden × 三主题（回归闸 + 保真基准）。 +/// 数据照抄原型 screens/users.html 的 USERS（5 人，四级角色）， +/// 相对时间（今天/昨天）用可注入时钟 appClock 冻结在 2026-07-13 09:30： +/// node tools/fidelity.mjs users +/// 更新基准：flutter test --update-goldens test/golden/users_golden_test.dart + +// 原型 USERS 5 行；最近登录 今天09:12 / 今天08:50 / 昨天18:40 / 06-19 / 06-10 +const _users = [ + AppUser( + id: 1, + username: 'wang', + realName: '王经理', + role: 'superadmin', + isActive: true, + lastLoginAt: '2026-07-13T09:12:00'), + AppUser( + id: 2, + username: 'zhang', + realName: '张主管', + role: 'admin', + isActive: true, + lastLoginAt: '2026-07-13T08:50:00'), + AppUser( + id: 3, + username: 'li', + realName: '李采购', + role: 'operator', + isActive: true, + lastLoginAt: '2026-07-12T18:40:00'), + AppUser( + id: 4, + username: 'zhao', + realName: '赵会计', + role: 'readonly', + isActive: true, + lastLoginAt: '2026-06-19T10:05:00'), + AppUser( + id: 5, + username: 'qian', + realName: '钱仓管', + role: 'operator', + isActive: false, + lastLoginAt: '2026-06-10T14:22:00'), +]; + +class _FakeUserList extends UserListNotifier { + @override + Future> build() async => _users; + @override + Future reload() async {} +} + +List _overrides() => [ + userListProvider.overrideWith(() => _FakeUserList()), + isReadonlyProvider.overrideWithValue(false), + ]; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + SharedPreferences.setMockInitialValues({}); + // 冻结相对日期基准（与外壳状态栏同一时刻） + appClock = () => DateTime(2026, 7, 13, 9, 30, 15); + + // 桌面：外壳挂载（users 页在原型中同样高亮「系统设置」导航 → 挂 /settings 分支） + shellGoldenAcrossThemes( + 'users 整框(桌面)', + path: '/settings', + screen: (_) => const UsersScreen(), + goldenPrefix: 'users', + overrides: _overrides, + logical: const Size(1280, 900), + ); + + // 移动：窄屏卡片流 + goldenAcrossThemes( + 'users 整屏(移动)', + goldenPrefix: 'users_mobile', + child: () => const Scaffold(body: UsersScreen()), + overrides: _overrides, + logical: const Size(390, 1400), + ); +} diff --git a/client/test/grid_combo_cell_pick_test.dart b/client/test/grid_combo_cell_pick_test.dart new file mode 100644 index 0000000..b0305dc --- /dev/null +++ b/client/test/grid_combo_cell_pick_test.dart @@ -0,0 +1,63 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:jiu_client/core/theme/themes.dart'; +import 'package:jiu_client/widgets/ds/grid_combo_cell.dart'; +import 'package:jiu_client/widgets/searchable_option_field.dart' + show OptionItem; + +void main() { + testWidgets('popupSearch grid combo: tapping a row fills selection', + (tester) async { + int? picked; + int selectedId = 0; + final fn = FocusNode(); + final opts = [ + OptionItem(id: 1, name: '茅台飞天'), + OptionItem(id: 2, name: '五粮液'), + ]; + + await tester.pumpWidget(MaterialApp( + theme: buildTheme('a'), + home: Scaffold( + body: StatefulBuilder(builder: (context, setState) { + return Center( + child: SizedBox( + width: 240, + child: GridComboCell( + focusNode: fn, + cell: true, + popupSearch: true, + hint: '选择商品名称', + options: opts, + selectedId: selectedId == 0 ? null : selectedId, + onChanged: (v) => setState(() { + picked = v; + selectedId = v ?? 0; + }), + ), + ), + ); + }), + ), + )); + + fn.requestFocus(); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 50)); + + expect(find.text('五粮液'), findsOneWidget); + + // Realistic pointer: down, drain microtasks/frames (focus-loss handlers run + // here), THEN up — mirrors real input where the search field defocuses on + // pointer-down before the row's onTap fires on pointer-up. + final g = await tester.startGesture(tester.getCenter(find.text('五粮液'))); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 50)); + await g.up(); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 50)); + + expect(picked, 2, + reason: 'onChanged should fire with id=2 after tapping row'); + }); +} diff --git a/client/test/license_copy_test.dart b/client/test/license_copy_test.dart index 2f74dde..90c0ffb 100644 --- a/client/test/license_copy_test.dart +++ b/client/test/license_copy_test.dart @@ -9,14 +9,16 @@ LicenseInfo _lic(String phase, {int expiredDays = 0, bool permanent = false}) => isActive: true, maxDevices: 3, phase: phase, - expiresAt: - permanent ? null : DateTime.now().subtract(Duration(days: expiredDays)), + expiresAt: permanent + ? null + : DateTime.now().subtract(Duration(days: expiredDays)), ); void main() { group('writeBlockedToast', () { test('readonly 阶段文案含过期天数并引导续费', () { - final s = LicenseCopy.writeBlockedToast(_lic('readonly', expiredDays: 10)); + final s = + LicenseCopy.writeBlockedToast(_lic('readonly', expiredDays: 10)); expect(s, contains('10')); expect(s, contains('只读')); expect(s, contains('设置 → 授权')); diff --git a/client/test/login_flow_test.dart b/client/test/login_flow_test.dart index cf15d3f..237d385 100644 --- a/client/test/login_flow_test.dart +++ b/client/test/login_flow_test.dart @@ -7,6 +7,7 @@ import 'package:jiu_client/core/theme/themes.dart'; import 'package:jiu_client/providers/connectivity_provider.dart'; import 'package:jiu_client/repositories/auth_repository.dart'; import 'package:jiu_client/screens/auth/login_screen.dart'; +import 'package:jiu_client/widgets/ds/ds_atoms.dart'; import 'package:shared_preferences/shared_preferences.dart'; Widget _buildApp() { @@ -70,20 +71,12 @@ void main() { await tester.pumpWidget(_buildApp()); await tester.pumpAndSettle(); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入门店编号'), - 'S001', - ); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入用户名'), - 'admin', - ); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入密码'), - 'password123', - ); + // 重建后为三个盒式 DsInput（TextField），顺序：门店编号 / 登录账号 / 密码 + await tester.enterText(find.byType(TextField).at(0), 'S001'); + await tester.enterText(find.byType(TextField).at(1), 'admin'); + await tester.enterText(find.byType(TextField).at(2), 'password123'); - await tester.tap(find.text('登 录')); + await tester.tap(find.widgetWithText(DsButton, '登录')); await tester.pump(); await tester.pumpAndSettle(); diff --git a/client/test/login_screen_test.dart b/client/test/login_screen_test.dart index d4ae452..ffd9e48 100644 --- a/client/test/login_screen_test.dart +++ b/client/test/login_screen_test.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -5,6 +6,7 @@ import 'package:go_router/go_router.dart'; import 'package:jiu_client/core/theme/themes.dart'; import 'package:jiu_client/providers/connectivity_provider.dart'; import 'package:jiu_client/screens/auth/login_screen.dart'; +import 'package:jiu_client/widgets/ds/ds_atoms.dart'; import 'package:shared_preferences/shared_preferences.dart'; /// Wrap the screen in the minimum required providers. @@ -42,100 +44,118 @@ void main() { group('LoginScreen UI', () { testWidgets('renders all three input fields and login button', (tester) async { - tester.view.physicalSize = const Size(1280, 800); + tester.view.physicalSize = const Size(1280, 900); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); await tester.pumpWidget(_buildTestApp()); await tester.pump(); - expect(find.byType(TextFormField), findsNWidgets(3)); + // 三个盒式输入（DsInput 内部为 TextField） + expect(find.byType(TextField), findsNWidgets(3)); expect(find.text('门店编号'), findsOneWidget); - expect(find.text('用户名'), findsOneWidget); + expect(find.text('登录账号'), findsOneWidget); expect(find.text('密码'), findsOneWidget); - expect(find.text('登 录'), findsOneWidget); + expect(find.widgetWithText(DsButton, '登录'), findsOneWidget); + expect(find.text('记住我'), findsOneWidget); }); - testWidgets('shows validation errors when submitting empty form', + testWidgets('empty submit shows toast for first missing field', (tester) async { - // Use a desktop-sized surface to avoid overflow - tester.view.physicalSize = const Size(1280, 800); + tester.view.physicalSize = const Size(1280, 900); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); await tester.pumpWidget(_buildTestApp()); await tester.pump(); - await tester.tap(find.text('登 录')); + await tester.tap(find.widgetWithText(DsButton, '登录')); await tester.pump(); - // Hint text and validator error share the same string, so both appear - expect(find.text('请输入门店编号'), findsAtLeastNWidgets(1)); - expect(find.text('请输入用户名'), findsAtLeastNWidgets(1)); - expect(find.text('请输入密码'), findsAtLeastNWidgets(1)); + // 原型式校验：toast 提示第一个缺失字段（无内联错误文案） + expect(find.text('请输入门店编号'), findsOneWidget); + // 等 toast 自动消散，避免 pending timer + await tester.pump(const Duration(milliseconds: 2300)); }); testWidgets('password toggle changes obscure state', (tester) async { - tester.view.physicalSize = const Size(1280, 800); + tester.view.physicalSize = const Size(1280, 900); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); await tester.pumpWidget(_buildTestApp()); await tester.pump(); - // Initially password is obscured — visibility_off icon shown - expect(find.byIcon(Icons.visibility_off), findsOneWidget); + // Initially password is obscured — eye-off icon shown + expect(find.byIcon(LucideIcons.eyeOff), findsOneWidget); - await tester.tap(find.byIcon(Icons.visibility_off)); + await tester.tap(find.byIcon(LucideIcons.eyeOff)); await tester.pump(); - // After tap — visibility icon shown - expect(find.byIcon(Icons.visibility), findsOneWidget); + // After tap — eye icon shown + expect(find.byIcon(LucideIcons.eye), findsOneWidget); }); - testWidgets('button is present and tappable with filled form', (tester) async { - tester.view.physicalSize = const Size(1280, 800); + testWidgets('button is present and tappable with filled form', + (tester) async { + tester.view.physicalSize = const Size(1280, 900); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); await tester.pumpWidget(_buildTestApp()); await tester.pump(); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入门店编号'), 'H001'); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入用户名'), 'admin'); - await tester.enterText( - find.widgetWithText(TextFormField, '请输入密码'), 'password123'); + await tester.enterText(find.byType(TextField).at(0), 'H001'); + await tester.enterText(find.byType(TextField).at(1), 'admin'); + await tester.enterText(find.byType(TextField).at(2), 'password123'); // Button exists and is enabled - final btn = tester.widget(find.byType(ElevatedButton)); + final btn = tester.widget(find.widgetWithText(DsButton, '登录')); expect(btn.onPressed, isNotNull); }); + testWidgets('remember-me prefills most recent shop code', (tester) async { + SharedPreferences.setMockInitialValues({ + 'login_history_hotels': ['S001', 'H001'], + 'login_history_usernames': ['wang'], + }); + + tester.view.physicalSize = const Size(1280, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + await tester.pumpWidget(_buildTestApp()); + await tester.pumpAndSettle(); + + // 记住我默认开 → 预填最近一次的门店编号/账号 + final shopField = tester.widget(find.byType(TextField).at(0)); + expect(shopField.controller!.text, 'S001'); + final userField = tester.widget(find.byType(TextField).at(1)); + expect(userField.controller!.text, 'wang'); + }); + testWidgets('selecting history item fills shop code input', (tester) async { SharedPreferences.setMockInitialValues({ 'login_history_hotels': ['S001', 'H001'], }); - tester.view.physicalSize = const Size(1280, 800); + tester.view.physicalSize = const Size(1280, 900); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); await tester.pumpWidget(_buildTestApp()); await tester.pumpAndSettle(); - await tester.tap(find.widgetWithText(TextFormField, '请输入门店编号')); + // 聚焦门店编号输入框 → 历史下拉出现 + await tester.tap(find.byType(TextField).at(0)); await tester.pumpAndSettle(); - expect(find.text('S001'), findsOneWidget); - await tester.tap(find.text('S001').last); + expect(find.text('H001'), findsOneWidget); + await tester.tap(find.text('H001')); await tester.pumpAndSettle(); - final field = tester.widget( - find.byType(TextFormField).first, - ); - expect(field.controller!.text, 'S001'); + final field = tester.widget(find.byType(TextField).at(0)); + expect(field.controller!.text, 'H001'); }); }); } diff --git a/client/test/partner_repository_test.dart b/client/test/partner_repository_test.dart index fdb6a17..b5c8f0b 100644 --- a/client/test/partner_repository_test.dart +++ b/client/test/partner_repository_test.dart @@ -111,7 +111,8 @@ void main() { expect(result.data, isEmpty); }); - test('400 response throws AppException with server error message', () async { + test('400 response throws AppException with server error message', + () async { adapter.onGet( '/partners', (server) => server.reply(400, {'error': 'invalid type'}), diff --git a/client/test/partners_screen_test.dart b/client/test/partners_screen_test.dart index 57dd382..7e96a86 100644 --- a/client/test/partners_screen_test.dart +++ b/client/test/partners_screen_test.dart @@ -5,14 +5,14 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:jiu_client/core/models/page_result.dart'; import 'package:jiu_client/core/theme/themes.dart'; -import 'package:jiu_client/models/license.dart'; import 'package:jiu_client/models/partner.dart'; import 'package:jiu_client/providers/license_provider.dart'; import 'package:jiu_client/providers/partner_provider.dart'; import 'package:jiu_client/screens/partners/partners_screen.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; -/// WriteGuard 内层会 watch licenseProvider；测试里覆写成同步返回 normal 授权， -/// 避免触发真实网络请求（否则留下 pending timer 导致测试失败）。 +/// 往来单位屏（Phase2 重建版：单表 + 类型 chips + 应收应付 + 详情抽屉 + frow 弹窗）。 +/// WriteGuard 内层会 watch licenseProvider；覆写成同步返回 normal 授权，避免真实网络请求。 class _FakeLicenseNotifier extends LicenseNotifier { @override Future build() async => const LicenseInfo( @@ -24,14 +24,10 @@ class _FakeLicenseNotifier extends LicenseNotifier { ); } -// --------------------------------------------------------------------------- -// Fake notifier -// --------------------------------------------------------------------------- - class _FakePartnerNotifier extends PartnerListNotifier { final AsyncValue> _fixed; - _FakePartnerNotifier(String type, this._fixed) : super(type: type); + _FakePartnerNotifier(this._fixed); @override Future> build() async { @@ -42,69 +38,52 @@ class _FakePartnerNotifier extends PartnerListNotifier { @override void reload() {} - @override void setKeyword(String keyword) {} - + @override + void setType(String? t) {} @override void setPage(int page) {} - @override Future createPartner(Map data) async {} - @override Future updatePartner(int id, Map data) async {} - @override Future deletePartner(int id) async {} } -/// A notifier that stays permanently in loading state (build never completes). +/// 永久 loading（build 永不完成）。 class _FakeLoadingPartnerNotifier extends PartnerListNotifier { - _FakeLoadingPartnerNotifier(String type) : super(type: type); - @override - Future> build() { - // Never completes — keeps the widget in CircularProgressIndicator state. - return Completer>().future; - } + Future> build() => + Completer>().future; @override void reload() {} - @override void setKeyword(String keyword) {} - + @override + void setType(String? t) {} @override void setPage(int page) {} - - @override - Future createPartner(Map data) async {} - - @override - Future updatePartner(int id, Map data) async {} - - @override - Future deletePartner(int id) async {} } Widget _buildApp({ - AsyncValue> supplierState = - const AsyncValue.data(PageResult(data: [], total: 0, page: 1, pageSize: 20)), - AsyncValue> customerState = - const AsyncValue.data(PageResult(data: [], total: 0, page: 1, pageSize: 20)), + AsyncValue> state = const AsyncValue.data( + PageResult(data: [], total: 0, page: 1, pageSize: 1000)), }) { return ProviderScope( overrides: [ licenseProvider.overrideWith(() => _FakeLicenseNotifier()), - supplierListProvider.overrideWith( - () => _FakePartnerNotifier('supplier', supplierState), - ), - customerListProvider.overrideWith( - () => _FakePartnerNotifier('customer', customerState), - ), + partnersScreenProvider.overrideWith(() => _FakePartnerNotifier(state)), + partnerBalancesProvider.overrideWith((ref) async => { + 1: (recv: 126800.0, pay: 0.0), + }), + // 抽屉「近期单据」：测试环境不发真实请求 + partnerRecentDocsProvider.overrideWith((ref, id) async => const []), ], - child: MaterialApp(theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), + child: MaterialApp( + theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), ); } @@ -112,242 +91,130 @@ Widget _buildLoadingApp() { return ProviderScope( overrides: [ licenseProvider.overrideWith(() => _FakeLicenseNotifier()), - supplierListProvider.overrideWith( - () => _FakeLoadingPartnerNotifier('supplier'), - ), - customerListProvider.overrideWith( - () => _FakeLoadingPartnerNotifier('customer'), - ), + partnersScreenProvider.overrideWith(() => _FakeLoadingPartnerNotifier()), + partnerBalancesProvider.overrideWith((ref) async => {}), ], - child: MaterialApp(theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), + child: MaterialApp( + theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), ); } -// --------------------------------------------------------------------------- -// Tests -// --------------------------------------------------------------------------- -void main() { - group('PartnersScreen - Supplier tab', () { - testWidgets('shows CircularProgressIndicator while loading', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); +const _partners = [ + Partner( + id: 1, + code: 'S001', + name: '张家酒水供应商', + type: 'supplier', + contact: '张三', + phone: '13800138000', + address: '北京市朝阳区', + ), +]; +void main() { + void desktop(WidgetTester tester) { + tester.view.physicalSize = const Size(1280, 800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + } + + group('PartnersScreen', () { + testWidgets('loading 态显示 CircularProgressIndicator', (tester) async { + desktop(tester); await tester.pumpWidget(_buildLoadingApp()); await tester.pump(); - expect(find.byType(CircularProgressIndicator), findsOneWidget); }); - testWidgets('shows error message on failure', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - + testWidgets('错误态显示提示与重试', (tester) async { + desktop(tester); await tester.pumpWidget( - _buildApp( - supplierState: AsyncValue.error('网络错误', StackTrace.empty), - ), - ); + _buildApp(state: AsyncValue.error('网络错误', StackTrace.empty))); await tester.pump(); - expect(find.text('暂无数据，网络不可用'), findsOneWidget); expect(find.text('重试'), findsOneWidget); }); - testWidgets('shows 暂无供应商 when supplier list is empty', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - + testWidgets('空列表显示原型空态文案', (tester) async { + desktop(tester); await tester.pumpWidget(_buildApp()); await tester.pump(); - - expect(find.text('暂无供应商'), findsOneWidget); + expect(find.text('没有匹配的往来单位 · 试试调整筛选或搜索'), findsOneWidget); }); - testWidgets('shows supplier list with name and contact', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - const partners = [ - Partner( - id: 1, - code: 'S001', - name: '张家酒水供应商', - type: 'supplier', - contact: '张三', - phone: '13800138000', - ), - ]; - + testWidgets('列表显示 名称/联系人/电话/类型徽章/应收应付', (tester) async { + desktop(tester); await tester.pumpWidget(_buildApp( - supplierState: AsyncValue.data( - const PageResult(data: partners, total: 1, page: 1, pageSize: 20), - ), + state: const AsyncValue.data( + PageResult(data: _partners, total: 1, page: 1, pageSize: 1000)), )); - await tester.pump(); - + await tester.pumpAndSettle(); expect(find.text('张家酒水供应商'), findsOneWidget); expect(find.text('张三'), findsOneWidget); + expect(find.text('13800138000'), findsOneWidget); + expect(find.text('供应商'), findsWidgets); // chips + 徽章 + expect(find.text('¥126,800'), findsOneWidget); // 应收（balances 假数据） }); - testWidgets('shows 新建 button in toolbar', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); + testWidgets('类型 chips 与重置在 toolbar 中', (tester) async { + desktop(tester); + await tester.pumpWidget(_buildApp()); + await tester.pump(); + expect(find.text('全部'), findsOneWidget); + expect(find.text('供应商'), findsOneWidget); + expect(find.text('客户'), findsOneWidget); + expect(find.text('重置'), findsOneWidget); + }); + testWidgets('点「新增往来单位」打开 frow 弹窗，空名保存校验', (tester) async { + desktop(tester); await tester.pumpWidget(_buildApp()); await tester.pump(); - expect(find.text('新建'), findsOneWidget); - }); - - testWidgets('tapping 新建 opens 新建供应商 dialog', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - await tester.pumpWidget(_buildApp()); - await tester.pump(); - - await tester.tap(find.text('新建')); - await tester.pumpAndSettle(); - - expect(find.text('新建供应商'), findsOneWidget); - expect(find.text('供应商名称'), findsAtLeastNWidgets(1)); - }); - - testWidgets('supplier form shows 不能为空 when saving with empty name', - (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - await tester.pumpWidget(_buildApp()); - await tester.pump(); - - await tester.tap(find.text('新建')); + await tester.tap(find.text('新增往来单位').first); await tester.pumpAndSettle(); + // DsField：label 在上（「名称」+ 独立红星），非浮动 labelText + expect(find.text('名称'), findsOneWidget); + expect(find.text('期初余额'), findsOneWidget); await tester.tap(find.text('保存')); await tester.pump(); - expect(find.text('不能为空'), findsAtLeastNWidgets(1)); }); - testWidgets('shows delete confirmation when delete button tapped', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - const partners = [ - Partner(id: 1, name: '张家酒水供应商', type: 'supplier'), - ]; - + testWidgets('铅笔打开预填编辑弹窗，弹窗内可发起删除确认', (tester) async { + desktop(tester); await tester.pumpWidget(_buildApp( - supplierState: AsyncValue.data( - const PageResult(data: partners, total: 1, page: 1, pageSize: 20), - ), + state: const AsyncValue.data( + PageResult(data: _partners, total: 1, page: 1, pageSize: 1000)), )); - await tester.pump(); - - await tester.tap(find.byKey(const Key('btn_delete_1'))); await tester.pumpAndSettle(); + await tester.tap(find.byIcon(LucideIcons.pencil).first); + await tester.pumpAndSettle(); + expect(find.text('编辑往来单位'), findsOneWidget); + expect(find.widgetWithText(TextFormField, '张家酒水供应商'), findsOneWidget); + + await tester.tap(find.text('删除')); + await tester.pumpAndSettle(); expect(find.text('确认删除'), findsOneWidget); expect(find.textContaining('张家酒水供应商'), findsAtLeastNWidgets(1)); - expect(find.text('取消'), findsOneWidget); - // 删除 appears in both the list row action button and the dialog confirm button. - expect(find.text('删除'), findsAtLeastNWidgets(1)); }); - testWidgets('tapping edit button opens prefilled edit dialog', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - const partners = [ - Partner( - id: 1, - code: 'S001', - name: '张家酒水供应商', - type: 'supplier', - contact: '张三', - ), - ]; - + testWidgets('行点击打开详情抽屉（联系信息 + 应收/应付 + 近期单据）', (tester) async { + desktop(tester); await tester.pumpWidget(_buildApp( - supplierState: AsyncValue.data( - const PageResult(data: partners, total: 1, page: 1, pageSize: 20), - ), + state: const AsyncValue.data( + PageResult(data: _partners, total: 1, page: 1, pageSize: 1000)), )); - await tester.pump(); - - await tester.tap(find.byKey(const Key('btn_edit_1'))); await tester.pumpAndSettle(); - expect(find.text('编辑供应商'), findsOneWidget); - expect(find.widgetWithText(TextFormField, '张家酒水供应商'), findsOneWidget); - }); - }); - - group('PartnersScreen - Customer tab', () { - testWidgets('shows 暂无客户 when customer list is empty', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - await tester.pumpWidget(_buildApp()); - await tester.pump(); - - // Switch to 客户 tab - await tester.tap(find.text('客户')); - await tester.pumpAndSettle(); - - expect(find.text('暂无客户'), findsOneWidget); - }); - - testWidgets('shows customer names in list', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - const customers = [ - Partner(id: 10, name: '王记饭店', type: 'customer', phone: '13900139000'), - ]; - - await tester.pumpWidget(_buildApp( - customerState: AsyncValue.data( - const PageResult(data: customers, total: 1, page: 1, pageSize: 20), - ), - )); - await tester.pump(); - - // Switch to customer tab - await tester.tap(find.text('客户')); - await tester.pumpAndSettle(); - - expect(find.text('王记饭店'), findsOneWidget); - }); - - testWidgets('opens 新建客户 dialog from customer tab', (tester) async { - tester.view.physicalSize = const Size(1280, 800); - tester.view.devicePixelRatio = 1.0; - addTearDown(tester.view.resetPhysicalSize); - - await tester.pumpWidget(_buildApp()); - await tester.pump(); - - await tester.tap(find.text('客户')); - await tester.pumpAndSettle(); - - await tester.tap(find.text('新建')); - await tester.pumpAndSettle(); - - expect(find.text('新建客户'), findsOneWidget); - expect(find.text('客户名称'), findsAtLeastNWidgets(1)); + await tester.tap(find.text('张家酒水供应商')); + await tester.pump(const Duration(milliseconds: 300)); + expect(find.text('联系信息'), findsOneWidget); + expect(find.text('应收账款'), findsOneWidget); + expect(find.text('应付账款'), findsOneWidget); + expect(find.text('近期单据'), findsOneWidget); }); }); } diff --git a/client/test/print_order_pagination_test.dart b/client/test/print_order_pagination_test.dart index 5bc6c6a..b55b1a6 100644 --- a/client/test/print_order_pagination_test.dart +++ b/client/test/print_order_pagination_test.dart @@ -16,8 +16,7 @@ void main() { setUpAll(() { // 直接从仓库内字体文件加载（无需 Flutter asset bundle / binding）。 - final bytes = - File('assets/fonts/NotoSansSC-Regular.ttf').readAsBytesSync(); + final bytes = File('assets/fonts/NotoSansSC-Regular.ttf').readAsBytesSync(); font = pw.Font.ttf(bytes.buffer.asByteData()); }); diff --git a/client/test/product_repository_test.dart b/client/test/product_repository_test.dart index 247ff37..66e60cf 100644 --- a/client/test/product_repository_test.dart +++ b/client/test/product_repository_test.dart @@ -126,7 +126,8 @@ void main() { expect(result.data, isEmpty); }); - test('400 response throws AppException with server error message', () async { + test('400 response throws AppException with server error message', + () async { adapter.onGet( '/products', (server) => server.reply(400, {'error': 'invalid page parameter'}), @@ -137,10 +138,7 @@ void main() { () => repo.list(), throwsA( predicate( - (e) => - e is AppException && - e.message == 'invalid page parameter' && - e.statusCode == 400, + (e) => e.message == 'invalid page parameter' && e.statusCode == 400, ), ), ); @@ -157,7 +155,7 @@ void main() { () => repo.list(), throwsA( predicate( - (e) => e is AppException && e.statusCode == 401, + (e) => e.statusCode == 401, ), ), ); diff --git a/client/test/products_screen_test.dart b/client/test/products_screen_test.dart index fe8daa8..0c66e8e 100644 --- a/client/test/products_screen_test.dart +++ b/client/test/products_screen_test.dart @@ -20,7 +20,8 @@ class _FakeProductNotifier extends ProductListNotifier { @override Future> build() async { state = _fixed; - return state.value ?? const PageResult(data: [], total: 0, page: 1, pageSize: 20); + return state.value ?? + const PageResult(data: [], total: 0, page: 1, pageSize: 20); } @override @@ -93,7 +94,8 @@ Widget _buildLoadingApp() { // --------------------------------------------------------------------------- // TODO: ProductsScreen 已重构为 options tab 页，productListProvider 已不挂载，测试待重写 void main() { - testWidgets('shows CircularProgressIndicator while loading', skip: true, (tester) async { + testWidgets('shows CircularProgressIndicator while loading', skip: true, + (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); @@ -104,7 +106,8 @@ void main() { expect(find.byType(CircularProgressIndicator), findsOneWidget); }); - testWidgets('shows error message on load failure', skip: true, (tester) async { + testWidgets('shows error message on load failure', skip: true, + (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); @@ -136,7 +139,8 @@ void main() { expect(find.text('暂无商品'), findsOneWidget); }); - testWidgets('shows product list with name code and unit', skip: true, (tester) async { + testWidgets('shows product list with name code and unit', skip: true, + (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); @@ -180,7 +184,8 @@ void main() { expect(find.text('新建'), findsOneWidget); }); - testWidgets('tapping 新建 opens product form dialog', skip: true, (tester) async { + testWidgets('tapping 新建 opens product form dialog', skip: true, + (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); @@ -260,7 +265,8 @@ void main() { expect(find.text('删除'), findsAtLeastNWidgets(1)); }); - testWidgets('tapping edit opens edit dialog with prefilled values', skip: true, (tester) async { + testWidgets('tapping edit opens edit dialog with prefilled values', + skip: true, (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); @@ -289,7 +295,8 @@ void main() { expect(find.widgetWithText(TextFormField, 'P001'), findsOneWidget); }); - testWidgets('shows total count in pagination bar', skip: true, (tester) async { + testWidgets('shows total count in pagination bar', skip: true, + (tester) async { tester.view.physicalSize = const Size(1280, 800); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); diff --git a/client/test/readonly_write_forbidden_test.dart b/client/test/readonly_write_forbidden_test.dart index 30865cd..ab567a0 100644 --- a/client/test/readonly_write_forbidden_test.dart +++ b/client/test/readonly_write_forbidden_test.dart @@ -9,18 +9,18 @@ import 'package:jiu_client/core/auth/auth_state.dart'; import 'package:jiu_client/core/config/license_copy.dart'; import 'package:jiu_client/core/models/page_result.dart'; import 'package:jiu_client/core/theme/themes.dart'; -import 'package:jiu_client/models/license.dart'; import 'package:jiu_client/models/partner.dart'; import 'package:jiu_client/providers/license_provider.dart'; import 'package:jiu_client/providers/partner_provider.dart'; import 'package:jiu_client/screens/partners/partners_screen.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; // 只读角色：写按钮（新建/编辑/删除）应被 WriteGuard 隐藏。 // 替换原先因 ProductsScreen 重构而 skip 的旧用例，改测稳定的 PartnersScreen。 class _FakePartnerNotifier extends PartnerListNotifier { final AsyncValue> _fixed; - _FakePartnerNotifier(String type, this._fixed) : super(type: type); + _FakePartnerNotifier(this._fixed); @override Future> build() async { @@ -34,6 +34,8 @@ class _FakePartnerNotifier extends PartnerListNotifier { @override void setKeyword(String keyword) {} @override + void setType(String? t) {} + @override void setPage(int page) {} @override Future createPartner(Map data) async {} @@ -66,18 +68,13 @@ Widget _buildApp({required bool readonly}) { overrides: [ isReadonlyProvider.overrideWithValue(readonly), licenseProvider.overrideWith(() => _FakeLicenseNotifier()), - supplierListProvider.overrideWith( - () => _FakePartnerNotifier('supplier', const AsyncValue.data(_suppliers)), - ), - customerListProvider.overrideWith( - () => _FakePartnerNotifier( - 'customer', - const AsyncValue.data( - PageResult(data: [], total: 0, page: 1, pageSize: 20)), - ), + partnersScreenProvider.overrideWith( + () => _FakePartnerNotifier(const AsyncValue.data(_suppliers)), ), + partnerBalancesProvider.overrideWith((ref) async => {}), ], - child: MaterialApp(theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), + child: MaterialApp( + theme: buildTheme('a'), home: const Scaffold(body: PartnersScreen())), ); } @@ -86,8 +83,7 @@ void main() { // 仅隐藏按钮不够：只读账号若绕过 UI（或后端授权过期）直接提交写操作， // 必须验证 403 真的被 apiClientProvider 的 onForbidden 捕获并浮出只读提示。 - test('只读账号提交写操作：后端 403(READONLY_USER) 经 apiClientProvider 浮出只读提示', - () async { + test('只读账号提交写操作：后端 403(READONLY_USER) 经 apiClientProvider 浮出只读提示', () async { SharedPreferences.setMockInitialValues({}); final container = ProviderContainer(); addTearDown(container.dispose); @@ -110,8 +106,8 @@ void main() { ); adapter.onPost( '/partners', - (server) => - server.reply(403, {'error': 'readonly user', 'code': 'READONLY_USER'}), + (server) => server + .reply(403, {'error': 'readonly user', 'code': 'READONLY_USER'}), data: {'name': '新供应商'}, ); @@ -135,10 +131,9 @@ void main() { // 供应商已渲染，证明列表确实加载。 expect(find.text('茅台供应商'), findsOneWidget); - // 写按钮被 WriteGuard 隐藏。 - expect(find.text('新建'), findsNothing); - expect(find.byKey(const Key('btn_edit_1')), findsNothing); - expect(find.byKey(const Key('btn_delete_1')), findsNothing); + // 写按钮被 WriteGuard 隐藏（头部新增 + 行内编辑铅笔）。 + expect(find.text('新增往来单位'), findsNothing); + expect(find.byIcon(LucideIcons.pencil), findsNothing); }); testWidgets('普通角色（normal 授权）：写按钮可见', (tester) async { @@ -150,8 +145,7 @@ void main() { await tester.pumpAndSettle(); expect(find.text('茅台供应商'), findsOneWidget); - expect(find.text('新建'), findsWidgets); - expect(find.byKey(const Key('btn_edit_1')), findsOneWidget); - expect(find.byKey(const Key('btn_delete_1')), findsOneWidget); + expect(find.text('新增往来单位'), findsOneWidget); + expect(find.byIcon(LucideIcons.pencil), findsOneWidget); }); } diff --git a/client/test/stock_in_create_submit_flow_test.dart b/client/test/stock_in_create_submit_flow_test.dart index b34192b..16d8d0d 100644 --- a/client/test/stock_in_create_submit_flow_test.dart +++ b/client/test/stock_in_create_submit_flow_test.dart @@ -120,8 +120,8 @@ class _CapturingStockInNotifier extends StockInListNotifier { void main() { // TODO: 表单 DropdownButtonFormField 数量已变更，测试待更新 - testWidgets('stock-in form creates and submits a pending order', - skip: true, (tester) async { + testWidgets('stock-in form creates and submits a pending order', skip: true, + (tester) async { tester.view.physicalSize = const Size(1440, 1200); tester.view.devicePixelRatio = 1.0; addTearDown(tester.view.resetPhysicalSize); diff --git a/client/test/stock_in_form_pick_test.dart b/client/test/stock_in_form_pick_test.dart new file mode 100644 index 0000000..56d9f63 --- /dev/null +++ b/client/test/stock_in_form_pick_test.dart @@ -0,0 +1,88 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/core/theme/themes.dart'; +import 'package:jiu_client/models/product_option.dart'; +import 'package:jiu_client/models/warehouse.dart'; +import 'package:jiu_client/providers/warehouse_provider.dart'; +import 'package:jiu_client/providers/product_option_provider.dart'; +import 'package:jiu_client/screens/stock_in/stock_in_form_screen.dart'; + +class _FakeWarehouses extends WarehouseListNotifier { + @override + Future> build() async => + const [Warehouse(id: 1, name: '主仓', isDefault: true)]; +} + +class _FakeNames extends ProductNameListNotifier { + @override + Future> build() async => const [ + ProductNameOption(id: 10, name: '茅台飞天', code: 'P001'), + ProductNameOption(id: 11, name: '五粮液', code: 'P002'), + ]; +} + +class _FakeSeries extends ProductSeriesListNotifier { + @override + Future> build() async => const [ + ProductSeriesOption(id: 20, name: '53度'), + ]; +} + +class _FakeSpecs extends ProductSpecListNotifier { + @override + Future> build() async => const [ + ProductSpecOption(id: 30, name: '500ml'), + ]; +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + SharedPreferences.setMockInitialValues({}); + + testWidgets('stock-in form: picking 商品名称 fills the cell', (tester) async { + tester.view.physicalSize = const Size(1400, 1000); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + await tester.pumpWidget(ProviderScope( + overrides: [ + warehouseListProvider.overrideWith(() => _FakeWarehouses()), + productNameListProvider.overrideWith(() => _FakeNames()), + productSeriesListProvider.overrideWith(() => _FakeSeries()), + productSpecListProvider.overrideWith(() => _FakeSpecs()), + isReadonlyProvider.overrideWithValue(false), + ], + child: MaterialApp( + theme: buildTheme('a'), + home: const Scaffold(body: StockInFormScreen()), + ), + )); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 100)); + + // Tap the 商品名称 cell to focus/open its popup. + final nameCell = find.text('选择商品名称'); + expect(nameCell, findsWidgets); + await tester.tap(nameCell.first); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 100)); + + // The option list should appear. + expect(find.text('五粮液'), findsWidgets, + reason: 'popup list should show options'); + + // Tap the option. + await tester.tap(find.text('五粮液').last); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 100)); + + // After picking, the cell should display 五粮液 and the hint should be gone. + expect(find.text('五粮液'), findsOneWidget, + reason: 'cell should show the picked name'); + expect(find.text('选择商品名称'), findsNothing, + reason: 'hint should be replaced by the picked name'); + }); +} diff --git a/client/test/stock_in_repository_test.dart b/client/test/stock_in_repository_test.dart index cf4aa0c..bf35c12 100644 --- a/client/test/stock_in_repository_test.dart +++ b/client/test/stock_in_repository_test.dart @@ -214,7 +214,12 @@ void main() { 'warehouse_id': 1, 'partner_id': 1, 'items': [ - {'product_id': 1, 'quantity': 10.0, 'unit_price': 100.0, 'total_price': 1000.0} + { + 'product_id': 1, + 'quantity': 10.0, + 'unit_price': 100.0, + 'total_price': 1000.0 + } ] }; adapter.onPost( @@ -305,7 +310,8 @@ void main() { test('reject 400 throws AppException', () async { adapter.onPut( '/stock-in/orders/1/reject', - (server) => server.reply(400, {'error': 'cannot reject approved order'}), + (server) => + server.reply(400, {'error': 'cannot reject approved order'}), ); expect( diff --git a/client/test/stock_in_screen_test.dart b/client/test/stock_in_screen_test.dart index 385498a..8bd0664 100644 --- a/client/test/stock_in_screen_test.dart +++ b/client/test/stock_in_screen_test.dart @@ -6,7 +6,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:jiu_client/core/models/page_result.dart'; import 'package:jiu_client/core/theme/themes.dart'; -import 'package:jiu_client/models/license.dart'; import 'package:jiu_client/models/stock_in.dart'; import 'package:jiu_client/providers/license_provider.dart'; import 'package:jiu_client/providers/stock_in_provider.dart'; @@ -158,8 +157,8 @@ void main() { testWidgets('error 显示「加载失败」+ 重试', (tester) async { _bigView(tester); - await tester.pumpWidget( - _buildApp(AsyncValue.error('连接超时', StackTrace.empty))); + await tester + .pumpWidget(_buildApp(AsyncValue.error('连接超时', StackTrace.empty))); await tester.pumpAndSettle(); expect(find.textContaining('加载失败'), findsOneWidget); expect(find.text('重试'), findsOneWidget); @@ -180,8 +179,8 @@ void main() { _makeOrder(id: 1, orderNo: 'SI2024010001', partnerName: '张家酒水'), _makeOrder(id: 2, orderNo: 'SI2024010002', partnerName: '李记酒行'), ]; - await tester.pumpWidget(_buildApp( - AsyncValue.data(PageResult(data: orders, total: 2, page: 1, pageSize: 20)))); + await tester.pumpWidget(_buildApp(AsyncValue.data( + PageResult(data: orders, total: 2, page: 1, pageSize: 20)))); await tester.pumpAndSettle(); expect(find.text('SI2024010001'), findsOneWidget); expect(find.text('李记酒行'), findsOneWidget); @@ -216,11 +215,10 @@ void main() { } }); - testWidgets('进页面把 provider 残留关键词回填到搜索框（不隐形过滤）', - (tester) async { + testWidgets('进页面把 provider 残留关键词回填到搜索框（不隐形过滤）', (tester) async { _bigView(tester); - await tester.pumpWidget(_appWith( - stockInListProvider.overrideWith(() => _StaleKeywordStockInNotifier()))); + await tester.pumpWidget(_appWith(stockInListProvider + .overrideWith(() => _StaleKeywordStockInNotifier()))); await tester.pumpAndSettle(); // 残留 'sfs' 必须显示在搜索框里，用户看得见可清除； // 修复前入库屏无 initState 回填 → 框空但仍按 'sfs' 过滤 → 列表恒空。 @@ -230,8 +228,8 @@ void main() { testWidgets('分页栏显示总数', (tester) async { _bigView(tester); final orders = [_makeOrder(id: 1)]; - await tester.pumpWidget(_buildApp( - AsyncValue.data(PageResult(data: orders, total: 35, page: 1, pageSize: 20)))); + await tester.pumpWidget(_buildApp(AsyncValue.data( + PageResult(data: orders, total: 35, page: 1, pageSize: 20)))); await tester.pumpAndSettle(); expect(find.textContaining('共 35'), findsOneWidget); }); diff --git a/client/test/stock_out_insufficient_stock_flow_test.dart b/client/test/stock_out_insufficient_stock_flow_test.dart index 1f1c3fe..5f4b96a 100644 --- a/client/test/stock_out_insufficient_stock_flow_test.dart +++ b/client/test/stock_out_insufficient_stock_flow_test.dart @@ -96,6 +96,7 @@ class _FakeInventoryRepository extends InventoryRepository { int? warehouseId, int? productId, String? keyword, + String? code, List? series, List? spec, int page = 1, diff --git a/client/test/stock_out_repository_test.dart b/client/test/stock_out_repository_test.dart index f55b4f7..64bec01 100644 --- a/client/test/stock_out_repository_test.dart +++ b/client/test/stock_out_repository_test.dart @@ -209,7 +209,12 @@ void main() { 'warehouse_id': 1, 'partner_id': 2, 'items': [ - {'product_id': 1, 'quantity': 5.0, 'unit_price': 200.0, 'total_price': 1000.0} + { + 'product_id': 1, + 'quantity': 5.0, + 'unit_price': 200.0, + 'total_price': 1000.0 + } ] }; adapter.onPost( @@ -278,14 +283,16 @@ void main() { test('approve 400 (insufficient stock) throws AppException', () async { adapter.onPut( '/stock-out/orders/1/approve', - (server) => server.reply(400, {'error': 'insufficient stock for product 茅台'}), + (server) => + server.reply(400, {'error': 'insufficient stock for product 茅台'}), ); expect( () => repo.approve(1), throwsA( predicate( - (e) => e.message.contains('insufficient stock') && e.statusCode == 400, + (e) => + e.message.contains('insufficient stock') && e.statusCode == 400, ), ), ); @@ -303,7 +310,8 @@ void main() { test('reject 400 throws AppException', () async { adapter.onPut( '/stock-out/orders/1/reject', - (server) => server.reply(400, {'error': 'cannot reject approved order'}), + (server) => + server.reply(400, {'error': 'cannot reject approved order'}), ); expect( diff --git a/client/test/support/golden_harness.dart b/client/test/support/golden_harness.dart index 8cb7b8d..a774b27 100644 --- a/client/test/support/golden_harness.dart +++ b/client/test/support/golden_harness.dart @@ -12,9 +12,11 @@ Future ensureGoldenFonts() async { final loader = FontLoader('NotoSansSC') ..addFont(rootBundle.load('assets/fonts/NotoSansSC.ttf')); await loader.load(); - // 把内置 'monospace' family 也指向 Noto（否则等宽数字/批次号在 golden 渲染成黑块）。 - final mono = FontLoader('monospace') - ..addFont(rootBundle.load('assets/fonts/NotoSansSC.ttf')); + // 等宽真相源 JetBrainsMono（AppFonts.mono；400+700）——与原型截图注入、 + // 真机打包同一字体文件，等宽渲染三方同源（未加载会渲染成黑块 tofu）。 + final mono = FontLoader('JetBrainsMono') + ..addFont(rootBundle.load('assets/fonts/JetBrainsMono-Regular.ttf')) + ..addFont(rootBundle.load('assets/fonts/JetBrainsMono-Bold.ttf')); await mono.load(); // 真实 Material 图标字体（否则 golden 里图标渲染成豆腐块 □）。 for (final key in const [ diff --git a/client/test/support/shell_harness.dart b/client/test/support/shell_harness.dart new file mode 100644 index 0000000..cb23931 --- /dev/null +++ b/client/test/support/shell_harness.dart @@ -0,0 +1,161 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:go_router/go_router.dart'; +import 'package:jiu_client/core/auth/auth_state.dart'; +import 'package:jiu_client/core/theme/themes.dart'; +import 'package:jiu_client/models/shop.dart'; +import 'package:jiu_client/providers/shop_provider.dart'; +import 'package:jiu_client/providers/license_provider.dart'; +import 'package:jiu_client/providers/update_provider.dart'; +import 'package:jiu_client/providers/connectivity_provider.dart'; +import 'package:jiu_client/providers/session_heartbeat.dart'; +import 'package:jiu_client/screens/shell/app_shell.dart'; +import 'package:jiu_client/widgets/app_status_bar.dart'; + +import 'golden_harness.dart'; + +/// 外壳挂载版 golden 骨架：把屏放进真 AppShell（顶栏+侧栏+状态栏）渲染， +/// 与原型整页截图（fidelity.mjs 的 proto 基准）同构，可直接整屏 diff。 +/// 门店/用户/版本对齐原型：鼎晟酒行/DSJH-001、王经理(管理员)、v1.0.72。 + +class _FakeAuth extends AuthNotifier { + _FakeAuth() { + state = const AuthState( + user: AuthUser( + accessToken: 't', + refreshToken: 'r', + id: 1, + username: 'wang', + realName: '王经理', + shopNo: 'DSJH-001', + shopId: 1, + role: 'admin'), + ); + } +} + +class _FakeUpdate extends UpdateNotifier { + @override + Future build() async => null; +} + +class _FakeLicense extends LicenseNotifier { + @override + Future build() async => null; +} + +const _shop = ShopInfo( + id: 1, + code: 'DSJH-001', + name: '鼎晟酒行', + address: '浙江省杭州市', + phone: '0571-88886666', + managerName: '王经理'); + +/// 外壳自身依赖的 provider 覆盖（认证/门店/授权/更新/网络/心跳/版本）。 +List shellOverrides() => [ + authStateProvider.overrideWith((ref) => _FakeAuth()), + shopInfoProvider.overrideWith((ref) => _shop), + licenseProvider.overrideWith(() => _FakeLicense()), + updateProvider.overrideWith(() => _FakeUpdate()), + // 跳过联网首检 / 不启动心跳，避免后台 Timer 泄漏 + connectivityProvider + .overrideWith((ref) => ConnectivityNotifier(skipInit: true)), + sessionHeartbeatProvider.overrideWith((ref) => SessionHeartbeat(ref)), + appVersionProvider.overrideWith((ref) => 'v1.0.72'), + isReadonlyProvider.overrideWithValue(false), + ]; + +// 外壳 nav 引用 9 个分支序号（入/出库·库存·财务·往来·基础数据·设备·设置·关于）。 +StatefulShellBranch _branch(String path, [WidgetBuilder? builder]) => + StatefulShellBranch(routes: [ + GoRoute( + path: path, + builder: (ctx, _) => builder?.call(ctx) ?? const SizedBox.expand()), + ]); + +GoRouter _router(String initialPath, WidgetBuilder screen) => GoRouter( + initialLocation: initialPath, + routes: [ + StatefulShellRoute.indexedStack( + builder: (ctx, state, shell) => AppShell(navigationShell: shell), + branches: [ + for (final p in const [ + '/stock-in', + '/stock-out', + '/inventory', + '/finance', + '/partners', + '/products', + '/devices', + '/settings', + '/about', + ]) + _branch(p, p == initialPath ? screen : null), + ], + ), + ], + ); + +/// 在指定主题下把 [screen] 挂进外壳渲染并比对 golden（1280×900@2x 对齐原型）。 +Future pumpShellGolden( + WidgetTester tester, { + required String path, + required WidgetBuilder screen, + required String theme, + required String goldenName, + List overrides = const [], + Size logical = const Size(1280, 900), + double dpr = 2.0, +}) async { + await ensureGoldenFonts(); + // 冻结状态栏时钟，确定化 golden（与 app_shell golden 同基准时刻）。 + AppStatusBar.clock = () => DateTime(2026, 7, 13, 9, 30, 15); + AppStatusBar.ticking = false; + tester.view.physicalSize = Size(logical.width * dpr, logical.height * dpr); + tester.view.devicePixelRatio = dpr; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + + await tester.pumpWidget(ProviderScope( + overrides: [...shellOverrides(), ...overrides], + child: MaterialApp.router( + debugShowCheckedModeBanner: false, + theme: withGoldenFont(buildTheme(theme)), + routerConfig: _router(path, screen), + ), + )); + await tester.pumpAndSettle(); + + await expectLater( + find.byType(MaterialApp), + matchesGoldenFile('goldens/$goldenName.png'), + ); +} + +/// 「同一屏 × A/B/C 三主题」外壳挂载 golden 组。 +void shellGoldenAcrossThemes( + String description, { + required String path, + required WidgetBuilder screen, + required String goldenPrefix, + List Function()? overrides, + Size logical = const Size(1280, 900), + double dpr = 2.0, +}) { + for (final theme in const ['a', 'b', 'c']) { + testWidgets('$description · theme $theme', (tester) async { + await pumpShellGolden( + tester, + path: path, + screen: screen, + theme: theme, + goldenName: '${goldenPrefix}_$theme', + overrides: overrides?.call() ?? const [], + logical: logical, + dpr: dpr, + ); + }); + } +} diff --git a/client/test/theme/app_tokens_test.dart b/client/test/theme/app_tokens_test.dart index 55d0810..f4f3142 100644 --- a/client/test/theme/app_tokens_test.dart +++ b/client/test/theme/app_tokens_test.dart @@ -3,21 +3,52 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:jiu_client/core/theme/app_tokens.dart'; AppTokens _sample() => const AppTokens( - page: Color(0xFF111111), bg: Color(0xFF222222), surface: Color(0xFF333333), - border: Color(0xFF444444), borderSubtle: Color(0xFF555555), text: Color(0xFF666666), - heading: Color(0xFF777777), title: Color(0xFF888888), muted: Color(0xFF999999), - faint: Color(0xFFAAAAAA), primary: Color(0xFF2563AC), primaryDark: Color(0xFF154072), - onPrimary: Color(0xFFFFFFFF), brand400: Color(0xFF4F86C6), brand50: Color(0xFFEEF4FB), - accent: Color(0xFF8B2331), success: Color(0xFF2E8B57), danger: Color(0xFFD14343), - warn: Color(0xFFE08E00), infoSoft: Color(0xFFEEF4FB), okSoft: Color(0xFFE8F5EE), - accentSoft: Color(0xFFFAEEF0), successBg: Color(0xFFE8F5EE), dangerBg: Color(0xFFFDECEC), - warnBg: Color(0xFFFFF4DB), thBg: Color(0xFFF7F9FC), rowHover: Color(0xFFEEF4FB), - shadow: Color(0x33142846), topBg: Color(0xFF2563AC), topFg: Color(0xFFFFFFFF), - topFaint: Color(0xB8FFFFFF), topBorder: Color(0xFF1E5594), topControl: Color(0x29FFFFFF), - topMarkBg: Color(0x38FFFFFF), topMarkFg: Color(0xFFFFFFFF), sideBg: Color(0xFF163A6C), - sideFg: Color(0xFFC4D6ED), sideMuted: Color(0xFF7C9FCB), sideActiveBg: Color(0xFF2C6BB3), - sideActiveFg: Color(0xFFFFFFFF), sideBorder: Color(0xFF1E4A86), sideHover: Color(0xFF1C4680), - menuUserBg: Color(0xFF3C79C0), menuUserFg: Color(0xFFFFFFFF), menuUserHover: Color(0xFF4D88CC), + page: Color(0xFF111111), + bg: Color(0xFF222222), + surface: Color(0xFF333333), + border: Color(0xFF444444), + borderSubtle: Color(0xFF555555), + text: Color(0xFF666666), + heading: Color(0xFF777777), + title: Color(0xFF888888), + muted: Color(0xFF999999), + faint: Color(0xFFAAAAAA), + primary: Color(0xFF2563AC), + primaryDark: Color(0xFF154072), + onPrimary: Color(0xFFFFFFFF), + brand400: Color(0xFF4F86C6), + brand50: Color(0xFFEEF4FB), + accent: Color(0xFF8B2331), + success: Color(0xFF2E8B57), + danger: Color(0xFFD14343), + warn: Color(0xFFE08E00), + infoSoft: Color(0xFFEEF4FB), + okSoft: Color(0xFFE8F5EE), + accentSoft: Color(0xFFFAEEF0), + successBg: Color(0xFFE8F5EE), + dangerBg: Color(0xFFFDECEC), + warnBg: Color(0xFFFFF4DB), + thBg: Color(0xFFF7F9FC), + rowHover: Color(0xFFEEF4FB), + shadow: Color(0x33142846), + topBg: Color(0xFF2563AC), + topFg: Color(0xFFFFFFFF), + topFaint: Color(0xB8FFFFFF), + topBorder: Color(0xFF1E5594), + topControl: Color(0x29FFFFFF), + topMarkBg: Color(0x38FFFFFF), + topMarkFg: Color(0xFFFFFFFF), + sideBg: Color(0xFF163A6C), + sideFg: Color(0xFFC4D6ED), + sideMuted: Color(0xFF7C9FCB), + sideActiveBg: Color(0xFF2C6BB3), + sideActiveFg: Color(0xFFFFFFFF), + sideBorder: Color(0xFF1E4A86), + sideHover: Color(0xFF1C4680), + menuUserBg: Color(0xFF3C79C0), + menuUserFg: Color(0xFFFFFFFF), + menuUserHover: Color(0xFF4D88CC), + toastBg: Color(0xFF1F2330), isDark: false, ); diff --git a/client/test/theme/context_tokens_test.dart b/client/test/theme/context_tokens_test.dart index ad39688..effc645 100644 --- a/client/test/theme/context_tokens_test.dart +++ b/client/test/theme/context_tokens_test.dart @@ -8,7 +8,10 @@ void main() { late Color seen; await tester.pumpWidget(MaterialApp( theme: buildTheme('a'), - home: Builder(builder: (ctx) { seen = ctx.tokens.primary; return const SizedBox(); }), + home: Builder(builder: (ctx) { + seen = ctx.tokens.primary; + return const SizedBox(); + }), )); expect(seen, const Color(0xFF2563AC)); }); diff --git a/client/test/theme/kpi_card_golden_test.dart b/client/test/theme/kpi_card_golden_test.dart index 036f6cd..8d2b51c 100644 --- a/client/test/theme/kpi_card_golden_test.dart +++ b/client/test/theme/kpi_card_golden_test.dart @@ -1,3 +1,4 @@ +import 'package:lucide_icons_flutter/lucide_icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:jiu_client/core/theme/themes.dart'; @@ -20,7 +21,7 @@ void main() { child: KpiCard( title: '商品总数', value: '1284', - icon: Icons.inventory_2, + icon: LucideIcons.box, tone: KpiTone.info, delta: '种 · 点击清筛选')), SizedBox(width: 12), diff --git a/client/test/theme/theme_switch_widget_test.dart b/client/test/theme/theme_switch_widget_test.dart index 5f1ccfb..cd4e157 100644 --- a/client/test/theme/theme_switch_widget_test.dart +++ b/client/test/theme/theme_switch_widget_test.dart @@ -14,12 +14,16 @@ void main() { testWidgets('切换 themeController 改变 context.tokens.primary', (tester) async { late WidgetRef capturedRef; late Color seen; - await tester.pumpWidget(ProviderScope(child: Consumer(builder: (ctx, ref, _) { + await tester + .pumpWidget(ProviderScope(child: Consumer(builder: (ctx, ref, _) { capturedRef = ref; final key = ref.watch(themeControllerProvider); return MaterialApp( theme: buildTheme(key), - home: Builder(builder: (c) { seen = c.tokens.primary; return const SizedBox(); }), + home: Builder(builder: (c) { + seen = c.tokens.primary; + return const SizedBox(); + }), ); }))); expect(seen, const Color(0xFF2563AC)); // a diff --git a/client/test/user_menu_width_test.dart b/client/test/user_menu_width_test.dart index f37fedd..85aa599 100644 --- a/client/test/user_menu_width_test.dart +++ b/client/test/user_menu_width_test.dart @@ -21,8 +21,14 @@ class _FakeAuth extends AuthNotifier { _FakeAuth() { state = const AuthState( user: AuthUser( - accessToken: 't', refreshToken: 'r', id: 1, username: 'wang', - realName: '王经理', shopNo: 'DSJH-001', shopId: 1, role: 'admin'), + accessToken: 't', + refreshToken: 'r', + id: 1, + username: 'wang', + realName: '王经理', + shopNo: 'DSJH-001', + shopId: 1, + role: 'admin'), ); } } @@ -38,8 +44,12 @@ class _FakeLicense extends LicenseNotifier { } const _shop = ShopInfo( - id: 1, code: 'DSJH-001', name: '鼎晟酒行', - address: '浙江省杭州市', phone: '0571-88886666', managerName: '王经理'); + id: 1, + code: 'DSJH-001', + name: '鼎晟酒行', + address: '浙江省杭州市', + phone: '0571-88886666', + managerName: '王经理'); GoRouter _router() => GoRouter( initialLocation: '/inventory', @@ -48,8 +58,15 @@ GoRouter _router() => GoRouter( builder: (ctx, state, shell) => AppShell(navigationShell: shell), branches: [ for (final p in const [ - '/stock-in', '/stock-out', '/inventory', '/finance', - '/partners', '/products', '/devices', '/settings', '/about' + '/stock-in', + '/stock-out', + '/inventory', + '/finance', + '/partners', + '/products', + '/devices', + '/settings', + '/about' ]) StatefulShellBranch(routes: [ GoRoute(path: p, builder: (_, __) => const SizedBox.expand()), diff --git a/client/test/warehouse_repository_test.dart b/client/test/warehouse_repository_test.dart index 4261bad..d4a1261 100644 --- a/client/test/warehouse_repository_test.dart +++ b/client/test/warehouse_repository_test.dart @@ -86,7 +86,8 @@ void main() { ); }); - test('400 response throws AppException with server error message', () async { + test('400 response throws AppException with server error message', + () async { adapter.onGet( '/warehouses', (server) => server.reply(400, {'error': 'bad request'}), diff --git a/client/test/write_guard_test.dart b/client/test/write_guard_test.dart index 7e40d19..de60e3d 100644 --- a/client/test/write_guard_test.dart +++ b/client/test/write_guard_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:jiu_client/core/auth/auth_state.dart'; import 'package:jiu_client/core/config/license_copy.dart'; import 'package:jiu_client/core/theme/themes.dart'; -import 'package:jiu_client/models/license.dart'; import 'package:jiu_client/providers/license_provider.dart'; import 'package:jiu_client/widgets/write_guard.dart'; @@ -55,7 +54,8 @@ void main() { testWidgets('只读角色：按钮隐藏（findsNothing）', (tester) async { var tapped = false; await tester.pumpWidget( - _harness(readonly: true, lic: _lic('normal'), onPressed: () => tapped = true), + _harness( + readonly: true, lic: _lic('normal'), onPressed: () => tapped = true), ); await tester.pumpAndSettle(); @@ -66,7 +66,8 @@ void main() { testWidgets('operator + normal：按钮可见且可点', (tester) async { var tapped = false; await tester.pumpWidget( - _harness(readonly: false, lic: _lic('normal'), onPressed: () => tapped = true), + _harness( + readonly: false, lic: _lic('normal'), onPressed: () => tapped = true), ); await tester.pumpAndSettle(); @@ -114,6 +115,8 @@ void main() { expect(tapped, isFalse); expect(find.text(LicenseCopy.writeBlockedToast(lic)), findsOneWidget); + // DsToast 2.2s 自动消失计时器：走完再收尾，避免 pending timer 断言 + await tester.pump(const Duration(milliseconds: 2300)); }); testWidgets('operator + locked（过期>15天）：按钮可见但禁用，弹锁定提示', (tester) async { @@ -130,5 +133,7 @@ void main() { expect(tapped, isFalse); expect(find.text(LicenseCopy.writeBlockedToast(lic)), findsOneWidget); + // DsToast 2.2s 自动消失计时器：走完再收尾，避免 pending timer 断言 + await tester.pump(const Duration(milliseconds: 2300)); }); } diff --git a/client/tool/check_ds_code.mjs b/client/tool/check_ds_code.mjs index ef0ba73..8512bb0 100644 --- a/client/tool/check_ds_code.mjs +++ b/client/tool/check_ds_code.mjs @@ -25,6 +25,14 @@ const HEX = /Color\(0x[0-9A-Fa-f]{6,8}\)/; const NAMED = /\bColors\.(?!transparent\b)[a-zA-Z]\w*/; const IGNORE = /\/\/\s*ds-ignore/; +// 文件级豁免：对外公开页（顾客扫码固定品牌页）为**有意独立设计** +// （warm-paper/酒红 bespoke 调色板，不随 A/B/C 主题，见 design/CONTRACT.md +// 「公开商品/门店页」条目）——整页自成体系，不逐行豁免。 +const EXEMPT_FILES = [ + 'lib/screens/public/public_product_screen.dart', + 'lib/screens/public/public_shop_products_screen.dart', +]; + function listDartFiles() { if (CHANGED) { let out = ''; @@ -50,8 +58,12 @@ function listDartFiles() { return out; } +const isExempt = (f) => + EXEMPT_FILES.some((e) => f.replaceAll(path.sep, '/').endsWith(e)); + const violations = []; for (const file of listDartFiles()) { + if (isExempt(file)) continue; // 文件级豁免（对外公开页 bespoke 设计） const lines = fs.readFileSync(file, 'utf8').split('\n'); lines.forEach((line, i) => { if (IGNORE.test(line)) return; // 显式豁免 diff --git a/client/tool/gen_tokens.mjs b/client/tool/gen_tokens.mjs index c5ce733..b2dec8f 100644 --- a/client/tool/gen_tokens.mjs +++ b/client/tool/gen_tokens.mjs @@ -21,13 +21,23 @@ const FIELDS = { 'side-muted':'sideMuted','side-active-bg':'sideActiveBg','side-active-fg':'sideActiveFg', 'side-border':'sideBorder','side-hover':'sideHover','menu-user-bg':'menuUserBg', 'menu-user-fg':'menuUserFg','menu-user-hover':'menuUserHover', + 'toast-bg':'toastBg', }; const DARK = { a:false, b:true, c:false }; +// 基础 :root{}（无 data-theme 选择器）＝三主题共用默认值（如 --toast-bg）， +// 主题块同名变量覆盖之。 +function baseBlock(){ + const m = css.match(/(? **共享组件杠杆**：`StatusBadge`（入/出库单据状态）一处升级两屏受益；`StatusPill`/`KpiCard` 现已被库存/往来/入出库/财务/设备/设置/关于复用——新屏直接套，无需重做徽章/卡片。 ### 全量清扫收尾（其余屏状态） | 屏 | 状态 | |---|---| -| 登录 | ✅ 离线条 token 化 + 整屏 golden ×3 | +| 登录/注册 | ✅ **Phase2 已照原型重建**（login.html/register.html，见上验收表） | | 盘点 | ✅ 斑马行 token 化（表单屏，0 残留，无 golden：静态态不含明细） | -| 商品列表(基础数据) | ✅ 已 token 净（仅 default 金星 FFB300 为有意 accent）；原型 商品档案/香型/介绍 富数据重排**待后端** | +| 商品列表(基础数据) | ✅ **Phase2 已照原型重建**（.seg 5 tab，见上验收表）；default 金星 FFB300 为有意 accent | | 商品详情 | ✅ 主数据/价格/描述区 token 净；原型 3 KPI/仓库分布/流水 **待后端聚合** | | 公开商品/门店页 | ✅ **有意独立设计**（warm-paper/酒红 bespoke 调色板 `_kPaper/_kBurgundy…`），顾客扫码固定品牌页，不参与 A/B/C 主题——保持现状 | | Web 营销站 | ✅ **已对齐品牌**：`web/assets/color.css` 的 `--brand-500:#2563AC` / `--accent` 酒红 / 灰阶 与原型令牌一致，roadmap「Web 镜像品牌」已满足 | @@ -111,12 +120,55 @@ AppTokens 目前**仅颜色**。原型还驱动： ### 仍属「新建功能」（Phase 6，非重建既有屏） 应用内注册 / 购买·套餐·下单（设计+前端壳，**支付不接**）——这是 net-new 功能开发，需各自 spec→设计→实现，不在「既有屏设计语言升级」范围内。 -> **重要发现（原型 vs 现有数据）**：原型是「理想态富数据重设计」，多数屏的富数据区**当前后端不供给**，无法一次完整还原： -> - **商品列表**：8 tab vs 原型 5 tab；香型字典 / 商品介绍 缺后端 → 暂缓。 -> - **商品详情**：原型 3 KPI（库存/货值/出库）+ 仓库分布 + 流水，`getDetail` 仅返回商品主数据 → 需聚合接口，暂缓。 -> - **往来单位**：原型 应收/应付 列，Partner 模型无该字段 → 暂缓；类型 chips 暂保留为两 Tab。 +> **Phase 2 已解决（2026-07-02）**： +> - **往来单位**：应收/应付列改由 `GET /finance/summary`（按 partner 聚合未结清）供给，两 Tab 改回原型的类型 chips 单表；详情抽屉近期单据走 `finance/records?partner_id=`。 +> - **基础数据**：tab 集合按用户口径收敛为 5 个 **档案/介绍/系列/规格/仓库**（商品名称并入档案；产地/保质期/储存/香型撤管理入口，后端字典保留）。 +> - **商品详情**：`getDetail` 聚合已就绪（3 KPI/仓库分布/流水，见 product_detail golden）。 > -> 故本阶段策略 = **「设计语言升级」**：把每屏视觉升到新 token/组件系（副标 / StatusPill / KpiCard〔数据够时〕/ 两行名称 / 响应式 toolbar / token 间距）+ 接 golden 闸；富数据区（应收应付 / 富 KPI / 仓库分布 / 流水 / tab 重排）等后端聚合就绪再做二期。库存屏因 KPI 可由已加载数据现算，是少数能一次到位的。 +> **基础数据屏已知差异（数据/模型驱动，fidelity 残差包含它们）**： +> - 档案无「分类」列、无香型筛选 chips（香型弃用）；无「状态(在售/停用)」列（products 无 status 字段，用户拍板不加）。 +> - 档案无「新增商品」按钮（product=序列号铁律：入库每行自动建档）。 +> - 字典视图无「关联商品」计数列（无后端计数源）；seg 第 5 tab 香型→仓库。 +> - 档案 pager 用带控件分页（真实数据量大）；介绍/字典/仓库 pager 仅文案（对齐原型）。 +> +> **库存屏已知差异（2026-07-02 用户口径调整）**： +> - 搜索合一：原型 名称/拼音(240)+编码(180) 两框 → 一框「商品名 / 拼音 / 编码」（后端 keyword 本就四列 LIKE），回车触发（原型 oninput 即搜）。 +> - 工具栏「状态」筛选 chip 删除（用户裁定无用）；状态列 + 列头漏斗 + KPI 缺货点击筛选保留。 +> - reload 不再白屏：skipLoadingOnReload + DsLoadingScrim 半透明遮罩（与入库/出库屏一致）。 +> +> **商品编辑抽屉（2026-07-03 用户增强）**： +> - 「从介绍库选择」由原型 .pe-pick 普通菜单升级为**搜索下拉**（GridComboCell 表单形态，供应商选择器同款：弹层搜索 + ✓ 选中 + 计数）；收起态外观与原型一致。 +> +> **出入库列表补闸 + 单元格对齐（2026-07-03）**： +> - stock-in/stock-out 此前**漏注册 fidelity**（偏差长期未被闸住）→ 桌面 golden 改外壳挂载并入册（阈值 9%，实测 3.0–5.2%）。 +> - 单元格对齐原型：单号 = .pcode（faint+mono，弃蓝色链接样式）；金额 = ¥+千分位无小数（td.num mono）；审核员空值 = faint「—」。 +> - 全局 InputDecorationTheme 渗漏修复：内嵌裸 TextField 的组合控件显式屏蔽主题边框（搜索框双层框根因）。旧 DataTableCard 组件已无引用，删除。 +> +> **登录/注册屏重建（2026-07-03）**： +> - **主题切换（用户拍板）**：原型右上角 A/B/C 圆钮不用，改放主界面同款小衣服 `ThemePickerPill(onSurface:true)` 于表单面板右上角（宽窄屏都落白底）。 +> - **登录已知差异（功能位保留）**：门店编号/账号历史下拉（后缀箭头）+ 密码可见切换（后缀眼睛）为原型没有的功能件；密码空值显示 hint（原型演示值 8 dots）；服务器错误条/离线条/授权锁定引导卡在按钮上方按需出现。「记住我」= 记录并预填最近登录账号（关闭则不记录），「忘记密码」= toast 提示联系管理员。 +> - **注册已知差异（用户拍板 2026-07-03：先不加）**：无「门店编号（留空自动分配）」「授权兑换券」两字段——后端 RegisterInput 暂不支持；门店地址必填（后端 binding:required，原型选填）；密码下限 6 位（后端 min=6，原型文案 8 位）。表单因此少两行 → **fidelity 暂撤册**（screens.mjs 有注释存根），golden ×3 锁回归；后端补 shop_code/voucher 后恢复入闸。 +> - 校验口径 = 原型：提交时逐项 toast（DsToast），无内联错误文案，38 高盒式字段不抖动。 +> +> **全局对话框统一（2026-07-03 用户要求遍历）**： +> - 主题层钉真相源：`DialogTheme`（surface/r-xl/边框/标题 fs-h2·700）、全局 `InputDecorationTheme`（.input 盒式，禁下划线兜底）、Elevated/FilledButton 主题（.btn.primary 规格）。 +> - 全部 AlertDialog 动作行换 `DsButton`（取消=ghost / 确认=primary / 删除·拒绝=danger / 通过=success / 撤回·结清=accent，`DsBtnVariant` 扩 success/accent）；表单字段改 `DsField`（label 在上）+ 盒式输入（添加设备等）。 +> - 例外保留：`public_product_screen`（对外扫码页，自有品牌配色非 ds 体系）；表格行内链接式 TextButton（备注/打标签/测试打印）非对话框不在此列。 +> +> **出入库列表 KPI 口径（2026-07-03 用户拍板）**： +> - 原型「本月入库/出库笔数·金额 + 较上月」自然月口径月初必然全 0（7-03 实测 0/¥0/▼100% 观感如坏数据）→ 卡片与头部小字改「近30天」滚动窗（`summary?window=rolling30`，对照前一个 30 天）；财务屏仍用自然月口径（原型「本月销售/采购额」文案不变），同一接口两种 window。 +> +> **财务屏已知差异（2026-07-02 Phase2 第 9 屏）**： +> - KPI3/4 delta：原型「逾期 ¥9.2万 / 本周到期 ¥4.8万」无到期日数据源 → 改「未结清 N 笔 / 按到期及时结清」。 +> - KPI 应收/应付值 = `/finance/summary` 实算求和（原型硬编码 ¥48.6万 与其汇总表行自身不一致）。 +> - 流水类型 chips 原型 3 个扩到 5（含应收/应付），并追加 状态/操作 两列（结清能力不回退）；关联单号列显示 `单据类型 #id`（原型 SK/FK 单号字符串无对应模型）。 +> - 时间范围 chips 真实过滤流水（原型只改文案）；趋势柱最高 140px（原型 ~157，标签悬浮方式不同）。 +> +> **设备/设置/用户/关于 已知差异（2026-07-02 Phase2 第 6-8 屏）**： +> - 设备：外设设备=登记式本地存档（店级 `custom_fields.peripherals`，无真实连接协议），测试打印/配置/模板预览为占位 toast；打印模板静态两卡。 +> - 设置：子导航比原型多「编号规则」（真实功能保留）；门店卡多 Logo 行；授权卡保留降级说明；偏好即时生效无「保存」按钮；原型「系统参数」假设置删除。 +> - 用户：独立页挂 `/settings/users`（原型导航同样高亮系统设置）；角色四级（后端为准），原型 settings 预览三级口径弃用；授权数据 settings/about 同源 licenseProvider（原型两处数字不一致）。 +> - 关于：旧版 帮助文档/扫码防伪/系统信息 卡删除，构建号并入版本 cell；更新日志走 `/public/release`（与官网时间线同源），接口不可达回退只显当前版本。 **验收法（HTML→Flutter 特例）**：HTML(Chromium) 与 Flutter 渲染器不同，**严格 0.1% pixelmatch 不适用跨渲染器**（见 design-distill `references/flutter-golden.md`）。本项目双闸： 1. **保真闸（人工目检）**：`node tools/ds-compare.mjs --html .superpowers/prototype/screens/.html --prefix ` → 截原型基准 + 与 Flutter golden 用 montage 并排 → `design/_compare/`。 diff --git a/tools/fidelity.mjs b/tools/fidelity.mjs index 29b0602..ad5debe 100644 --- a/tools/fidelity.mjs +++ b/tools/fidelity.mjs @@ -61,13 +61,19 @@ const diffDir = 'design/_fidelity'; mkdirSync(protoDir, { recursive: true }); mkdirSync(diffDir, { recursive: true }); -// 统一字体注入：把原型的 --font/--font-mono 覆盖为 NotoSansSC（与 Flutter golden 同字体）。 +// 统一字体注入：sans 覆盖为 NotoSansSC（与 Flutter golden 加载的测试字体一致）； +// mono 覆盖为 Menlo（与 AppFonts.mono 一致——golden/真机的等宽都是 Menlo， +// 对比环必须同源，否则等宽列多的屏会虚高 diff）。原型全部字体走 +// var(--font)/var(--font-mono)（无硬编码，已核查），故只改 :root 变量 + +// html 继承兜底即可，不能用 `*{!important}` blanket（会把 mono 也砸成 Noto）。 // 字体经 shoot 临时 http server（root=cwd）按 /client/... 路径供给。 const injectCss = join(tmpdir(), 'jiu-fidelity-font.css'); writeFileSync(injectCss, [ `@font-face{font-family:'NotoSansSC';src:url('/client/assets/fonts/NotoSansSC.ttf');font-weight:100 900;font-display:block;}`, - `:root{--font:'NotoSansSC',sans-serif!important;--font-mono:'NotoSansSC',monospace!important;}`, - `*{font-family:'NotoSansSC',sans-serif!important;}`, + `@font-face{font-family:'JetBrainsMono';src:url('/client/assets/fonts/JetBrainsMono-Regular.ttf');font-weight:400;font-display:block;}`, + `@font-face{font-family:'JetBrainsMono';src:url('/client/assets/fonts/JetBrainsMono-Bold.ttf');font-weight:700;font-display:block;}`, + `:root{--font:'NotoSansSC',sans-serif!important;--font-mono:'JetBrainsMono',monospace!important;}`, + `html,body{font-family:'NotoSansSC',sans-serif!important;}`, ].join('\n')); const wantThemes = values.themes.split(',').map((s) => s.trim()).filter(Boolean); diff --git a/tools/screens.mjs b/tools/screens.mjs index f17d8f2..d852e3a 100644 --- a/tools/screens.mjs +++ b/tools/screens.mjs @@ -34,6 +34,105 @@ export const SCREENS = { prefix: 'inventory_list', width: 1280, height: 900, dpr: 2, waitFor: '.app', - threshold: 0.20, // 旧屏未重建，暂宽松；Phase 2 重建后收紧 + // Phase 2 重建后校准：实测 a 3.8% / b 2.9% / c 4.2%（残差=跨渲染器行高漂移 + // + 状态徽章已知语义差），收紧到 8% 抓结构性回归。 + threshold: 0.08, + }, + partners: { + html: '.superpowers/prototype/screens/partners.html', + prefix: 'partners', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 重建后校准：实测 a 3.2 / b 2.5 / c 3.5%（残差=列宽分布+文字度量+保留的导出按钮） + threshold: 0.08, + }, + products: { + html: '.superpowers/prototype/screens/products.html', + prefix: 'products_archive', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 重建后校准：实测 a 3.2 / b 2.4 / c 3.5%。残差含已知数据驱动差 + // （见 design/CONTRACT.md）：档案无 分类/状态 列、无香型 chips、 + // seg 第 5 tab 香型→仓库、无「新增商品」、pager 带翻页控件。 + threshold: 0.08, + }, + devices: { + html: '.superpowers/prototype/screens/devices.html', + prefix: 'device_management', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 重建后校准：实测 2.4–3.0%（残差=会话表列宽分布+外设卡按钮文字省略） + threshold: 0.08, + }, + settings: { + html: '.superpowers/prototype/screens/settings.html', + prefix: 'settings', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 已知差异：子导航多「编号规则」项、门店卡多 Logo 行。实测 1.7–2.3% + threshold: 0.08, + }, + users: { + html: '.superpowers/prototype/screens/users.html', + prefix: 'users', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 已知差异：角色口径拉平为后端四级（原型 KPI 初值/角色混用三级）。实测 1.3–2.1% + threshold: 0.08, + }, + about: { + html: '.superpowers/prototype/screens/about.html', + prefix: 'about', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + threshold: 0.08, // 实测 2.2–2.7% + }, + 'stock-in': { + html: '.superpowers/prototype/screens/stock-in-list.html', + prefix: 'stock_in_list', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 2026-07-03 补注册（此前漏注册导致单元格样式偏差长期未被闸住）。 + // 页面留白/单元格对齐后校准：实测 a 3.6 / b 2.6 / c 3.9% + //（残差=真实数据 vs 原型演示数据 + 状态列口径/placeholder 文案已知差异）。 + threshold: 0.08, + }, + 'stock-out': { + html: '.superpowers/prototype/screens/stock-out-list.html', + prefix: 'stock_out_list', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 页面留白/单元格对齐后校准：实测 a 3.6 / b 2.6 / c 3.9% + threshold: 0.08, + }, + login: { + html: '.superpowers/prototype/screens/login.html', + prefix: 'login', + width: 1280, height: 900, dpr: 2, + waitFor: '.auth', + // 2026-07-03 重建后校准：实测 a 1.9 / b 1.4 / c 2.1%。已知差异 + // （design/CONTRACT.md）：密码框空值 hint vs 原型 8 dots、 + // 历史下拉/密码可见后缀箭头（功能位）、ds-fab 仅原型有。 + threshold: 0.08, + }, + // register：暂不入闸（2026-07-03 用户拍板）。原型多「门店编号/授权兑换券」 + // 两字段，后端 RegisterInput 暂不支持 → 表单少两行，整卡结构性错位 + // （实测 a 15.5 / b 6.2 / c 26%），像素闸无意义。golden 测试仍锁三主题回归； + // 后端补 shop_code/voucher 支持后恢复此注册并收紧到 ~8%： + // register: { + // html: '.superpowers/prototype/screens/register.html', + // prefix: 'register', + // width: 1280, height: 900, dpr: 2, + // waitFor: '.auth', + // threshold: 0.08, + // }, + finance: { + html: '.superpowers/prototype/screens/finance.html', + prefix: 'finance', + width: 1280, height: 900, dpr: 2, + waitFor: '.app', + // 重建后校准：实测 a 3.9 / b 3.0 / c 4.2%（残差=柱高比例+文字度量+ + // KPI 应收为实算汇总 vs 原型硬编码，见 CONTRACT 已知差异） + threshold: 0.08, }, };