WuYongJie
|
829f828bbe
|
fix(intake): 延长 AI 白底图请求等待
|
2026-06-15 15:51:15 +08:00 |
|
WuYongJie
|
455686e1e3
|
fix(intake): 降低非集成素材读取超时
|
2026-06-15 15:30:39 +08:00 |
|
WuYongJie
|
68a17b1dff
|
feat(intake): 对接 AI 白底图花色改色与素材库上传
|
2026-06-15 14:58:37 +08:00 |
|
WuYongJie
|
dcfa96206a
|
fix(intake): allow asset previews with view permission
|
2026-06-15 12:10:50 +08:00 |
|
WuYongJie
|
35740a7bc5
|
fix(intake): proxy non-integrated asset reads
|
2026-06-15 11:54:29 +08:00 |
|
WuYongJie
|
3d9aca430d
|
merge: 稳定移动端与素材访问链路
|
2026-06-15 11:15:29 +08:00 |
|
WuYongJie
|
f802d65490
|
merge: sync xuxiake mainline before platform material fix
# Conflicts:
# furniture-3d-system/src/app/assisted-assembly/mobile/AssistedAssemblyMobileView.tsx
# furniture-3d-system/src/app/mobile/HomeMobileView.tsx
# furniture-3d-system/src/server/services/asset-center.service.ts
|
2026-06-15 11:03:11 +08:00 |
|
WuYongJie
|
77a78f4938
|
fix(platform): 稳定移动端与素材访问链路
|
2026-06-15 11:02:10 +08:00 |
|
WuYongJie
|
4f8d18f454
|
merge: 修复工作台导航首屏权限加载态
|
2026-06-15 10:38:12 +08:00 |
|
WuYongJie
|
5fbec8a7c9
|
fix(layout): 修复工作台导航首屏权限加载态
|
2026-06-15 10:37:29 +08:00 |
|
WuYongJie
|
a611640927
|
merge: sync asset center sku group fix with mainline
|
2026-06-15 08:42:08 +08:00 |
|
WuYongJie
|
c58c7aaa22
|
fix(asset-center): read retired sku groups from metadata
|
2026-06-13 23:29:44 +08:00 |
|
WuYongJie
|
55d92d4e75
|
fix(ui): show immediate workbench nav feedback
|
2026-06-13 18:34:01 +08:00 |
|
WuYongJie
|
7ba1e86410
|
merge: promote nav smoothness optimization
|
2026-06-13 18:04:36 +08:00 |
|
WuYongJie
|
713b8986c9
|
fix(ui): smooth intake and quality navigation
|
2026-06-13 18:04:05 +08:00 |
|
WuYongJie
|
f3d38be04b
|
merge: promote intake filter overflow fix
|
2026-06-13 16:53:12 +08:00 |
|
WuYongJie
|
5ea46cdc68
|
fix(ui): prevent intake mobile filter overflow
|
2026-06-13 16:53:01 +08:00 |
|
WuYongJie
|
6897c38f97
|
merge: promote intake overflow fix
|
2026-06-13 16:45:02 +08:00 |
|
WuYongJie
|
e973b1a0a1
|
fix(ui): constrain intake table overflow on mobile
|
2026-06-13 16:44:42 +08:00 |
|
WuYongJie
|
984ae53af3
|
merge: promote smoothness and migration alignment
|
2026-06-13 16:35:09 +08:00 |
|
WuYongJie
|
df05999c0f
|
fix(ui): stabilize mobile hydration and layout overflow
|
2026-06-13 16:33:41 +08:00 |
|
WuYongJie
|
b9476733fc
|
fix(db): add asset sku group restore migration
|
2026-06-13 16:33:36 +08:00 |
|
WuYongJie
|
3972ca2edd
|
merge: promote storage qiniu direct access normalization
|
2026-06-13 10:31:09 +08:00 |
|
WuYongJie
|
100e90a3be
|
fix(storage): 统一公开资源直链与持久化地址归一
|
2026-06-13 10:24:41 +08:00 |
|
WuYongJie
|
e1b78d602e
|
fix: intake 所有工作区表格表头 sticky 固定
- 所有 workspace 表格 thead 添加 sticky top-0 z-10,滚动时表头固定
- 外层容器 overflow-hidden 改为 overflow-auto,配合滚动生效
- 基础信息 SKU 表格合并双层 div 为单层,添加 max-h-[60vh] 高度约束
- BOM 表格同步添加 sticky thead
|
2026-06-12 18:40:21 +08:00 |
|
WuYongJie
|
e7d2c8626c
|
merge: 解决冲突,保留使用 SharedAssetFamilyDTO 的类型修复
|
2026-06-12 17:30:49 +08:00 |
|
WuYongJie
|
034817f119
|
fix(asset-center): 修复移动端 AssetFamilyDTO 类型不兼容导致生产构建失败
|
2026-06-12 17:25:56 +08:00 |
|
WuYongJie
|
5e5687dcc1
|
fix: require manual confirmation for factory workflows
|
2026-06-12 17:16:47 +08:00 |
|
WuYongJie
|
05d90fe57e
|
feat(ai-render): 支持多材质贴图传入外部生图API
- external-image-generate: 新增 additionalReferenceImages 字段支持多文件上传
- assisted-assembly-ai-render: 自动提取 assetSnapshot 中的材质贴图
- 按 materialConfig.id 去重聚合,最多 6 种材质
- 构建材质映射描述追加到 prompt,告诉 AI 每张贴图对应哪个部位
- 支持 FormData 混合模式(文件 + URL)和 curl 降级
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
a2e9335fc5
|
feat: Stitch 移动端视觉重构 — 5 页面全部完成独立移动端视图
新增独立移动端视图文件(遵循用户要求:不堆砌在原臃肿文件中):
- asset-center/mobile/AssetCenterMobileView.tsx (274行) — 系列选择 + Tab + 搜索 + 卡片列表
- assisted-assembly/mobile/AssistedAssemblyMobileView.tsx (148行) — 系列列表 + 工作区提示
- draft-groups/mobile/DraftGroupsMobileView.tsx (173行) — 搜索 + 统计 + 草稿列表
原文件改动最小化(仅 +3 行导入 + 15 行条件分支):
- AssetCenterClient.tsx (7690行) → 添加 useBreakpoint + <AssetCenterMobileView />
- AssistedAssemblyClient.tsx (1580行) → 添加 useBreakpoint + <AssistedAssemblyMobileView />
- DraftGroupsFormalClient.tsx (4943行) → 添加 useBreakpoint + <DraftGroupsMobileView />
全局 Stitch 基础设施(已提交):
- globals.css: stitch-card 圆角修正 2px→12px,新增 20+ 原子类
- AppShell: 移动端背景 #F8F9FA
- MobileTabBar: 精确 Stitch BottomNavBar
- PlatformSplitLayout: 移动端 #F8F9FA 背景
- IntakeWorkspaceShell: 移动端紧凑间距
- StitchMobileLayout: 可复用布局组件
所有改动仅 max-lg 断点生效,桌面端零影响
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
f27aa44ec5
|
refactor: 拆分移动端视图为独立文件,避免臃肿
- HomeClient.workspace.tsx: 925行 → 738行,移动端布局拆为 mobile/HomeMobileView.tsx (445行独立文件)
- IntakeWorkspaceTabBar.tsx: 109行 → 77行,移动端Tab拆为 IntakeWorkspaceTabBarMobile.tsx (56行独立文件)
- 原文件仅保留一行条件引用 <HomeMobileView /> / <IntakeWorkspaceTabBarMobile />
- 桌面端代码零改动
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
03d4ee83e1
|
style: Stitch 移动端像素级复刻
- AppShell 移动端顶栏改为 Stitch TopAppBar(80% glass + 24px blur)
- globals.css 新增 Stitch 原子类库
- MobileTabBar 对齐 Stitch BottomNavBar
- 全部 max-lg 断点,桌面端零影响
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
1b992cb89a
|
style: MobileTabBar 对齐 Stitch BottomNavBar + 移动端卡片无边
- MobileTabBar: bg-80% opacity + backdrop-blur-24px + 微阴影
- 移除 TabBar 大圆角激活 pill,改为纯文字+图标
- section 单列模式移动端 rounded-none(全宽无边)
- mainContent 模式左侧栏移动端 rounded-none
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
b1deae4c73
|
refactor: 对齐 Stitch 设计稿视觉规范
- section 改为透明布局容器,背景用 page background
- 侧边栏/主内容/右面板各自独立:rounded-xl + shadow
- 面板间用 gap-3 间距,不再依赖边框分隔
- metrics 芯片移除边框,改用白色卡片 + 微阴影
- 标题使用 Manrope 字体(font-family-display)
- 配色使用 CSS 变量,对齐 Stitch surface 层级
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
e333f68cc3
|
refactor: PlatformSplitLayout 应用 Stitch 设计规范
- 移除 section 的 border/shadow/rounded-[2rem](No-Line Rule)
- 侧边栏和右面板移除 border,改用表面层级色差分离
- 背景改用 surface-container-low 色调
- 移除 metrics 芯片的边框
- IntakeMainLayout 移动端隐藏右面板
|
2026-06-12 16:37:56 +08:00 |
|
WuYongJie
|
1a8367a9da
|
refactor: split intake detail controllers
|
2026-06-12 13:21:37 +08:00 |
|
WuYongJie
|
582d2ee8cb
|
fix: allow product factory MOQ sync saves
|
2026-06-12 12:39:15 +08:00 |
|
WuYongJie
|
307d92b7f5
|
fix: PlatformSplitLayout 移动端响应式适配
- header/metrics/feedback 区域移动端缩减 padding
- metrics 区域移动端支持横向滚动
- 移除移动端大圆角卡片边框(平铺全宽)
- 侧边栏移动端撑满全宽(有 mainContent 时)
- 右侧面板移动端隐藏(后续可通过抽屉/切换展开)
- 使用 max-lg:! 优先级覆盖父组件的 !important 样式
|
2026-06-11 22:56:04 +08:00 |
|
WuYongJie
|
311cd74358
|
Merge remote-tracking branch 'origin/codex/xuxiake-mainline' into codex/wuyongjie-storage-unify-qiniu-20260611
|
2026-06-11 20:43:45 +08:00 |
|
WuYongJie
|
61a2834710
|
fix(storage): 公开素材直出七牛读取地址
|
2026-06-11 20:43:23 +08:00 |
|
WuYongJie
|
cb3b38a952
|
fix(intake): unify spu rule truth source
|
2026-06-11 17:41:11 +08:00 |
|
WuYongJie
|
3768e5d601
|
feat(intake): add sku order quantity field
|
2026-06-11 16:56:26 +08:00 |
|
WuYongJie
|
3724764079
|
merge: sync origin/codex/xuxiake-mainline
|
2026-06-11 14:08:21 +08:00 |
|
WuYongJie
|
655a882cf0
|
fix(storage): unify runtime asset reads to qiniu
|
2026-06-11 14:04:45 +08:00 |
|
WuYongJie
|
2ff31032c6
|
fix(intake): keep barcode print as reserved entry
|
2026-06-11 13:38:15 +08:00 |
|
WuYongJie
|
90ff111283
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-intake-primary-domain-sync-20260610
# Conflicts:
# furniture-3d-system/src/app/intake/AccessoryLibraryPanel.tsx
# furniture-3d-system/src/app/intake/IntakeClient.test.tsx
# furniture-3d-system/src/app/intake/IntakeClient.tsx
# furniture-3d-system/src/app/intake/SpuRuleLibraryWorkspace.test.tsx
# furniture-3d-system/src/app/intake/SpuRuleLibraryWorkspace.tsx
# furniture-3d-system/src/app/intake/bom-library/AccessoryLibraryLogic.tsx
# furniture-3d-system/src/app/intake/bom-library/AccessoryLibraryPanel.tsx
# furniture-3d-system/src/app/intake/bom-library/BomLibraryDomain.tsx
# furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
# furniture-3d-system/src/app/intake/non-integrated/nonIntegratedApi.ts
# furniture-3d-system/src/app/intake/non-integrated/nonIntegratedAssetServer.ts
# furniture-3d-system/src/app/intake/product-development/ProductDevelopmentDomain.tsx
# furniture-3d-system/src/app/intake/product-development/SpuRuleLibraryWorkspace.test.tsx
# furniture-3d-system/src/app/intake/product-development/SpuRuleLibraryWorkspace.tsx
# furniture-3d-system/src/app/intake/product-development/spu-rule-library/SpuRuleLibraryWorkspace.test.tsx
# furniture-3d-system/src/app/intake/product-development/spu-rule-library/SpuRuleLibraryWorkspace.tsx
# furniture-3d-system/src/app/intake/product-development/spu-rule-library/spuRuleLibraryLogic.test.ts
# furniture-3d-system/src/app/intake/product-development/spuRuleLibraryLogic.test.ts
# furniture-3d-system/src/app/intake/product-patent/ProductPatentDomain.tsx
# furniture-3d-system/src/app/intake/raw-material-library/RawMaterialLibraryDomain.tsx
# furniture-3d-system/src/app/intake/raw-material-library/RawMaterialLibraryPanel.tsx
# furniture-3d-system/src/app/intake/reference-estimator/ReferenceEstimatorDomain.tsx
# furniture-3d-system/src/app/intake/spuRuleLibraryLogic.test.ts
|
2026-06-11 13:19:58 +08:00 |
|
WuYongJie
|
af27eff911
|
fix(intake): finalize non-integrated detail split
|
2026-06-11 12:52:56 +08:00 |
|
WuYongJie
|
5745abf0ae
|
fix(intake): allow merchandisers to download factory files
|
2026-06-11 12:43:06 +08:00 |
|
WuYongJie
|
d5aba614fe
|
fix(intake): allow deleting sku preview images
|
2026-06-11 11:56:12 +08:00 |
|
WuYongJie
|
16679896cf
|
refactor(intake): complete primary domain split
|
2026-06-11 11:46:25 +08:00 |
|