Compare commits

...

2 Commits

Author SHA1 Message Date
wangjia 7b67466a3e chore: release server-v1.0.70
Deploy Server / release-deploy-server (push) Successful in 56s
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx
2026-06-21 17:32:55 +08:00
wangjia 182adca282 feat(client): 列表日期列改名入库/出库时间删审核时间列 + 日期控件改可键入框带日历
Deploy Client / build-client-web (push) Successful in 41s
Deploy Client / build-windows (push) Successful in 2m34s
Deploy Client / build-macos (push) Successful in 2m20s
Deploy Client / build-android (push) Successful in 1m5s
Deploy Client / build-ios (push) Successful in 2m44s
Deploy Client / release-deploy-client (push) Successful in 1m26s
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx
2026-06-21 16:39:32 +08:00
9 changed files with 282 additions and 152 deletions
+6
View File
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.0.66] - 2026-06-21
### 改进
- 入库/出库列表「日期」列改名为「入库时间/出库时间」,移除恒为空的旧「审核时间」列
- 日期选择改为可直接键入的输入框 + 日历图标:能直接打年份(选老年份方便),支持只填到年或年月(自动补为月初)
## [1.0.65] - 2026-06-21
### 改进
+5
View File
@@ -5,6 +5,11 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.0.70] - 2026-06-21
### 改进
- 商品名称/系列/规格选择接口支持关键词搜索(按名称或编码),为客户端选择器的服务端全量搜索提供支撑
## [1.0.69] - 2026-06-21
### 改进
+19 -3
View File
@@ -2,6 +2,7 @@ package handler
import (
"net/http"
"strings"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
@@ -24,7 +25,12 @@ func NewProductOptionHandler(db *gorm.DB) *ProductOptionHandler {
func (h *ProductOptionHandler) ListNames(c *gin.Context) {
shopID := middleware.GetShopID(c)
items := make([]model.ProductNameOption, 0)
h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
q := h.db.Where("shop_id = ?", shopID)
if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
like := "%" + kw + "%"
q = q.Where("name LIKE ? OR code LIKE ?", like, like)
}
q.Order("id ASC").Find(&items)
util.RespondSuccess(c, items)
}
@@ -85,7 +91,12 @@ func (h *ProductOptionHandler) DeleteName(c *gin.Context) {
func (h *ProductOptionHandler) ListSeries(c *gin.Context) {
shopID := middleware.GetShopID(c)
items := make([]model.ProductSeriesOption, 0)
h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
q := h.db.Where("shop_id = ?", shopID)
if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
like := "%" + kw + "%"
q = q.Where("name LIKE ? OR code LIKE ?", like, like)
}
q.Order("id ASC").Find(&items)
util.RespondSuccess(c, items)
}
@@ -146,7 +157,12 @@ func (h *ProductOptionHandler) DeleteSeries(c *gin.Context) {
func (h *ProductOptionHandler) ListSpecs(c *gin.Context) {
shopID := middleware.GetShopID(c)
items := make([]model.ProductSpecOption, 0)
h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
q := h.db.Where("shop_id = ?", shopID)
if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
like := "%" + kw + "%"
q = q.Where("name LIKE ? OR code LIKE ?", like, like)
}
q.Order("id ASC").Find(&items)
util.RespondSuccess(c, items)
}
@@ -0,0 +1,86 @@
package handler
import (
"net/http"
"testing"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
"gorm.io/gorm"
"github.com/wangjia/jiu/backend/internal/middleware"
"github.com/wangjia/jiu/backend/internal/model"
"github.com/wangjia/jiu/backend/testutil"
)
// setupOptionRouter 注册 product-options 名称路由(含 JWT)。
func setupOptionRouter(db *gorm.DB) *gin.Engine {
h := NewProductOptionHandler(db)
r := gin.New()
r.Use(gin.Recovery())
api := r.Group("/api/v1")
api.Use(middleware.JWT(db))
names := api.Group("/product-options/names")
names.GET("", h.ListNames)
return r
}
func TestProductOptionHandler_ListNamesKeyword(t *testing.T) {
db := testutil.SetupTestDB()
shop := testutil.CreateTestShop(db, "OPT001")
user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
token := getAuthToken(user.ID, shop.ID, "admin")
r := setupOptionRouter(db)
db.Create(&model.ProductNameOption{
TenantBase: model.TenantBase{ShopID: shop.ID}, Code: "P001", Name: "茅台",
})
db.Create(&model.ProductNameOption{
TenantBase: model.TenantBase{ShopID: shop.ID}, Code: "P002", Name: "五粮液",
})
// 1. 无 keyword → 返回全部
w := makeRequest(r, "GET", "/api/v1/product-options/names", token, nil)
assert.Equal(t, http.StatusOK, w.Code)
data := parseResponse(w)["data"].([]interface{})
assert.Len(t, data, 2)
// 2. keyword 命中名称
w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=五粮", token, nil)
assert.Equal(t, http.StatusOK, w.Code)
data = parseResponse(w)["data"].([]interface{})
assert.Len(t, data, 1)
assert.Equal(t, "五粮液", data[0].(map[string]interface{})["name"])
// 3. keyword 命中编码
w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=P001", token, nil)
assert.Equal(t, http.StatusOK, w.Code)
data = parseResponse(w)["data"].([]interface{})
assert.Len(t, data, 1)
assert.Equal(t, "茅台", data[0].(map[string]interface{})["name"])
// 4. keyword 无命中 → 空
w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=不存在", token, nil)
assert.Equal(t, http.StatusOK, w.Code)
data = parseResponse(w)["data"].([]interface{})
assert.Len(t, data, 0)
}
func TestProductOptionHandler_ListNamesIsolation(t *testing.T) {
db := testutil.SetupTestDB()
shopA := testutil.CreateTestShop(db, "OPT_A")
userA := testutil.CreateTestUser(db, shopA.ID, "adminA", "pass", "admin")
tokenA := getAuthToken(userA.ID, shopA.ID, "admin")
shopB := testutil.CreateTestShop(db, "OPT_B")
r := setupOptionRouter(db)
db.Create(&model.ProductNameOption{
TenantBase: model.TenantBase{ShopID: shopB.ID}, Name: "他店商品",
})
// A 店即使 keyword 命中 B 店数据也查不到(shop_id 隔离)
w := makeRequest(r, "GET", "/api/v1/product-options/names?keyword=他店", tokenA, nil)
assert.Equal(t, http.StatusOK, w.Code)
data := parseResponse(w)["data"].([]interface{})
assert.Len(t, data, 0)
}
+31
View File
@@ -241,6 +241,37 @@ func SetupTestDB() *gorm.DB {
content TEXT,
remark TEXT
)`,
`CREATE TABLE IF NOT EXISTS product_name_options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
created_at DATETIME,
updated_at DATETIME,
deleted_at DATETIME,
shop_id INTEGER NOT NULL,
code TEXT,
name TEXT NOT NULL,
remark TEXT
)`,
`CREATE TABLE IF NOT EXISTS product_series_options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
created_at DATETIME,
updated_at DATETIME,
deleted_at DATETIME,
shop_id INTEGER NOT NULL,
code TEXT,
name TEXT NOT NULL,
remark TEXT
)`,
`CREATE TABLE IF NOT EXISTS product_spec_options (
id INTEGER PRIMARY KEY AUTOINCREMENT,
created_at DATETIME,
updated_at DATETIME,
deleted_at DATETIME,
shop_id INTEGER NOT NULL,
code TEXT,
name TEXT NOT NULL,
quantity INTEGER DEFAULT 0,
remark TEXT
)`,
`CREATE TABLE IF NOT EXISTS warehouses (
id INTEGER PRIMARY KEY AUTOINCREMENT,
created_at DATETIME,
@@ -49,8 +49,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
ColDef('warehouse', '仓库'),
ColDef('amount', '金额', minWidth: 800),
ColDef('status', '状态'),
ColDef('date', '日期', minWidth: 900),
ColDef('reviewed_at', '入库时间', minWidth: 900),
ColDef('date', '入库时间', minWidth: 900),
ColDef('operator', '入库员', minWidth: 1100),
ColDef('reviewer', '审核员', minWidth: 1100),
ColDef('actions', '操作', required: true),
@@ -270,12 +269,6 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
case 'date':
return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
case 'reviewed_at':
return DataCell(Text(o.reviewedAt != null
? o.reviewedAt!.length >= 16
? o.reviewedAt!.substring(0, 16)
: o.reviewedAt!.substring(0, 10)
: '-'));
case 'operator':
return DataCell(Text(o.operatorName ?? '-',
style: const TextStyle(fontSize: 13)));
@@ -550,7 +543,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
o.totalAmount != null
? '¥${o.totalAmount!.toStringAsFixed(2)}'
: '-'),
MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
MobileCardField('入库时间', o.orderDate?.substring(0, 10) ?? '-'),
],
actions: _orderActions(context, o),
);
@@ -64,8 +64,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
ColDef('warehouse', '仓库'),
ColDef('amount', '金额', minWidth: 800),
ColDef('status', '状态'),
ColDef('date', '日期', minWidth: 900),
ColDef('reviewed_at', '出库时间', minWidth: 900),
ColDef('date', '出库时间', minWidth: 900),
ColDef('created_at', '创建时间', minWidth: 900),
ColDef('operator', '出库员', minWidth: 1100),
ColDef('reviewer', '审核员', minWidth: 1100),
@@ -271,12 +270,6 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
case 'date':
return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
case 'reviewed_at':
return DataCell(Text(o.reviewedAt != null
? o.reviewedAt!.length >= 16
? o.reviewedAt!.substring(0, 16)
: o.reviewedAt!.substring(0, 10)
: '-'));
case 'created_at':
return DataCell(Text(o.createdAt != null
? o.createdAt!.length >= 16
@@ -524,7 +517,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
o.totalAmount != null
? '¥${o.totalAmount!.toStringAsFixed(2)}'
: '-'),
MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
MobileCardField('出库时间', o.orderDate?.substring(0, 10) ?? '-'),
],
actions: _orderActions(context, o),
);
+104 -125
View File
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
import '../core/theme/app_theme.dart';
import '../core/utils/date_util.dart';
/// 年/月/日 三个可编辑下拉框的日期选择组件,替代原生 showDatePicker
/// 可键入日期框 + 日历图标(替代旧的「年/月/日」三下拉)
///
/// - 每个下拉是 Material 3 `DropdownMenu`:点开可选,键入数字即过滤定位
/// (年/月/日均为有界域,条目覆盖全范围,等价于「手动输入数字」)
/// - 改月/年时把超出当月的「日」自动 clamp 回当月最大值
/// - 值以 `yyyy-MM-dd` 字符串进出([value] / [onChanged]);三者未填齐时回调 null。
/// - **直接键入**:支持「2024」「2024-5」「2024-5-12」「20240512」等,归一为 `yyyy-MM-dd`
/// 缺的月/日补 `01`(老酒只知道年份,填 2024 即 2024-01-01)。失焦时把显示归一化
/// - **日历图标**:弹 Material `showDatePicker`input 模式可直接键入年份,选老年份方便)
/// - 值以 `yyyy-MM-dd` 字符串进出([value] / [onChanged]);无有效年时回调 null。
class DatePickerField extends StatefulWidget {
final String? value; // yyyy-MM-dd
final ValueChanged<String?> onChanged;
@@ -27,151 +27,130 @@ class DatePickerField extends StatefulWidget {
}
class _DatePickerFieldState extends State<DatePickerField> {
int? _year;
int? _month;
int? _day;
late final TextEditingController _ctrl;
final FocusNode _focus = FocusNode();
@override
void initState() {
super.initState();
_parse(widget.value);
_ctrl = TextEditingController(text: widget.value ?? '');
_focus.addListener(() {
// 失焦时把输入归一化显示(如 2024 → 2024-01-01
if (!_focus.hasFocus) {
final n = _normalize(_ctrl.text);
if (n != null && n != _ctrl.text) {
_ctrl.text = n;
}
}
});
}
@override
void didUpdateWidget(DatePickerField old) {
super.didUpdateWidget(old);
if (old.value != widget.value) {
_parse(widget.value);
// 仅在无焦点(非用户正在输入)时同步外部值,避免回流打断输入
if (!_focus.hasFocus &&
old.value != widget.value &&
(widget.value ?? '') != _ctrl.text) {
_ctrl.text = widget.value ?? '';
}
}
void _parse(String? v) {
final d = parseYmd(v);
_year = d?.year;
_month = d?.month;
_day = d?.day;
@override
void dispose() {
_ctrl.dispose();
_focus.dispose();
super.dispose();
}
int get _daysInMonth {
final y = _year ?? DateTime.now().year;
final m = _month ?? 1;
return DateTime(y, m + 1, 0).day; // 下月第 0 天 = 当月最后一天
}
String? get _composed => composeYmd(_year, _month, _day);
void _emit(FormFieldState<String> field) {
// 改月/年后把超界的日 clamp 回当月最大值(与 composeYmd 一致,State 同步显示)
if (_day != null && _day! > _daysInMonth) {
_day = _daysInMonth;
/// 归一用户输入为 `yyyy-MM-dd`(缺月/日补 01);无有效年返回 null。
static String? _normalize(String raw) {
final s = raw.trim();
if (s.isEmpty) return null;
int? y, mo, d;
if (RegExp(r'^[0-9]+$').hasMatch(s)) {
// 纯数字串:yyyymmdd / yyyymm / yyyy
if (s.length >= 8) {
y = int.tryParse(s.substring(0, 4));
mo = int.tryParse(s.substring(4, 6));
d = int.tryParse(s.substring(6, 8));
} else if (s.length == 6) {
y = int.tryParse(s.substring(0, 4));
mo = int.tryParse(s.substring(4, 6));
} else {
y = int.tryParse(s);
}
} else {
final parts =
s.split(RegExp(r'[^0-9]+')).where((e) => e.isNotEmpty).toList();
if (parts.isNotEmpty) y = int.tryParse(parts[0]);
if (parts.length >= 2) mo = int.tryParse(parts[1]);
if (parts.length >= 3) d = int.tryParse(parts[2]);
}
if (y == null || y < 1900 || y > 2200) return null;
mo ??= 1;
d ??= 1;
if (mo < 1 || mo > 12) return null;
final maxDay = DateTime(y, mo + 1, 0).day;
if (d < 1) d = 1;
if (d > maxDay) d = maxDay;
return '${y.toString().padLeft(4, '0')}-'
'${mo.toString().padLeft(2, '0')}-'
'${d.toString().padLeft(2, '0')}';
}
Future<void> _pickFromCalendar(FormFieldState<String> field) async {
final init =
parseYmd(_normalize(_ctrl.text) ?? widget.value) ?? DateTime.now();
final picked = await showDatePicker(
context: context,
initialDate: init,
firstDate: DateTime(1900),
lastDate: DateTime(2200),
initialEntryMode: DatePickerEntryMode.input,
);
if (picked != null) {
final v = formatYmd(picked);
_ctrl.text = v;
field.didChange(v);
widget.onChanged(v);
}
final v = _composed;
field.didChange(v);
widget.onChanged(v);
setState(() {});
}
@override
Widget build(BuildContext context) {
final now = DateTime.now();
final years = [for (var y = now.year - 20; y <= now.year + 5; y++) y];
final months = [for (var m = 1; m <= 12; m++) m];
final days = [for (var d = 1; d <= _daysInMonth; d++) d];
// 每个下拉用 Expanded 撑满分得的宽度(expandedInsets:zero 让 DropdownMenu 填满父级),
// trailingIcon 用紧凑小箭头,避免默认大图标按钮挤掉数字(曾导致「2026」被裁成「007」)。
Widget menu({
required String label,
required int? value,
required List<int> items,
required ValueChanged<int?> onSel,
required FormFieldState<String> field,
}) {
return DropdownMenu<int>(
initialSelection: value,
label: Text(label, style: const TextStyle(fontSize: 11)),
enableFilter: true,
requestFocusOnTap: true,
textStyle: const TextStyle(fontSize: 13),
menuHeight: 280,
expandedInsets: EdgeInsets.zero,
trailingIcon: const Icon(Icons.arrow_drop_down, size: 18),
selectedTrailingIcon: const Icon(Icons.arrow_drop_up, size: 18),
inputDecorationTheme: const InputDecorationTheme(
isDense: true,
contentPadding: EdgeInsets.symmetric(horizontal: 6, vertical: 8),
),
dropdownMenuEntries: [
for (final i in items) DropdownMenuEntry<int>(value: i, label: '$i'),
],
onSelected: onSel,
);
}
return FormField<String>(
initialValue: widget.value,
validator: widget.isRequired
? (v) => (_composed == null ? '选择日期' : null)
? (_) => _normalize(_ctrl.text) == null ? '输入日期' : null
: null,
builder: (field) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
Expanded(
flex: 5,
child: menu(
label: '',
value: _year,
items: years,
field: field,
onSel: (v) {
_year = v;
_emit(field);
},
),
),
const SizedBox(width: 6),
Expanded(
flex: 4,
child: menu(
label: '',
value: _month,
items: months,
field: field,
onSel: (v) {
_month = v;
_emit(field);
},
),
),
const SizedBox(width: 6),
Expanded(
flex: 4,
child: menu(
label: '',
value: _day,
items: days,
field: field,
onSel: (v) {
_day = v;
_emit(field);
},
),
),
],
return TextField(
controller: _ctrl,
focusNode: _focus,
keyboardType: TextInputType.datetime,
style: const TextStyle(fontSize: 13),
decoration: InputDecoration(
isDense: true,
hintText: '年-月-日',
hintStyle: const TextStyle(fontSize: 12),
contentPadding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
errorText: field.errorText,
suffixIcon: IconButton(
icon: const Icon(Icons.calendar_today,
size: 16, color: AppTheme.textSecondary),
padding: EdgeInsets.zero,
constraints: const BoxConstraints(minWidth: 34, minHeight: 34),
tooltip: '选择日期',
onPressed: () => _pickFromCalendar(field),
),
if (field.errorText != null)
Padding(
padding: const EdgeInsets.only(left: 12, top: 4),
child: Text(
field.errorText!,
style: const TextStyle(fontSize: 11, color: AppTheme.danger),
),
),
],
),
onChanged: (v) {
final n = _normalize(v);
field.didChange(n);
widget.onChanged(n);
},
);
},
);
+27 -6
View File
@@ -31,26 +31,47 @@ void main() {
});
group('DatePickerField', () {
testWidgets('渲染三个年/月/日下拉框', (tester) async {
testWidgets('渲染可键入框 + 日历图标', (tester) async {
await tester.pumpWidget(MaterialApp(
home: Scaffold(
body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
),
));
await tester.pumpAndSettle();
expect(find.byType(DropdownMenu<int>), findsNWidgets(3));
expect(find.byType(TextField), findsOneWidget);
expect(find.byIcon(Icons.calendar_today), findsOneWidget);
});
testWidgets('初始值回显到三个下拉', (tester) async {
testWidgets('初始值回显到输入', (tester) async {
await tester.pumpWidget(MaterialApp(
home: Scaffold(
body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
),
));
await tester.pumpAndSettle();
expect(find.widgetWithText(DropdownMenu<int>, '2026'), findsOneWidget);
expect(find.widgetWithText(DropdownMenu<int>, '6'), findsOneWidget);
expect(find.widgetWithText(DropdownMenu<int>, '19'), findsOneWidget);
expect(find.text('2026-06-19'), findsOneWidget);
});
testWidgets('只输年份归一为 yyyy-01-01', (tester) async {
String? out;
await tester.pumpWidget(MaterialApp(
home: Scaffold(
body: DatePickerField(onChanged: (v) => out = v),
),
));
await tester.enterText(find.byType(TextField), '2024');
expect(out, '2024-01-01');
});
testWidgets('年月归一为 yyyy-MM-01', (tester) async {
String? out;
await tester.pumpWidget(MaterialApp(
home: Scaffold(
body: DatePickerField(onChanged: (v) => out = v),
),
));
await tester.enterText(find.byType(TextField), '2024-5');
expect(out, '2024-05-01');
});
});
}