最新同步

杨鑫
1 parent 40929347
Showing 85 changed files with 6829 additions and 1585 deletions
2026-07-09代码修改.md
6-26代码优化.md
泰额版/Food Labeling Management App UniApp/.env.development
泰额版/Food Labeling Management App UniApp/.env.example
泰额版/Food Labeling Management App UniApp/.env.production
泰额版/Food Labeling Management App UniApp/.hbuilderx/launch.json
泰额版/Food Labeling Management App UniApp/src/App.vue
泰额版/Food Labeling Management App UniApp/src/components/AppDatePicker.vue
泰额版/Food Labeling Management App UniApp/src/components/AppIcon.vue
泰额版/Food Labeling Management App UniApp/src/env.d.ts
泰额版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue
泰额版/Food Labeling Management App UniApp/src/pages/labels/labels.vue
泰额版/Food Labeling Management App UniApp/src/pages/labels/preview.vue
泰额版/Food Labeling Management App UniApp/src/pages/more/print-log.vue
泰额版/Food Labeling Management App UniApp/src/pages/more/printers.vue
泰额版/Food Labeling Management App UniApp/src/services/usAppLabeling.ts
泰额版/Food Labeling Management App UniApp/src/types/usAppLabeling.ts
泰额版/Food Labeling Management App UniApp/src/utils/apiBase.ts
泰额版/Food Labeling Management App UniApp/src/utils/deviceInfo.ts
泰额版/Food Labeling Management App UniApp/src/utils/imageScaleMode.ts
+# 2026-07-09 代码修改
+
+本文档说明 **2026-07-09** 对美国版标签（Label）模块的接口补充：**标签列表**与**批量导入**（Bulk Add Labels）。
+
+---
+
+## 一、背景与目标
+
+| 项目 | 说明 |
+|------|------|
+| 业务场景 | Web 管理端 **Bulk Add Labels** 页面：同一模板下多行录入标签基本字段 + 模板数据字段后一次性保存 |
+| 原行为 | 前端 `LabelsList.tsx` 对每行循环调用 `POST /api/app/label` 单条创建，模板数据再单独 `updateLabelTemplate` |
+| 新行为 | 新增 `POST /api/app/label/batch-create`，一次提交多行；可选合并写入 `fl_label_template_product_default` |
+| 列表接口 | `GET /api/app/label?SkipCount=1&MaxResultCount=10` 为标签分页列表（按标签维度分页，非 label-product 笛卡尔行） |
+
+---
+
+## 二、标签列表
+
+### 基本信息
+
+| 项目 | 内容 |
+|------|------|
+| 方法 | `GET` |
+| 路径 | `/api/app/label` |
+| 鉴权 | Bearer Token |
+| 示例 | `/api/app/label?SkipCount=1&MaxResultCount=10` |
+
+### 分页参数
+
+| 参数 | 类型 | 说明 |
+|------|------|------|
+| `SkipCount` | `int` | 页码，**从 1 起**（非 0） |
+| `MaxResultCount` | `int` | 每页条数 |
+
+### 筛选参数（Query）
+
+| 参数 | 说明 |
+|------|------|
+| `PartnerId` | 按 Company（`fl_partner.Id`）下门店集合筛选 |
+| `GroupId` | 按 Region（`fl_group.Id`）筛选：命中 `fl_label_region`、`fl_label_location` 或 `AppliedRegionType=ALL` |
+| `LocationId` | 按门店（`location.Id`）筛选；传则优先于 `GroupId` |
+| `ProductId` | 按产品筛选（一个产品可对应多个标签） |
+| `Keyword` | 关键词 |
+| `LabelCategoryId` | 标签分类 |
+| `LabelTypeId` | 标签类型（可选） |
+| `TemplateCode` | 模板编码 |
+| `State` | 启用状态 |
+
+### 出参结构
+
+```json
+{
+  "pageIndex": 1,
+  "pageSize": 10,
+  "totalCount": 100,
+  "totalPages": 10,
+  "items": [
+    {
+      "id": "LBL_xxx",
+      "labelName": "Turkey Breast",
+      "locationName": "Store A, Store B",
+      "locationIds": ["loc-id-1", "loc-id-2"],
+      "region": "Region A",
+      "regionIds": ["group-id-1"],
+      "groupIds": ["group-id-1"],
+      "appliedRegionType": "SPECIFIED",
+      "labelCategoryName": "Prep",
+      "productCategoryName": "Meat",
+      "products": "Turkey Breast",
+      "templateName": "3\"x6\" Nutrition Details",
+      "templateCode": "tpl_229mx5_mr05n3cq",
+      "labelTypeName": "Use By",
+      "state": true,
+      "lastEdited": "2026-07-09T10:00:00",
+      "hasError": false
+    }
+  ]
+}
+```
+
+### 列表 curl 示例
+
+```bash
+# 登录（管理端）
+curl -X POST "http://192.168.31.88:19001/api/app/account/login" \
+  -H "Content-Type: application/json" \
+  -d '{"userName":"sandi@123.com","password":"123456"}'
+
+# 标签列表第一页（10 条）
+curl -G "http://192.168.31.88:19001/api/app/label" \
+  -H "Authorization: Bearer {token}" \
+  --data-urlencode "SkipCount=1" \
+  --data-urlencode "MaxResultCount=10"
+```
+
+---
+
+## 三、标签批量导入
+
+### 基本信息
+
+| 项目 | 内容 |
+|------|------|
+| 方法 | `POST` |
+| 路径 | `/api/app/label/batch-create` |
+| 鉴权 | Bearer Token |
+| 对应页面 | Web 端 **Bulk Add Labels**（`LabelsList.tsx` → `LabelBulkAddPage`） |
+| 单次上限 | 500 行 |
+
+### Body 顶层字段
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| `templateCode` | `string` | 是 | 所有行共用的模板编码 |
+| `items` | `array` | 是 | 导入行列表 |
+| `saveTemplateProductDefaults` | `bool` | 否 | 是否合并写入模板 ProductDefaults，默认 `true` |
+
+### `items[]` 每行字段
+
+#### 标签基本字段（与单条 `POST /api/app/label` 一致）
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| `labelName` | `string` | 是 | 标签名称 |
+| `labelCategoryId` | `string` | 是 | 标签分类 Id |
+| `labelTypeId` | `string` | 建议 | 标签类型 Id |
+| `productIds` | `string[]` | 是 | 至少 1 个产品 |
+| `locationIds` | `string[]` | 建议 | 适用门店（主字段） |
+| `locationId` | `string` | 否 | 兼容单门店，与 `locationIds` 合并 |
+| `appliedRegionType` | `string` | 否 | `ALL` / `SPECIFIED` |
+| `regionIds` / `groupIds` | `string[]` | 条件 | `SPECIFIED` 时传 Region |
+| `partnerId` / `partnerIds` | `string` / `string[]` | 否 | Company 范围 |
+| `labelCode` | `string` | 否 | 不传则自动生成 `LBL_{guid}` |
+| `labelInfoJson` | `object` | 否 | 标签级模板 JSON（通常走 ProductDefaults） |
+| `state` | `bool` | 否 | 默认 `true` |
+
+#### 模板数据字段（对应 Bulk Add 表格列）
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| `templateDefaultValues` | `object` | 已组装的 elementId → 值；**优先使用**，不再从下方字段推导 |
+| `templateDataValues` | `object` | 文本类录入（如 Text、Barcode 手填值） |
+| `templateDateOffsets` | `object` | 日期/时间/时长：`{ "el-id": { "unit": "Days", "value": "3" } }` |
+| `nutritionByElementId` | `object` | 营养成分：`{ "el-nutrition": { "calories": "120" } }` |
+
+**模板数据落库规则**
+
+- `saveTemplateProductDefaults=true` 时：按 `productId + labelTypeId` 合并写入 `fl_label_template_product_default`（与前端 `saveTemplateDefaultsAfterLabels` 一致）
+- 日期偏移存为 JSON 字符串：`{"unit":"Days","value":"3"}`
+- Template 面板条码/二维码自动填充产品 `codeValue`；Label Name / Label Type 自动绑定行内 `labelName`、类型名
+
+### 请求示例
+
+```json
+{
+  "templateCode": "tpl_229mx5_mr05n3cq",
+  "saveTemplateProductDefaults": true,
+  "items": [
+    {
+      "labelName": "Chicken Salad",
+      "labelCategoryId": "3a2228ca-42fa-5273-1105-3d8252ffdd99",
+      "labelTypeId": "3a2228e5-33c5-278e-a09f-47fd6e2ddbc7",
+      "locationIds": ["3a222878-b4c1-d27b-d437-93da14886350"],
+      "productIds": ["3a2228a8-6a51-6cc4-fee2-b77769766b33"],
+      "appliedRegionType": "SPECIFIED",
+      "regionIds": [],
+      "templateDataValues": {
+        "el-1782794752668-0gixa9y": "Fresh batch text",
+        "el-1782794771519-4360c0p": "123456789"
+      },
+      "templateDateOffsets": {
+        "el-1782794481721-sdf7mvy": { "unit": "Days", "value": "3" }
+      },
+      "state": true
+    },
+    {
+      "labelName": "Turkey Wrap",
+      "labelCategoryId": "3a2228ca-42fa-5273-1105-3d8252ffdd99",
+      "labelTypeId": "3a2228e6-3ed0-b056-a08b-ea8b1eea46a0",
+      "locationIds": ["3a222878-b4c1-d27b-d437-93da14886350"],
+      "productIds": ["3a2228a8-6a51-6cc4-fee2-b77769766b33"],
+      "templateDataValues": {
+        "el-1782794752668-0gixa9y": "Ready to serve"
+      },
+      "templateDateOffsets": {
+        "el-1782794481721-sdf7mvy": { "unit": "Days", "value": "5" }
+      }
+    }
+  ]
+}
+```
+
+### 响应示例
+
+```json
+{
+  "successCount": 2,
+  "failCount": 0,
+  "successItems": [
+    { "rowNumber": 1, "labelCode": "LBL_abc...", "labelName": "Chicken Salad" },
+    { "rowNumber": 2, "labelCode": "LBL_def...", "labelName": "Turkey Wrap" }
+  ],
+  "errors": []
+}
+```
+
+**部分成功示例**（第 2 行校验失败、第 1 行仍创建）：
+
+```json
+{
+  "successCount": 1,
+  "failCount": 1,
+  "successItems": [
+    { "rowNumber": 1, "labelCode": "LBL_abc...", "labelName": "Chicken Salad" }
+  ],
+  "errors": [
+    { "rowNumber": 2, "labelName": "", "message": "标签名称不能为空" }
+  ]
+}
+```
+
+### 批量导入 curl 示例
+
+```bash
+curl -X POST "http://192.168.31.88:19001/api/app/label/batch-create" \
+  -H "Authorization: Bearer {token}" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "templateCode": "tpl_229mx5_mr05n3cq",
+    "saveTemplateProductDefaults": true,
+    "items": [
+      {
+        "labelName": "Batch Test",
+        "labelCategoryId": "3a2228ca-42fa-5273-1105-3d8252ffdd99",
+        "labelTypeId": "3a2228e5-33c5-278e-a09f-47fd6e2ddbc7",
+        "locationIds": ["3a222878-b4c1-d27b-d437-93da14886350"],
+        "productIds": ["3a2228a8-6a51-6cc4-fee2-b77769766b33"],
+        "templateDataValues": { "el-1782794752668-0gixa9y": "Fresh" },
+        "templateDateOffsets": { "el-1782794481721-sdf7mvy": { "unit": "Days", "value": "3" } }
+      }
+    ]
+  }'
+```
+
+---
+
+## 四、与单条创建对比
+
+| 能力 | `POST /api/app/label` | `POST /api/app/label/batch-create` |
+|------|----------------------|-----------------------------------|
+| 行数 | 1 条 | 最多 500 条 |
+| 模板编码 | 每 Body 自带 | 顶层 `templateCode` 共用 |
+| 模板数据 | 仅 `labelInfoJson` | 支持结构化模板字段 + ProductDefaults 合并 |
+| 失败处理 | 整请求失败 | 行级错误收集，支持部分成功 |
+| 返回值 | 标签详情 DTO | `successCount` / `failCount` / `errors` / `successItems` |
+
+---
+
+## 五、代码改动摘要
+
+| 文件 | 改动 |
+|------|------|
+| `ILabelAppService.cs` | 新增 `BatchCreateAsync` |
+| `LabelAppService.cs` | 实现批量导入；逐行复用 `CreateAsync`；可选合并模板 ProductDefaults |
+| `LabelBatchCreateInputVo.cs` | 批量入参 DTO |
+| `LabelBatchCreateItemInputVo.cs` | 单行（基本字段 + 模板数据字段） |
+| `LabelBatchDateOffsetInputVo.cs` | 日期偏移单位+数值 |
+| `LabelBatchCreateResultDto.cs` | 批量结果 DTO |
+| `LabelBatchTemplateDefaultsHelper.cs` | 组装/合并模板 ProductDefaults |
+
+---
+
+## 六、部署与联调注意
+
+1. `dotnet build` 编译 `FoodLabeling.Application` 与 `Yi.Abp.Web` 后**重启 API 进程**（未重启时 `batch-create` 会返回 405）
+2. 管理端登录：`POST /api/app/account/login`（非 `/api/oauth/Login`）
+3. 本地 Base URL 以 `appsettings.json` 中 `App:SelfUrl` 为准（当前示例为 `http://192.168.31.88:19001`）
+4. 前端 `LabelsList.tsx` 的 `submit()` 仍循环调单条 `createLabel`；对接批量接口时需改为调用 `batch-create`
+
+---
+
+## 七、相关文档
+
+- 标签多门店 `locationIds`：`项目相关文档/6-23代码优化.md`
+- 模板三维 scope：`项目相关文档/6-4代码优化.md`
-# 6-26 代码优化
-
-本文档说明 **2026-06-26** 对美国版标签模板 `contents` 字段的**数据来源澄清**与**编辑不生效**修复。
-
----
-
-## 一、问题现象
-
-| 项目 | 说明 |
-|------|------|
-| 接口 | `GET/PUT /api/app/label-template/{id}`（如 `tpl_c23gov_mqri4g5a`） |
-| 期望 | `contents` = `"Nutrition Facts, Text (For Template)"`（模板列表 Contents 列展示） |
-| 实际 | 返回/展示 `"nutritionfacts, text"` |
-| 用户反馈 | 在编辑器修改 Element name 后保存，列表 Contents **没有变化** |
-
----
-
-## 二、`contents` 取自哪个字段？
-
-### 结论（优先级）
-
-| 优先级 | 来源 | 字段 | 说明 |
-|--------|------|------|------|
-| 1 | 编辑器右侧 **Element name** | `elements[].elementName` | 用户可编辑；保存时写入 `fl_label_template_element.ElementName` |
-| 2 | 旧数据兼容（slug） | `elements[].typeAdd` | 当 `elementName` 为旧 slug（如 `nutritionfacts`、`text`）时，按 typeAdd 推导展示名 |
-| 3 | 持久化缓存 | `fl_label_template.Contents` | 保存时写入；**列表以 element 实时汇总为准**，避免旧缓存覆盖新编辑 |
-
-### typeAdd 推导规则
-
-`typeAdd` 形如 `{分组前缀}_{面板控件英文名}`：
-
-| typeAdd 示例 | 推导展示名 |
-|--------------|------------|
-| `label_Nutrition Facts` | `Nutrition Facts (For Label)` |
-| `template_Text` | `Text (For Template)` |
-| `auto_Company` | `Company (Entered Automatically)` |
-| `print_Multiple Options` | `Multiple Options (Entered When Printing)` |
-
-**拼接格式**：`{控件面板名称} ({分组标题})`  
-分组标题与左侧 Elements 面板一致：`For Template` / `For Label` / `Entered Automatically` / `Entered When Printing`。
-
-### 与 elementName 的关系
-
-| 场景 | elementName 示例 | contents 单项 |
-|------|------------------|---------------|
-| 新拖入控件（修复后） | `Text (For Template)` | `Text (For Template)` |
-| 旧模板 slug | `text` | `Text (For Template)`（由 typeAdd 推导） |
-| 用户手动改 Element name | `My Custom Field` | `My Custom Field`（以用户输入为准） |
-
-**注意**：`elementName` 同时用于录入表表头；`contents` 是各控件展示名的逗号拼接，**不是** slug 字段。
-
----
-
-## 三、根因说明
-
-1. **新建控件时** `allocateElementName` 把 Element name 默认成 slug（`nutritionfacts`），与 UI 期望的「Nutrition Facts (For Label)」不一致。  
-2. **列表 contents** 曾优先读 `fl_label_template.Contents` 缓存，保存后 element 已变但缓存仍是旧 slug 串。  
-3. **列表回退逻辑** 直接读 `ElementName` 原文，slug 原样展示为 `nutritionfacts, text`。
-
----
-
-## 四、修复内容
-
-### 后端
-
-| 文件 | 改动 |
-|------|------|
-| `LabelTemplateContentsHelper.cs` | `ResolveElementContentsLabel`：Element name 优先；slug 则 typeAdd 推导 |
-| `LabelTemplateContentsHelper.cs` | `ResolveContentsMapFromElementsAsync`：列表按 element 表**实时**汇总 |
-| `LabelTemplateListItemsHelper.cs` | `items` / `itemNames` 与 contents 使用同一套展示名逻辑 |
-| `LabelTemplateAppService.cs` | 列表/详情 **优先** element 汇总 contents；保存仍写入 `Contents` 列（若已迁移） |
-
-### 前端
-
-| 文件 | 改动 |
-|------|------|
-| `labelTemplate.ts` | 新增 `allocateElementDisplayName`、`resolveElementContentsLabel`、`deriveContentsLabelFromTypeAdd` |
-| `LabelTemplateEditor/index.tsx` | 新控件默认 Element name = `控件名 (For Template/For Label…)` |
-| `LabelTemplateEditor/index.tsx` | 保存时 `contents: buildTemplateContentsFromElements(elements)` |
-
----
-
-## 五、接口说明
-
-### 1. 模板详情
-
-| 项目 | 内容 |
-|------|------|
-| 方法 | `GET` |
-| 路径 | `/api/app/label-template/{id}` |
-| 示例 | `/api/app/label-template/tpl_c23gov_mqri4g5a` |
-
-**出参（节选）**
-
-```json
-{
-  "id": "tpl_c23gov_mqri4g5a",
-  "templateName": "Unnamed template",
-  "contents": "Nutrition Facts (For Label), Text (For Template)",
-  "elements": [
-    {
-      "elementName": "nutritionfacts",
-      "typeAdd": "label_Nutrition Facts",
-      "type": "NUTRITIONFACTS"
-    },
-    {
-      "elementName": "text",
-      "typeAdd": "template_Text",
-      "type": "TEXT_STATIC"
-    }
-  ]
-}
-```
-
-> 旧 slug 的 `elementName` 可保留；`contents` 按 typeAdd 展示。保存后新模板会直接写入展示型 Element name。
-
-### 2. 模板列表
-
-| 项目 | 内容 |
-|------|------|
-| 方法 | `GET` |
-| 路径 | `/api/app/label-template` |
-| 参数 | `SkipCount=1&MaxResultCount=10` |
-
-**出参 `items[]`**
-
-| 字段 | 说明 |
-|------|------|
-| `contents` | Contents 列文案，与详情一致 |
-| `items` | 兼容字段，与 `contents` 相同 |
-| `contentsCount` | 控件数量 |
-
-### 3. 新建 / 编辑
-
-| 方法 | 路径 |
-|------|------|
-| `POST` | `/api/app/label-template` |
-| `PUT` | `/api/app/label-template/{id}` |
-
-**Body 节选**
-
-```json
-{
-  "id": "tpl_c23gov_mqri4g5a",
-  "name": "Unnamed template",
-  "contents": "Nutrition Facts (For Label), Text (For Template)",
-  "elements": [
-    {
-      "id": "el_1",
-      "elementName": "Nutrition Facts (For Label)",
-      "typeAdd": "label_Nutrition Facts",
-      "type": "NUTRITIONFACTS",
-      "orderNum": 1
-    },
-    {
-      "id": "el_2",
-      "elementName": "Text (For Template)",
-      "typeAdd": "template_Text",
-      "type": "TEXT_STATIC",
-      "orderNum": 2
-    }
-  ]
-}
-```
-
-| 字段 | 说明 |
-|------|------|
-| `contents` | 可选；不传则后端按 `elements` 推导 |
-| `elements[].elementName` | **主数据源**（Element name） |
-| `elements[].typeAdd` | slug 兼容推导用 |
-
----
-
-## 六、部署与验证
-
-1. 重新编译并重启 `Yi.Abp.Web`  
-2. （可选）执行 `scripts/fl_label_template_contents.sql` 持久化 `Contents` 列  
-3. 打开 `tpl_c23gov_mqri4g5a` 保存一次 → GET 详情/列表 `contents` 应为展示名，而非 `nutritionfacts, text`  
-4. 修改 Element name 后再保存 → 列表 Contents **立即**更新（不再被旧 `Contents` 缓存挡住）
-
-**curl 示例**
-
-```bash
-curl -s "http://localhost:5000/api/app/label-template/tpl_c23gov_mqri4g5a" \
-  -H "Authorization: Bearer <TOKEN>"
-```
-
----
-
-## 七、与 6-25 文档关系
-
-- **6-25**：引入 `contents` 字段、DB 迁移、未迁移列兼容  
-- **6-26**：明确字段来源（Element name + typeAdd 推导）、修复 slug/缓存导致的展示与编辑不生效问题  
+# H5 / App 开发：直连本地后端（按本机 IP 与端口修改）
+VITE_US_API_BASE=http://192.168.31.89:19001
+# 复制为 .env.development（开发）或 .env.production（打包），按环境填写后端根地址（不含末尾 /）
+VITE_US_API_BASE=http://192.168.31.89:19001
+# App / H5 正式打包：直连生产/测试服务器（打包前按部署环境修改）
+VITE_US_API_BASE=http://flus-test.3ffoodsafety.com
@@ -5,6 +5,11 @@
             "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "customPlaygroundType" : "device",
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
         }
     ]
 }
@@ -3,11 +3,13 @@ import { onLaunch, onShow, onHide } from &quot;@dcloudio/uni-app&quot;;
 import { initOfflineSqlite } from "./utils/sqliteSync";
 import { syncNowAndRefreshCaches } from "./utils/offlineSyncManager";
 import { isLoggedIn } from "./utils/authSession";
+import { preloadAllLabelEditorFonts } from "./utils/labelEditorFonts";
  
 let networkSyncInFlight = false;
  
 onLaunch(() => {
   void initOfflineSqlite();
+  void preloadAllLabelEditorFonts();
   uni.onNetworkStatusChange((res) => {
     if (!res.isConnected || !isLoggedIn() || networkSyncInFlight) return;
     networkSyncInFlight = true;
@@ -64,6 +64,7 @@ const props = withDefaults(
  
 const emit = defineEmits<{
   'update:modelValue': [value: string]
+  cancel: []
 }>()
  
 const dialogVisible = ref(false)
@@ -173,6 +174,7 @@ function onPickerChange(e: { detail: { value: number[] } }) {
  
 function cancelDialog() {
   dialogVisible.value = false
+  emit('cancel')
 }
  
 function confirmDialog() {
@@ -10,7 +10,7 @@ import { computed } from &#39;vue&#39;
 const props = withDefaults(
   defineProps<{
     name: string
-    size?: 'sm' | 'md' | 'lg'
+    size?: 'xs' | 'sm' | 'md' | 'lg'
     color?: 'primary' | 'gray' | 'white' | 'blue' | 'orange' | 'green' | 'purple' | 'red'
   }>(),
   { size: 'md', color: 'gray' }
@@ -80,6 +80,7 @@ const wrapStyle = computed(() =&gt; ({}))
   stroke-linejoin: round;
 }
  
+.icon-xs { width: 30rpx; height: 30rpx; }
 .icon-sm { width: 40rpx; height: 40rpx; }
 .icon-md { width: 48rpx; height: 48rpx; }
 .icon-lg { width: 64rpx; height: 64rpx; }
 /// <reference types="vite/client" />
  
 interface ImportMetaEnv {
-  /** 美国版后端根地址，如 http://192.168.1.2:19001；H5 开发可留空走 Vite /api 代理 */
+  /** 美国版后端根地址，如 http://192.168.1.2:19001；在 .env.development / .env.production 中配置 */
   readonly VITE_US_API_BASE?: string
 }
  
@@ -28,7 +28,7 @@
           <text class="tab-text">Bluetooth</text>
         </view>
         <view
-          v-if="isBuiltinModeAvailable"
+          v-if="isBuiltinModeAvailable && SHOW_BUILTIN_PRINTER_UI"
           class="tab"
           :class="{ active: printerType === 'builtin' }"
           @click="switchType('builtin')"
@@ -64,8 +64,35 @@
         </view>
       </view>
  
+      <!-- Print route debug: hidden in production UI -->
+      <view v-if="connectedDevice && SHOW_PRINT_ROUTE_DEBUG" class="print-route-card">
+        <view class="print-route-header">
+          <text class="print-route-title">Print Route (Debug)</text>
+          <view class="btn-refresh-debug" @click="refreshPrintRouteDebug">
+            <text class="btn-refresh-debug-text">Refresh</text>
+          </view>
+        </view>
+        <text class="debug-item">Send Channel: {{ printRouteDebug.sendChannel }}</text>
+        <text class="debug-item">Virtual BT: {{ printRouteDebug.virtualBt ? 'Yes' : 'No' }}</text>
+        <text class="debug-item">UPOS Supported: {{ printRouteDebug.uposSupported ? 'Yes' : 'No' }}</text>
+        <text class="debug-item">UPOS Will Try: {{ printRouteDebug.uposWillTry ? 'Yes' : 'No' }}</text>
+        <text class="debug-item">Native Stage: {{ printRouteDebug.nativeStage || '-' }}</text>
+        <text class="debug-item">Command Bytes: {{ printRouteDebug.commandBytes || 0 }}</text>
+        <text class="debug-item">Write Ms: {{ printRouteDebug.writeMs || 0 }}</text>
+        <text v-if="printRouteDebug.lastError" class="debug-item debug-error">{{ printRouteDebug.lastError }}</text>
+        <text v-if="lastPrintDiagAtLabel" class="debug-item debug-muted">{{ lastPrintDiagAtLabel }}</text>
+        <view class="print-route-actions">
+          <view class="btn-view-log" @click="showLastPrintLogModal">
+            <text class="btn-view-log-text">View last print log</text>
+          </view>
+        </view>
+        <text class="print-route-hint">
+          D320FAX：Send Channel 应为 Gprinter SDK TSC (Virtual BT)。若显示 UPOS 或 printCommandBytes 且无 Write Ms，则不会出纸。
+        </text>
+      </view>
+
       <!-- Bluetooth: scan & list -->
-      <template v-if="printerType === 'bluetooth'">
+      <template v-if="printerType === 'bluetooth' || !SHOW_BUILTIN_PRINTER_UI">
         <view class="section-header">
           <text class="section-title">Available Printers</text>
           <view class="btn-scan" :class="{ scanning: isScanning }" @click="handleScan">
@@ -73,7 +100,7 @@
             <text class="btn-scan-text">{{ isScanning ? 'Scanning...' : 'Scan' }}</text>
           </view>
         </view>
-        <view v-if="isBuiltinModeAvailable" class="switch-to-builtin-row">
+        <view v-if="isBuiltinModeAvailable && SHOW_BUILTIN_PRINTER_UI" class="switch-to-builtin-row">
           <view class="btn-switch-to-builtin" @click="switchToBuiltinMode">
             <text class="btn-switch-to-builtin-text">Built-in Printing</text>
           </view>
@@ -121,8 +148,8 @@
         </view>
       </template>
  
-      <!-- Built-in: single option -->
-      <template v-else>
+      <!-- Built-in / UPOS：仅开发调试时展示 -->
+      <template v-else-if="SHOW_BUILTIN_PRINTER_UI">
         <view class="section-header">
           <text class="section-title">Built-in Printer</text>
         </view>
@@ -138,14 +165,14 @@
           </view>
         </view>
  
-        <view class="builtin-advanced-entry">
+        <view v-if="SHOW_BUILTIN_UPOS_ADVANCED" class="builtin-advanced-entry">
           <view class="btn-advanced" @click="showBuiltinAdvanced = !showBuiltinAdvanced">
             <text class="btn-advanced-text">{{ showBuiltinAdvanced ? 'Hide advanced options' : 'Show advanced options' }}</text>
           </view>
         </view>
  
         <!-- UPOS options: builtin / serial -->
-        <view v-if="showBuiltinAdvanced" class="upos-card">
+        <view v-if="SHOW_BUILTIN_UPOS_ADVANCED && showBuiltinAdvanced" class="upos-card">
           <text class="upos-title">UPOS options (for AIO devices)</text>
           <text class="upos-desc">
             If printing does not feed paper, try switching to Serial and set a correct port/baudrate.
@@ -227,15 +254,12 @@
             <text class="tips-item">3. Place the printer within 10 m and tap Scan again</text>
             <text class="tips-item">4. Scan list only shows: GP-D320FX-spp_A7FO and Virtual BT Printer</text>
             <text class="tips-item">5. Pair the printer in system Bluetooth first if it does not appear after Scan</text>
-            <text class="tips-item">6. Restart the printer or app if not visible</text>
-            <text class="tips-item tips-item-last">
-              7. Built-in TSC: defaults to TSPL label commands via UPOS; use Advanced → ESC/POS only if your device is receipt-only.
-            </text>
+            <text class="tips-item tips-item-last">6. Restart the printer or app if not visible</text>
           </view>
         </view>
       </view>
  
-      <view class="collapse-section collapse-section--debug">
+      <view v-if="SHOW_PRINTER_DEBUG_UI" class="collapse-section collapse-section--debug">
         <view class="collapse-header collapse-header--debug" @click="debugExpanded = !debugExpanded">
           <text class="collapse-title">Debug Status</text>
           <view class="collapse-action-wrap">
@@ -254,6 +278,10 @@
             <text class="debug-item">Native Backend: {{ nativeDebug.backend || '-' }}</text>
             <text class="debug-item">Native Stage: {{ nativeDebug.stage || '-' }}</text>
             <text class="debug-item">Native Command Bytes: {{ nativeDebug.commandBytes || 0 }}</text>
+            <text class="debug-item">Native Write Ms: {{ nativeDebug.writeMs || 0 }}</text>
+            <text class="debug-item">Send Channel: {{ printRouteDebug.sendChannel }}</text>
+            <text class="debug-item">Virtual BT Linked: {{ printRouteDebug.virtualBt ? 'Yes' : 'No' }}</text>
+            <text class="debug-item">UPOS Will Try: {{ printRouteDebug.uposWillTry ? 'Yes' : 'No' }}</text>
             <text class="debug-item">Paired Count: {{ debugInfo.pairedCount }}</text>
             <text class="debug-item">Virtual BT Printer: {{ debugInfo.foundVirtualPrinter ? 'Found' : 'Not Found' }}</text>
             <text class="debug-item">Classic Scan: {{ debugInfo.lastClassicEvent }}</text>
@@ -274,6 +302,7 @@
  
 <script setup lang="ts">
 import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
 import AppIcon from '../../components/AppIcon.vue'
 import SideMenu from '../../components/SideMenu.vue'
 import LocationPicker from '../../components/LocationPicker.vue'
@@ -287,7 +316,12 @@ import {
   type PrinterType,
   PrinterStorageKeys,
   setUposOptions,
+  getPrinterDebugSnapshot,
+  isVirtualBtBluetoothConnection,
+  restoreD320faxVirtualBtBluetoothMode,
+  resolvePrintSendChannelHint,
   setBuiltinPrinter,
+  isAoaAioDevice,
 } from '../../utils/print/printerConnection'
 import { ensureBluetoothPermissions } from '../../utils/print/bluetoothPermissions'
 import { isAllowedBluetoothPrinterName } from '../../utils/print/bluetoothPrinterAllowlist'
@@ -309,6 +343,10 @@ import {
   testPrintCurrentPrinter,
   useBuiltinPrinter,
 } from '../../utils/print/manager/printerManager'
+import {
+  getPersistedPrintRunDiagnostics,
+  getPersistedPrintRunDiagnosticsAt,
+} from '../../utils/print/printRunDiagnostics'
  
 const statusBarHeight = getStatusBarHeight()
 const isMenuOpen = ref(false)
@@ -321,11 +359,23 @@ const btAdapterReady = ref(false)
 const availablePrinterTypes = getAvailablePrinterTypes()
 const availablePrinterTypesLabel = availablePrinterTypes.map(item => item === 'builtin' ? 'Built-in' : 'Bluetooth').join(' / ')
 const deviceIdentity = getDeviceIdentity()
-const storedPrinterType = getPrinterType()
-const preferredPrinterType = (storedPrinterType && availablePrinterTypes.includes(storedPrinterType as PrinterType))
-  ? storedPrinterType as PrinterType
-  : availablePrinterTypes[0]
-const printerType = ref<PrinterType | ''>(preferredPrinterType || 'bluetooth')
+const isAoaDevice = isAoaAioDevice()
+const isBluetoothModeAvailable = availablePrinterTypes.includes('bluetooth')
+const isBuiltinModeAvailable = availablePrinterTypes.includes('builtin')
+/** 打印机页「Print Route (Debug)」卡片；正式版对用户隐藏 */
+const SHOW_PRINT_ROUTE_DEBUG = false
+/** AOA 一体机显示 Built-in 入口；普通手机隐藏 */
+const SHOW_BUILTIN_PRINTER_UI = isAoaDevice
+/** UPOS 高级选项仅开发调试 */
+const SHOW_BUILTIN_UPOS_ADVANCED = false
+/** Troubleshooting 下方 Debug Status；正式版对用户隐藏 */
+const SHOW_PRINTER_DEBUG_UI = false
+/** AOA 默认内置打印；其它设备默认蓝牙 */
+const printerType = ref<PrinterType>(
+  isAoaDevice && isBuiltinModeAvailable
+    ? 'builtin'
+    : (isBluetoothModeAvailable ? 'bluetooth' : (isBuiltinModeAvailable ? 'builtin' : 'bluetooth')),
+)
 const currentPrinter = ref(getCurrentPrinterSummary())
 const showBuiltinAdvanced = ref(false)
 const debugInfo = ref({
@@ -339,6 +389,51 @@ const debugInfo = ref({
   locationServiceRequired: false,
 })
 const nativeDebug = ref(getNativeFastPrinterState() || {})
+const printRouteDebug = ref({
+  sendChannel: '-',
+  virtualBt: false,
+  uposSupported: false,
+  uposWillTry: false,
+  nativeStage: '-',
+  commandBytes: 0,
+  writeMs: 0,
+  lastError: '',
+})
+
+const lastPrintDiagAtLabel = computed(() => {
+  const at = getPersistedPrintRunDiagnosticsAt()
+  if (!at) return ''
+  const d = new Date(at)
+  return `Last print log: ${d.toLocaleString()}`
+})
+
+async function refreshPrintRouteDebug () {
+  const snap = await getPrinterDebugSnapshot({ reason: 'printer-page' })
+  const native = snap.nativeFastPrinter || {}
+  printRouteDebug.value = {
+    sendChannel: snap.builtin.sendChannelHint || resolvePrintSendChannelHint(),
+    virtualBt: snap.builtin.virtualBtLinked || isVirtualBtBluetoothConnection(),
+    uposSupported: !!snap.builtin.uposSupported,
+    uposWillTry: !!snap.builtin.uposWillTry,
+    nativeStage: String(native.stage || nativeDebug.value.stage || '-'),
+    commandBytes: Number(native.commandBytes || nativeDebug.value.commandBytes || 0),
+    writeMs: Number(native.writeMs || nativeDebug.value.writeMs || 0),
+    lastError: String(native.lastError || nativeDebug.value.lastError || ''),
+  }
+}
+
+function showLastPrintLogModal () {
+  const persisted = getPersistedPrintRunDiagnostics().trim()
+  const content = persisted
+    ? (persisted.length > 3600 ? persisted.slice(-3600) : persisted)
+    : 'No print log yet. Print a label from Preview first, then return here and tap Refresh.'
+  uni.showModal({
+    title: 'Last Print Log',
+    content,
+    showCancel: false,
+    confirmText: 'OK',
+  })
+}
  
 const uposPrefer = ref<'builtin' | 'serial'>(
   (String(uni.getStorageSync(PrinterStorageKeys.uposPrefer) || '').toLowerCase() === 'serial' ? 'serial' : 'builtin') as
@@ -366,8 +461,6 @@ interface BtDevice {
  
 const devices = ref<BtDevice[]>([])
 const discoveredIds = new Set<string>()
-const isBluetoothModeAvailable = availablePrinterTypes.includes('bluetooth')
-const isBuiltinModeAvailable = availablePrinterTypes.includes('builtin')
  
 function refreshCurrentPrinter () {
   currentPrinter.value = getCurrentPrinterSummary()
@@ -385,6 +478,7 @@ async function refreshNativeDebug () {
   } catch (_) {
     nativeDebug.value = getNativeFastPrinterState() || {}
   }
+  await refreshPrintRouteDebug()
 }
  
 function onBuiltinDriverSegmentTap (key: 'generic-tsc' | 'generic-esc') {
@@ -463,6 +557,7 @@ const connectedDevice = computed(() =&gt; {
 })
  
 function switchType (type: 'bluetooth' | 'builtin') {
+  if (!SHOW_BUILTIN_PRINTER_UI && type === 'builtin') return
   if (!availablePrinterTypes.includes(type)) return
   printerType.value = type
   showBuiltinAdvanced.value = false
@@ -473,7 +568,7 @@ function switchType (type: &#39;bluetooth&#39; | &#39;builtin&#39;) {
 }
  
 function switchToBuiltinMode () {
-  if (!isBuiltinModeAvailable) return
+  if (!SHOW_BUILTIN_PRINTER_UI || !isBuiltinModeAvailable) return
   switchType('builtin')
 }
  
@@ -515,6 +610,11 @@ const startBleScan = () =&gt; {
       if (err?.errCode === 10016 || err?.code === 10016) {
         debugInfo.value.locationServiceRequired = true
         errorMsg.value = 'Bluetooth scan failed: Android system Location service is turned off.'
+      } else if (devices.value.length === 0) {
+        errorMsg.value = 'BLE scan failed. Check Bluetooth and Location permissions.'
+      }
+      if (devices.value.length > 0) {
+        isScanning.value = false
       }
     },
   })
@@ -612,6 +712,10 @@ function startClassicScan () {
         },
         () => {
           debugInfo.value.lastClassicEvent = 'scan finished'
+          if (devices.value.length > 0) {
+            isScanning.value = false
+            stopDiscovery()
+          }
         },
       )
       isScanning.value = true
@@ -653,7 +757,6 @@ const handleScan = async () =&gt; {
     if (hasPreferredClassicDeviceInList()) {
       isScanning.value = false
       debugInfo.value.lastBleEvent = 'skipped (paired classic device found)'
-      uni.showToast({ title: 'Using paired classic Bluetooth devices', icon: 'none' })
       return
     }
  
@@ -671,7 +774,8 @@ const handleScan = async () =&gt; {
       if (isScanning.value) stopDiscovery()
     }, 20000)
   } catch (_) {
-    if (!isScanning.value && devices.value.length === 0) {
+    isScanning.value = false
+    if (devices.value.length === 0) {
       errorMsg.value = 'Bluetooth scan failed. Check if Bluetooth is enabled.'
     }
   }
@@ -699,6 +803,7 @@ const handleConnect = async (dev: BtDevice) =&gt; {
     uni.showToast({ title: 'Connected!', icon: 'success' })
   } catch (e: any) {
     await refreshNativeDebug()
+    refreshCurrentPrinter()
     errorMsg.value = (e && e.message) ? e.message : 'Connection failed'
     connectingId.value = ''
   }
@@ -832,22 +937,74 @@ const handleDisconnect = async () =&gt; {
   uni.showToast({ title: 'Disconnected', icon: 'none' })
 }
  
+function ensureAoaBuiltinPrinterReady () {
+  if (!isAoaDevice || !isBuiltinModeAvailable) return
+  printerType.value = 'builtin'
+  if (getPrinterType() !== 'builtin') {
+    useBuiltinPrinter(builtinDriverKey.value)
+    logBuiltinTscCapability('aoa_auto_builtin', {
+      screen: 'bluetooth_builtin',
+      driverKey: builtinDriverKey.value,
+      model: deviceIdentity.model || '',
+      product: deviceIdentity.product || '',
+    })
+    refreshCurrentPrinter()
+  }
+}
+
 onMounted(() => {
   debugInfo.value.classicModuleReady = !!classicBluetooth
   refreshNativeDebug()
-  uni.onBluetoothDeviceFound(onDeviceFound)
-  uni.onBluetoothAdapterStateChange((res: any) => {
-    if (!res.available) {
-      btAdapterReady.value = false
+  ensureAoaBuiltinPrinterReady()
+  if (!isAoaDevice) {
+    uni.onBluetoothDeviceFound(onDeviceFound)
+    uni.onBluetoothAdapterStateChange((res: any) => {
+      if (!res.available) {
+        btAdapterReady.value = false
+        isScanning.value = false
+        errorMsg.value = 'Bluetooth has been turned off.'
+      } else {
+        btAdapterReady.value = true
+        errorMsg.value = ''
+      }
+    })
+  }
+  refreshCurrentPrinter()
+})
+
+async function refreshBluetoothDeviceList () {
+  if (printerType.value !== 'bluetooth') return
+  try {
+    const permissionResult = await ensureBluetoothPermissions({ scan: true, connect: true })
+    if (!permissionResult.ok) {
+      errorMsg.value = permissionResult.message || 'Bluetooth permission denied.'
+      return
+    }
+    await initBluetooth()
+    addPairedDevices()
+    if (devices.value.length > 0) {
       isScanning.value = false
-      errorMsg.value = 'Bluetooth has been turned off.'
-    } else {
-      btAdapterReady.value = true
-      errorMsg.value = ''
+      return
     }
-  })
-  printerType.value = preferredPrinterType || 'bluetooth'
+    if (!isScanning.value) {
+      await handleScan()
+    }
+  } catch (_) {
+    /* ignore; user can tap Scan manually */
+  }
+}
+
+onShow(() => {
+  restoreD320faxVirtualBtBluetoothMode()
+  ensureAoaBuiltinPrinterReady()
   refreshCurrentPrinter()
+  if (isVirtualBtBluetoothConnection()) {
+    debugExpanded.value = true
+  }
+  void refreshNativeDebug()
+  if (!isAoaDevice) {
+    void refreshBluetoothDeviceList()
+  }
 })
  
 onUnmounted(() => {
@@ -1362,6 +1519,71 @@ onUnmounted(() =&gt; {
   font-weight: 600;
 }
  
+.print-route-card {
+  margin-top: 24rpx;
+  padding: 28rpx 32rpx;
+  border-radius: 16rpx;
+  border: 2rpx solid rgba(31, 58, 138, 0.35);
+  background: #eef2fb;
+  box-sizing: border-box;
+}
+
+.print-route-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+}
+
+.print-route-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: var(--theme-primary, #1f3a8a);
+}
+
+.btn-refresh-debug {
+  padding: 8rpx 20rpx;
+  border-radius: 999rpx;
+  background: var(--theme-primary, #1f3a8a);
+}
+
+.btn-refresh-debug-text {
+  font-size: 24rpx;
+  color: #fff;
+  font-weight: 600;
+}
+
+.print-route-actions {
+  margin-top: 16rpx;
+}
+
+.btn-view-log {
+  display: inline-flex;
+  padding: 12rpx 24rpx;
+  border-radius: 12rpx;
+  border: 1rpx solid var(--theme-primary, #1f3a8a);
+  background: #fff;
+}
+
+.btn-view-log-text {
+  font-size: 26rpx;
+  color: var(--theme-primary, #1f3a8a);
+  font-weight: 600;
+}
+
+.print-route-hint {
+  display: block;
+  margin-top: 16rpx;
+  font-size: 22rpx;
+  line-height: 1.5;
+  color: #475569;
+}
+
+.debug-muted {
+  color: #64748b;
+}
+
 .device-tag {
   display: inline-block;
   font-size: 20rpx;
@@ -40,29 +40,47 @@
           @click="selectedCategoryId = cat.id"
         >
           <view v-if="selectedCategoryId === cat.id" class="active-bar" />
-          <view
-            class="cat-icon"
-            :class="labelCategoryVisual(cat).mode === 'image' ? 'cat-icon--photo' : 'cat-icon--fallback'"
-            :style="labelCategoryIconBoxStyle(cat)"
-          >
-            <image
-              v-if="labelCategoryVisual(cat).mode === 'image'"
-              :src="resolveMediaUrlForApp(labelCategoryVisual(cat).imageUrl) || ''"
-              class="cat-photo"
-              mode="aspectFill"
-            />
-            <text
-              v-else-if="labelCategoryVisual(cat).mode === 'colorText'"
-              class="cat-icon-text cat-icon-text--on-color"
-              :style="{ color: labelCategoryVisual(cat).textColor || '#ffffff' }"
+          <view class="cat-card-frame">
+            <view class="cat-card-inner">
+            <view
+              class="cat-visual"
+              :class="[
+                labelCategoryVisual(cat).mode === 'image' ? 'cat-visual--photo' : 'cat-visual--fallback',
+              ]"
+              :style="labelCategoryVisualZoneStyle(cat)"
             >
-              {{ labelCategoryVisual(cat).text }}
-            </text>
-            <text v-else-if="labelCategoryVisual(cat).mode === 'text'" class="cat-icon-text">
-              {{ labelCategoryVisual(cat).text }}
-            </text>
+              <image
+                v-if="labelCategoryVisual(cat).mode === 'image'"
+                :src="resolveMediaUrlForApp(labelCategoryVisual(cat).imageUrl) || ''"
+                class="cat-photo-fill"
+                mode="aspectFill"
+              />
+              <view
+                v-else-if="labelCategoryVisual(cat).mode === 'colorText'"
+                class="cat-visual-text-inner"
+              >
+                <text
+                  class="cat-visual-text cat-visual-text--on-color"
+                  :style="{ color: labelCategoryVisual(cat).textColor || '#ffffff' }"
+                >
+                  {{ labelCategoryVisual(cat).text }}
+                </text>
+              </view>
+              <view v-else-if="labelCategoryVisual(cat).mode === 'color'" class="cat-visual-color-fill" />
+              <view v-else-if="labelCategoryVisual(cat).mode === 'text'" class="cat-visual-text-inner">
+                <text class="cat-visual-text">{{ labelCategoryVisual(cat).text }}</text>
+              </view>
+              <view v-else class="cat-visual-fallback" :class="colorClassForName(cat.categoryName)">
+                <text class="cat-visual-text cat-visual-text--on-color">
+                  {{ (cat.categoryName || '').trim().slice(0, 12) }}
+                </text>
+              </view>
+            </view>
+            <view class="cat-name-band">
+              <text class="cat-name">{{ cat.categoryName }}</text>
+            </view>
+            </view>
           </view>
-          <text class="cat-name">{{ cat.categoryName }}</text>
         </view>
       </view>
  
@@ -113,11 +131,12 @@
                   <view class="cat-header-left" :style="catHeaderLeftStyle">
                     <view
                       class="cat-header-thumb"
-                      :class="
+                      :class="[
                         productCategoryVisual(pCat).mode === 'image'
                           ? 'cat-header-thumb--photo'
-                          : 'cat-header-thumb--fallback'
-                      "
+                          : 'cat-header-thumb--fallback',
+                        'cat-header-thumb--fixed',
+                      ]"
                       :style="catHeaderThumbStyle(pCat)"
                     >
                       <image
@@ -126,24 +145,30 @@
                         class="cat-photo"
                         mode="aspectFill"
                       />
-                      <text
+                      <view
                         v-else-if="productCategoryVisual(pCat).mode === 'colorText'"
-                        class="cat-icon-text cat-icon-text--on-color"
-                        :style="{ color: productCategoryVisual(pCat).textColor || '#ffffff' }"
+                        class="cat-header-text-inner"
                       >
-                        {{ productCategoryVisual(pCat).text }}
-                      </text>
+                        <text
+                          class="cat-icon-text cat-icon-text--on-color cat-icon-text--header cat-icon-text--wrap"
+                          :style="{ color: productCategoryVisual(pCat).textColor || '#ffffff' }"
+                        >
+                          {{ categoryHeaderThumbText(pCat) }}
+                        </text>
+                      </view>
                       <view
                         v-else-if="productCategoryVisual(pCat).mode === 'color'"
                         class="cat-header-color-fill"
                         :style="{ backgroundColor: productCategoryVisual(pCat).bg }"
                       />
-                      <text
+                      <view
                         v-else-if="productCategoryVisual(pCat).mode === 'text'"
-                        class="cat-icon-text"
+                        class="cat-header-text-inner"
                       >
-                        {{ productCategoryVisual(pCat).text }}
-                      </text>
+                        <text class="cat-icon-text cat-icon-text--header cat-icon-text--wrap">
+                          {{ categoryHeaderThumbText(pCat) }}
+                        </text>
+                      </view>
                       <view v-else class="cat-header-fallback" :class="colorClassForName(pCat.name)">
                         <AppIcon name="food" size="sm" color="white" />
                       </view>
@@ -178,57 +203,70 @@
                       class="food-card"
                       @click="handleProductClick(product, pCat.name)"
                     >
-                      <view
-                        class="food-img-wrap"
-                        :class="
-                          productVisual(product, pCat).mode === 'image'
-                            ? 'food-img-wrap--photo'
-                            : 'food-img-wrap--fallback'
-                        "
-                        :style="productThumbWrapStyle(product, pCat)"
-                      >
-                        <image
-                          v-if="productVisual(product, pCat).mode === 'image'"
-                          :src="resolveMediaUrlForApp(productVisual(product, pCat).imageUrl) || ''"
-                          class="food-img"
-                          mode="aspectFill"
-                        />
-                        <text
-                          v-else-if="productVisual(product, pCat).mode === 'colorText'"
-                          class="food-thumb-text food-thumb-text--on-color"
-                          :style="{ color: productVisual(product, pCat).textColor || '#ffffff' }"
-                        >
-                          {{ productVisual(product, pCat).text }}
-                        </text>
-                        <text
-                          v-else-if="productVisual(product, pCat).mode === 'text'"
-                          class="food-thumb-text"
-                        >
-                          {{ productVisual(product, pCat).text }}
-                        </text>
+                      <view class="food-card-frame">
+                        <view class="food-card-inner">
                         <view
-                          v-else-if="productVisual(product, pCat).mode === 'color'"
-                          class="food-thumb-color-fill"
-                          :style="{ backgroundColor: productVisual(product, pCat).bg }"
-                        />
-                        <view
-                          v-else
-                          class="food-thumb-fallback"
-                          :class="colorClassForName(product.productName)"
+                          class="food-visual"
+                          :class="
+                            productVisual(product, pCat).mode === 'image'
+                              ? 'food-visual--photo'
+                              : 'food-visual--fallback'
+                          "
+                          :style="productVisualZoneStyle(product, pCat)"
                         >
-                          <text class="food-thumb-text food-thumb-text--on-color">
-                            {{ productThumbFallbackText(product) }}
-                          </text>
+                          <image
+                            v-if="productVisual(product, pCat).mode === 'image'"
+                            :src="resolveMediaUrlForApp(productVisual(product, pCat).imageUrl) || ''"
+                            class="food-img-fill"
+                            mode="aspectFill"
+                          />
+                          <view
+                            v-else-if="productVisual(product, pCat).mode === 'colorText'"
+                            class="food-visual-text-wrap"
+                          >
+                            <text
+                              class="food-visual-text food-visual-text--on-color"
+                              :style="{ color: productVisual(product, pCat).textColor || '#ffffff' }"
+                            >
+                              {{ productThumbDisplayText(product, pCat) }}
+                            </text>
+                          </view>
+                          <view
+                            v-else-if="productVisual(product, pCat).mode === 'text'"
+                            class="food-visual-text-wrap"
+                          >
+                            <text class="food-visual-text">
+                              {{ productThumbDisplayText(product, pCat) }}
+                            </text>
+                          </view>
+                          <view
+                            v-else-if="productVisual(product, pCat).mode === 'color'"
+                            class="food-visual-color-fill"
+                          />
+                          <view
+                            v-else
+                            class="food-visual-fallback"
+                            :class="colorClassForName(product.productName)"
+                          >
+                            <text class="food-visual-text food-visual-text--on-color">
+                              {{ productThumbFallbackText(product) }}
+                            </text>
+                          </view>
                         </view>
-                        <view class="size-badge">
-                          <text class="size-badge-text">{{ primaryLabelSizeText(product) }}</text>
+                        <view class="food-name-band">
+                          <text class="food-name">{{ product.productName }}</text>
+                        </view>
+                        <view class="food-meta-band">
+                          <text class="food-meta-size">{{ primaryLabelSizeText(product) }}</text>
+                          <text
+                            v-if="effectiveLabelTypeCount(product) > 0"
+                            class="food-meta-types"
+                          >
+                            {{ effectiveLabelTypeCount(product) }} Types
+                          </text>
                         </view>
-                        <view v-if="effectiveLabelTypeCount(product) > 0" class="type-badge">
-                          <text class="type-badge-text">{{ effectiveLabelTypeCount(product) }} Types</text>
                         </view>
                       </view>
-                      <text class="food-name">{{ product.productName }}</text>
-                      <text class="food-desc">{{ product.subtitle || '—' }}</text>
                     </view>
                   </view>
                 </view>
@@ -301,6 +339,18 @@ const showSubTypeModal = ref(false)
 const selectedProduct = ref<UsAppLabelingProductNodeDto | null>(null)
 const currentLabelTypes = ref<UsAppLabelTypeNodeDto[]>([])
  
+/** 按屏宽比例缩放列表区图标/间距（基线 375px 逻辑宽） */
+const layoutScale = ref(1)
+
+function refreshLayoutScale() {
+  const w = Number(uni.getSystemInfoSync().windowWidth || 375)
+  layoutScale.value = Math.min(1.12, Math.max(0.88, w / 375))
+}
+
+function scaleRpx(base: number): number {
+  return Math.round(base * layoutScale.value)
+}
+
 const labelTree = ref<UsAppLabelCategoryTreeNodeDto[]>([])
 const listLoading = ref(false)
 const listError = ref('')
@@ -318,6 +368,7 @@ watch(searchTerm, () =&gt; {
 })
  
 onShow(() => {
+  refreshLayoutScale()
   locationId.value = getCurrentStoreId()
   const summary = getCurrentPrinterSummary()
   btConnected.value = summary.type === 'bluetooth' || summary.type === 'builtin'
@@ -412,22 +463,23 @@ function labelCategoryVisual(cat: UsAppLabelCategoryTreeNodeDto): CategoryVisual
   })
 }
  
-function labelCategoryIconBoxStyle(cat: UsAppLabelCategoryTreeNodeDto): Record<string, string> {
+function labelCategoryVisualZoneStyle(cat: UsAppLabelCategoryTreeNodeDto): Record<string, string> {
   const v = labelCategoryVisual(cat)
-  if (v.mode === 'image') {
-    return categoryButtonDisplayWidthStyle()
-  }
-  if (v.mode === 'color') {
-    return {
-      ...categoryButtonColorOnlyBoxStyle(),
-      backgroundColor: v.bg,
-    }
+  if (v.mode === 'color' || v.mode === 'colorText') {
+    return { backgroundColor: v.bg }
   }
-  const style = categoryButtonDisplayTextShellStyle()
-  if (v.mode === 'colorText') {
-    style.backgroundColor = v.bg
+  return {}
+}
+
+function productVisualZoneStyle(
+  p: UsAppLabelingProductNodeDto,
+  pCat?: UsAppProductCategoryNodeDto,
+): Record<string, string> {
+  const v = productVisual(p, pCat)
+  if (v.mode === 'color' || v.mode === 'colorText') {
+    return { backgroundColor: v.bg }
   }
-  return style
+  return {}
 }
  
 function productCategoryVisual(p: UsAppProductCategoryNodeDto): CategoryVisualRender {
@@ -462,12 +514,12 @@ const catHeaderLeftStyle: Record&lt;string, string&gt; = {
   minWidth: '0',
 }
  
-const catHeaderInfoStyle: Record<string, string> = {
+const catHeaderInfoStyle = computed((): Record<string, string> => ({
   flex: '1',
   minWidth: '0',
-  marginLeft: '0',
+  marginLeft: `${scaleRpx(20)}rpx`,
   paddingLeft: '0',
-}
+}))
  
 const catHeaderChevronStyle: Record<string, string> = {
   flexShrink: '0',
@@ -489,9 +541,11 @@ const catFoodsStyle: Record&lt;string, string&gt; = {
  
 function catHeaderThumbStyle(p: UsAppProductCategoryNodeDto): Record<string, string> {
   const v = productCategoryVisual(p)
+  const scale = layoutScale.value
+  const gap = scaleRpx(18)
   if (v.mode === 'color') {
     return {
-      marginRight: '16rpx',
+      marginRight: `${gap}rpx`,
       marginBottom: '0',
       marginTop: '0',
       marginLeft: '0',
@@ -501,11 +555,11 @@ function catHeaderThumbStyle(p: UsAppProductCategoryNodeDto): Record&lt;string, str
       justifyContent: 'center',
       boxSizing: 'border-box',
       backgroundColor: v.bg,
-      ...categoryButtonColorOnlyBoxStyle(),
+      ...categoryButtonColorOnlyBoxStyle(scale),
     }
   }
   const style: Record<string, string> = {
-    marginRight: '16rpx',
+    marginRight: `${gap}rpx`,
     marginBottom: '0',
     marginTop: '0',
     marginLeft: '0',
@@ -515,17 +569,44 @@ function catHeaderThumbStyle(p: UsAppProductCategoryNodeDto): Record&lt;string, str
     justifyContent: 'center',
     boxSizing: 'border-box',
     backgroundColor: '#f3f4f6',
-    ...categoryButtonDisplayTextShellStyle(),
+    ...categoryButtonDisplayTextShellStyle(scale),
   }
   if (v.mode === 'image') {
-    Object.assign(style, categoryButtonDisplayWidthStyle(), { borderRadius: '12rpx' })
+    Object.assign(style, categoryButtonDisplayWidthStyle(scale), {
+      borderRadius: `${scaleRpx(12)}rpx`,
+    })
   }
   if (v.mode === 'colorText') {
     style.backgroundColor = v.bg
+    style.alignSelf = 'flex-start'
+  }
+  if (v.mode === 'text') {
+    style.alignSelf = 'flex-start'
   }
   return style
 }
  
+/** 分类标题行图标内文案：Display Text 在框内换行展示 */
+function categoryHeaderThumbText(p: UsAppProductCategoryNodeDto): string {
+  const v = productCategoryVisual(p)
+  const raw =
+    v.mode === 'colorText' || v.mode === 'text'
+      ? (v.text || p.name || '').trim()
+      : (p.name || '').trim()
+  return raw
+}
+
+function productThumbDisplayText(
+  p: UsAppLabelingProductNodeDto,
+  pCat?: UsAppProductCategoryNodeDto,
+): string {
+  const v = productVisual(p, pCat)
+  if (v.mode !== 'text' && v.mode !== 'colorText') return ''
+  const t = (v.text ?? '').trim()
+  const name = (p.productName ?? '').trim()
+  return t || name || '?'
+}
+
 function productCategoryRowKey(p: UsAppProductCategoryNodeDto, index: number): string {
   const id = p.categoryId != null ? String(p.categoryId).trim() : ''
   if (id) return `id:${id}`
@@ -571,17 +652,6 @@ function productVisual(
   return { mode: 'none' }
 }
  
-function productThumbWrapStyle(
-  p: UsAppLabelingProductNodeDto,
-  pCat?: UsAppProductCategoryNodeDto,
-): Record<string, string> {
-  const v = productVisual(p, pCat)
-  if (v.mode === 'colorText' || v.mode === 'color') {
-    return { backgroundColor: v.bg }
-  }
-  return {}
-}
-
 function productThumbFallbackText(p: UsAppLabelingProductNodeDto): string {
   const name = (p.productName ?? '').trim()
   if (!name) return '?'
@@ -807,7 +877,7 @@ const goBluetoothPage = () =&gt; {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 20rpx 8rpx;
+  padding: 12rpx 10rpx;
   position: relative;
 }
  
@@ -825,38 +895,73 @@ const goBluetoothPage = () =&gt; {
   border-radius: 0 6rpx 6rpx 0;
 }
  
-.cat-icon {
+/* Label Category：外框 3:2，上 70% 视觉区 + 下 30% 名称 */
+.cat-card-frame {
+  width: 100%;
+  max-width: 200rpx;
+  position: relative;
+  height: 0;
+  padding-top: 66.6667%;
+  border-radius: 12rpx;
+  overflow: hidden;
+  background: #ffffff;
+  box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.06);
+  box-sizing: border-box;
+}
+
+.cat-card-inner {
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.cat-visual {
+  flex: 7 1 0;
+  min-height: 0;
+  width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-bottom: 8rpx;
-  background: transparent;
-  box-sizing: border-box;
   overflow: hidden;
+  background: #f3f4f6;
+  box-sizing: border-box;
 }
  
-.cat-icon--photo {
-  overflow: hidden;
-  border-radius: 14rpx;
+.cat-visual--photo,
+.cat-visual--fallback {
+  position: relative;
 }
  
-.cat-icon--fallback {
-  overflow: hidden;
-  border-radius: 14rpx;
+.cat-photo-fill {
+  width: 100%;
+  height: 100%;
+  display: block;
 }
  
-.cat-photo {
+.cat-visual-color-fill {
   width: 100%;
-  height: auto;
-  border-radius: 14rpx;
-  display: block;
-  vertical-align: top;
+  height: 100%;
 }
  
-.cat-icon-text {
-  max-width: 100%;
-  padding: 4rpx 6rpx;
-  font-size: 20rpx;
+.cat-visual-text-inner {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6rpx 8rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+.cat-visual-text {
+  width: 100%;
+  max-height: 100%;
+  font-size: 18rpx;
   font-weight: 700;
   color: #111827;
   line-height: 1.15;
@@ -864,27 +969,60 @@ const goBluetoothPage = () =&gt; {
   white-space: pre-wrap;
   word-break: break-word;
   overflow: hidden;
+}
+
+.cat-visual-text--on-color {
+  color: #ffffff;
+}
+
+.cat-visual-fallback {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6rpx;
   box-sizing: border-box;
 }
  
-.cat-icon-text--on-color {
-  max-width: 100%;
+.cat-visual-fallback.bg-red {
+  background: #ef4444;
+}
+.cat-visual-fallback.bg-blue {
+  background: #3b82f6;
+}
+.cat-visual-fallback.bg-green {
+  background: #22c55e;
+}
+.cat-visual-fallback.bg-orange {
+  background: #f97316;
+}
+.cat-visual-fallback.bg-purple {
+  background: #a855f7;
+}
+
+.cat-name-band {
+  flex: 3 1 0;
+  min-height: 0;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   padding: 4rpx 6rpx;
-  font-size: 20rpx;
-  font-weight: 700;
-  line-height: 1.15;
-  text-align: center;
-  white-space: pre-wrap;
-  word-break: break-word;
-  overflow: hidden;
+  background: #ffffff;
   box-sizing: border-box;
 }
  
 .cat-name {
-  font-size: 20rpx;
-  color: #4b5563;
+  font-size: 18rpx;
+  color: #374151;
   text-align: center;
+  line-height: 1.2;
   word-break: break-word;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
 }
  
 .cat-item.active .cat-name {
@@ -968,25 +1106,42 @@ const goBluetoothPage = () =&gt; {
 }
  
 .cat-header-thumb {
+  position: relative;
   box-sizing: border-box;
 }
  
-.cat-header-thumb--photo,
-.cat-header-thumb--fallback {
+.cat-header-thumb--fixed {
   overflow: hidden;
 }
  
+.cat-header-text-inner {
+  position: relative;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  padding: 4rpx 6rpx;
+  box-sizing: border-box;
+}
+
 .cat-header .cat-header-thumb .cat-icon-text,
-.cat-header .cat-header-thumb .cat-icon-text--on-color {
+.cat-header .cat-header-thumb .cat-icon-text--on-color,
+.cat-header .cat-header-thumb .cat-icon-text--header {
   font-size: 20rpx;
   line-height: 1.15;
-  padding: 4rpx 6rpx;
+  padding: 0;
   max-width: 100%;
   white-space: pre-wrap;
   word-break: break-word;
   overflow: hidden;
 }
  
+.cat-header-thumb--photo,
+.cat-header-thumb--fallback {
+  overflow: hidden;
+}
+
 .cat-header-color-fill {
   width: 100%;
   height: 100%;
@@ -1062,161 +1217,182 @@ const goBluetoothPage = () =&gt; {
   flex-wrap: wrap;
   align-content: flex-start;
   padding-top: 8rpx;
-  margin-left: -5rpx;
-  margin-right: -5rpx;
+  margin-left: -6rpx;
+  margin-right: -6rpx;
 }
  
+/* Product：外框 3:2，上 70% 视觉 + 中 20% 名称 + 下 10% 尺寸/类型 */
 .food-card {
   width: 47%;
-  max-width: 240rpx;
+  max-width: 260rpx;
   flex: 0 0 auto;
   box-sizing: border-box;
-  margin: 0 5rpx 12rpx 5rpx;
-  background: #f9fafb;
-  padding: 8rpx;
-  border-radius: 12rpx;
+  margin: 0 6rpx 14rpx 6rpx;
+  min-width: 0;
 }
  
-.food-card:active {
-  background: #f3f4f6;
+.food-card:active .food-card-frame {
+  opacity: 0.92;
 }
  
-.food-img-wrap {
+.food-card-frame {
   width: 100%;
   position: relative;
   height: 0;
-  padding-top: 58%;
-  border-radius: 8rpx;
-  background: #e5e7eb;
-  margin-bottom: 8rpx;
+  padding-top: 66.6667%;
+  border-radius: 12rpx;
   overflow: hidden;
+  background: #ffffff;
+  border: 1rpx solid #e5e7eb;
+  box-sizing: border-box;
 }
  
-.food-img-wrap--fallback {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.food-img {
+.food-card-inner {
   position: absolute;
   left: 0;
   top: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.food-visual {
+  flex: 7 1 0;
+  min-height: 0;
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  background: #f3f4f6;
+  box-sizing: border-box;
+}
+
+.food-img-fill {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.food-visual-color-fill {
   width: 100%;
   height: 100%;
 }
  
-.food-thumb-text {
-  position: absolute;
-  left: 0;
-  top: 0;
+.food-visual-text-wrap {
   width: 100%;
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 8rpx;
+  padding: 8rpx 10rpx;
   box-sizing: border-box;
-  font-size: 26rpx;
+  overflow: hidden;
+}
+
+.food-visual-text {
+  width: 100%;
+  max-height: 100%;
+  font-size: 20rpx;
   font-weight: 700;
   color: #111827;
-  line-height: 1.15;
+  line-height: 1.2;
   text-align: center;
+  white-space: pre-wrap;
   word-break: break-word;
+  overflow: hidden;
 }
  
-.food-thumb-text--on-color {
-  font-size: 24rpx;
+.food-visual-text--on-color {
   color: #ffffff;
 }
  
-.food-thumb-color-fill {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-}
-
-.food-thumb-fallback {
-  position: absolute;
-  left: 0;
-  top: 0;
+.food-visual-fallback {
   width: 100%;
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 12rpx;
+  padding: 8rpx;
   box-sizing: border-box;
 }
  
-.food-thumb-fallback.bg-red {
+.food-visual-fallback.bg-red {
   background: #ef4444;
 }
-.food-thumb-fallback.bg-blue {
+.food-visual-fallback.bg-blue {
   background: #3b82f6;
 }
-.food-thumb-fallback.bg-green {
+.food-visual-fallback.bg-green {
   background: #22c55e;
 }
-.food-thumb-fallback.bg-orange {
+.food-visual-fallback.bg-orange {
   background: #f97316;
 }
-.food-thumb-fallback.bg-purple {
+.food-visual-fallback.bg-purple {
   background: #a855f7;
 }
  
-.size-badge {
-  position: absolute;
-  left: 8rpx;
-  top: 8rpx;
-  background: rgba(0, 0, 0, 0.25);
-  padding: 4rpx 12rpx;
-  border-radius: 8rpx;
-}
-
-.size-badge-text {
-  font-size: 18rpx;
-  color: #fff;
-  font-weight: 500;
-}
-
-.type-badge {
-  position: absolute;
-  right: 8rpx;
-  bottom: 8rpx;
-  background: rgba(0, 0, 0, 0.25);
-  padding: 4rpx 12rpx;
-  border-radius: 8rpx;
-}
-
-.type-badge-text {
-  font-size: 18rpx;
-  color: #fff;
-  font-weight: 500;
+.food-name-band {
+  flex: 2 1 0;
+  min-height: 0;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2rpx 8rpx;
+  background: #ffffff;
+  box-sizing: border-box;
 }
  
 .food-name {
-  font-size: 22rpx;
+  width: 100%;
+  font-size: 20rpx;
   font-weight: 600;
   color: #111827;
-  display: block;
-  margin-bottom: 2rpx;
+  line-height: 1.2;
+  text-align: center;
+  word-break: break-word;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
 }
  
-.food-desc {
-  font-size: 18rpx;
+.food-meta-band {
+  flex: 1 1 0;
+  min-height: 0;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  gap: 4rpx;
+  padding: 0 8rpx 4rpx;
+  background: #ffffff;
+  box-sizing: border-box;
+}
+
+.food-meta-size,
+.food-meta-types {
+  flex: 1;
+  min-width: 0;
+  font-size: 14rpx;
   color: #6b7280;
-  display: block;
+  font-weight: 500;
+  line-height: 1.15;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
  
+.food-meta-size {
+  text-align: left;
+}
+
+.food-meta-types {
+  text-align: right;
+}
+
 .modal-mask {
   position: fixed;
   top: 0;
@@ -1306,21 +1482,27 @@ const goBluetoothPage = () =&gt; {
     padding: 20rpx 24rpx;
   }
  
-  /* 平板：内联样式在运行时由 rpx 换算，此处仅作 H5 预览补充 */
-
   .food-card {
     width: 31%;
-    max-width: 280rpx;
-    padding: 10rpx;
-    margin: 0 7rpx 14rpx 7rpx;
+    max-width: 300rpx;
+    margin: 0 8rpx 16rpx 8rpx;
   }
  
-  .food-img-wrap {
-    padding-top: 62%;
+  .food-name {
+    font-size: 22rpx;
+  }
+
+  .food-meta-size,
+  .food-meta-types {
+    font-size: 16rpx;
   }
  
   .sidebar {
     width: 260rpx;
   }
+
+  .cat-card-frame {
+    max-width: 220rpx;
+  }
 }
 </style>
@@ -24,30 +24,13 @@
       </view>
  
       <template v-else>
-        <view class="food-card">
-          <view class="food-info">
-            <text class="food-name">{{ displayProductName }}</text>
-            <text class="food-cat">{{ productCategory }}</text>
-            <view v-if="labelTypeName" class="food-label-type">
-              <AppIcon name="tag" size="sm" color="primary" />
-              <text class="food-label-type-text">{{ labelTypeName }}</text>
-            </view>
-          </view>
-          <view class="food-template">
-            <text class="template-size">{{ templateSize }}</text>
-            <text class="template-name">{{ templateName }}</text>
-          </view>
-        </view>
+        <text class="section-title section-title-first">Label Preview</text>
  
-        <view class="qty-card">
-          <text class="qty-label">Print Quantity</text>
-          <view class="qty-control">
-            <view class="qty-btn" :class="{ disabled: printQty <= 1 }" @click="decrement">
-              <AppIcon name="minus" size="sm" color="gray" />
-            </view>
-            <text class="qty-value">{{ printQty }}</text>
-            <view class="qty-btn" @click="increment">
-              <AppIcon name="plus" size="sm" color="gray" />
+        <view class="label-card">
+          <view class="label-img-wrap">
+            <image v-if="previewImageSrc" :src="previewImageSrc" class="label-img" mode="widthFix" />
+            <view v-else class="label-placeholder">
+              <text class="label-placeholder-text">No preview image</text>
             </view>
           </view>
         </view>
@@ -74,13 +57,28 @@
         </view>
  
         <view v-if="printFreeFieldList.length" class="print-options-card">
-          <text class="print-options-title">Print input</text>
-          <text class="print-options-hint">
-            with a box below. If the template has a unit, it is appended on the label after what you type.
-          </text>
+          <text class="print-input-prompt">Please enter below value(s) to print the label:</text>
           <view v-for="el in printFreeFieldList" :key="'free-' + el.id" class="print-option-block">
             <text class="print-option-label">{{ freeFieldNameLabel(el) }}</text>
-            <template v-if="freeFieldInputKind(el) === 'text'">
+            <template v-if="isWeightPrintField(el)">
+              <input
+                class="free-field-input"
+                type="digit"
+                :value="printFreeFieldValues[el.id] ?? ''"
+                :placeholder="weightInputPlaceholder(readWeightInputMode(el.config || {}))"
+                @input="onFreeFieldInput(el.id, $event)"
+              />
+            </template>
+            <template v-else-if="freeFieldInputKind(el) === 'number'">
+              <input
+                class="free-field-input"
+                type="digit"
+                :value="printFreeFieldValues[el.id] ?? ''"
+                placeholder="0"
+                @input="onFreeFieldInput(el.id, $event)"
+              />
+            </template>
+            <template v-else-if="freeFieldInputKind(el) === 'text'">
               <input
                 class="free-field-input"
                 type="text"
@@ -116,36 +114,42 @@
           </view>
         </view>
  
-        <text class="section-title">Label Preview</text>
-
-        <view class="label-card">
-          <view class="label-img-wrap">
-            <image v-if="previewImageSrc" :src="previewImageSrc" class="label-img" mode="widthFix" />
-            <view v-else class="label-placeholder">
-              <text class="label-placeholder-text">No preview image</text>
+        <scroll-view class="meta-footer-scroll" scroll-x enable-flex>
+          <view class="meta-footer-row">
+            <view class="meta-item">
+              <text class="info-label">Product</text>
+              <text class="info-value">{{ displayProductName || '—' }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Category</text>
+              <text class="info-value">{{ productCategory || '—' }}</text>
+            </view>
+            <view v-if="labelTypeName" class="meta-item">
+              <text class="info-label">Type</text>
+              <text class="info-value">{{ labelTypeName }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Size</text>
+              <text class="info-value">{{ templateSize || '—' }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Template</text>
+              <text class="info-value">{{ templateName || '—' }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Label ID</text>
+              <text class="info-value">{{ footerLabelIdDisplay }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Last Edited</text>
+              <text class="info-value">{{ lastEdited }}</text>
+            </view>
+            <view class="meta-item">
+              <text class="info-label">Location</text>
+              <text class="info-value">{{ locationName }}</text>
             </view>
           </view>
-        </view>
-
-        <view class="info-row">
-          <view class="info-item">
-            <text class="info-label">Label ID</text>
-            <text class="info-value">{{ labelIdDisplay }}</text>
-          </view>
-          <view class="info-item">
-            <text class="info-label">Last Edited</text>
-            <text class="info-value">{{ lastEdited }}</text>
-          </view>
-          <view class="info-item">
-            <text class="info-label">Location</text>
-            <text class="info-value">{{ locationName }}</text>
-          </view>
-        </view>
-
-        <view class="note-card">
-          <AppIcon name="alert" size="sm" color="blue" />
-          <text class="note-text">This is a preview of the label. Actual printed labels may vary slightly in appearance.</text>
-        </view>
+        </scroll-view>
       </template>
     </view>
  
@@ -161,6 +165,15 @@
         <view class="btn-preview-sq" @click="showPreviewModal = true">
           <AppIcon name="eye" size="md" color="primary" />
         </view>
+        <view class="bottom-qty-control">
+          <view class="qty-btn qty-btn-minus" :class="{ disabled: printQty <= 1 }" @click="decrement">
+            <AppIcon name="minus" size="sm" color="gray" />
+          </view>
+          <text class="qty-value">{{ printQty }}</text>
+          <view class="qty-btn qty-btn-plus" @click="increment">
+            <AppIcon name="plus" size="sm" color="white" />
+          </view>
+        </view>
         <view class="print-btn" :class="{ disabled: isPrinting || previewLoading || !systemTemplate }" @click="handlePrint">
           <AppIcon name="printer" size="sm" color="white" />
           <text class="print-btn-text">{{ isPrinting ? 'Printing...' : 'Print' }}</text>
@@ -174,10 +187,6 @@
           <view class="modal-label-inner">
             <image :src="previewImageSrc" class="modal-label-img" mode="widthFix" />
           </view>
-          <view class="modal-label-id">
-            <text class="modal-label-id-label">Label ID</text>
-            <text class="modal-label-id-value">{{ labelIdDisplay }}</text>
-          </view>
         </view>
       </view>
     </view>
@@ -232,7 +241,7 @@
 </template>
  
 <script setup lang="ts">
-import { ref, computed, getCurrentInstance, nextTick } from 'vue'
+import { ref, computed, getCurrentInstance, nextTick, watch } from 'vue'
 import { onLoad, onShow, onUnload } from '@dcloudio/uni-app'
 import AppIcon from '../../components/AppIcon.vue'
 import SideMenu from '../../components/SideMenu.vue'
@@ -263,12 +272,18 @@ import {
   isPrintInputOptionsElement,
   mergePrintInputFreeFields,
   mergePrintOptionSelections,
+  printInputFieldLabelFromElement,
+  printInputPreText,
   readFreeFieldValuesFromTemplate,
   readSelectionsFromTemplate,
   validatePrintInputFreeFieldsBeforePrint,
   validatePrintInputOptionsBeforePrint,
 } from '../../utils/labelPreview/printInputOptions'
 import {
+  readWeightInputMode,
+  weightInputPlaceholder,
+} from '../../utils/weightElement'
+import {
   buildLabelPrintJobPayload,
   setLastLabelPrintJobPayload,
 } from '../../utils/labelPreview/buildLabelPrintPayload'
@@ -285,19 +300,32 @@ import {
 } from '../../services/usAppLabeling'
 import {
   applyTemplateProductDefaultValuesToTemplate,
-  applyProductCodeValueToTemplateScanElements,
   applyLabelBindingsToPreviewTemplate,
+  applyLabelSizeTextToTemplate,
+  applyProductCodeValueToTemplateScanElements,
+  expandNutritionElementsToFitContent,
   extractProductCodeValueFromPreviewPayload,
   extractTemplateProductDefaultValuesFromPreviewPayload,
   normalizeLabelTemplateFromPreviewApi,
   overlayProductNameOnPreviewTemplate,
 } from '../../utils/labelPreview/normalizePreviewTemplate'
 import {
+  applyLabelIdDisplayToTemplate,
+  templateIncludesLabelIdElement,
+} from '../../utils/labelPreview/labelIdElement'
+import {
+  applyEmployeeDisplayToTemplate,
+  templateIncludesEmployeeElement,
+} from '../../utils/labelPreview/employeeElement'
+import { applyLiveDateTimeFieldsToTemplate } from '../../utils/labelPreview/printInputOffset'
+import { readInvertColors } from '../../utils/invertColorsConfig'
+import {
   getLabelPrintRasterLayout,
   getPreviewCanvasCssSize,
   renderLabelPreviewCanvasImageDataForPrint,
   renderLabelPreviewCanvasToTempPathForPrint,
   renderLabelPreviewToTempPath,
+  settleAfterLabelCanvasResize,
 } from '../../utils/labelPreview/renderLabelPreviewCanvas'
 import {
   hydrateSystemTemplateImagesForPrint,
@@ -305,13 +333,16 @@ import {
 } from '../../utils/print/hydrateTemplateImagesForPrint'
 import {
   normalizeTemplateForNativeFastJob,
+  templateHasDateTimeElements,
   templateHasUnsupportedNativeFastElements,
+  templateRequiresCanvasStyleFidelity,
 } from '../../utils/print/nativeTemplateElementSupport'
+import { isVirtualBtPrinterDeviceName } from '../../utils/print/bluetoothPrinterAllowlist'
 import {
   ensureTemplateHeightCoversElements,
   getTemplatePhysicalSizeMm,
   isTemplateWithinNativeFastPrintBounds,
-  templateContentHeightPx,
+  rasterDotsToMillimeters,
 } from '../../utils/print/templatePhysicalMm'
 import { isPrinterReadySync } from '../../utils/print/printerReadiness'
 import {
@@ -320,7 +351,13 @@ import {
   isNativeBaseClassicBluetoothTransport,
   getPrinterDebugSnapshot,
   preferBuiltinPrinterOnAioDevice,
+  restoreD320faxVirtualBtBluetoothMode,
 } from '../../utils/print/printerConnection'
+import {
+  persistPrintRunDiagnostics,
+  printRunDiag,
+  startPrintRunDiagnostics,
+} from '../../utils/print/printRunDiagnostics'
 import { isUsAppSessionExpiredError } from '../../utils/usAppApiRequest'
 import { getDeviceFingerprint } from '../../utils/deviceInfo'
  
@@ -666,6 +703,9 @@ function applyNativeTemplateStyleScale(
         // 时间/日期类右对齐文本在部分机型原生 TEXT 宽度估算有误差，强制位图可避免截断。
         cfg.forceRasterText = true
       }
+      if (readInvertColors(cfg)) {
+        cfg.forceRasterText = true
+      }
     }
     if (type === 'BARCODE') {
       const raw = String(
@@ -803,7 +843,13 @@ const templateSize = ref(&#39;&#39;)
 const templateName = ref('')
 const lastEdited = ref('')
 const locationName = ref('')
-const labelIdDisplay = ref('')
+/** 模板含 Label ID 控件时，接口返回的门店当日打印序号（yyyyMMdd-n），用于画布预览/出纸 */
+const printLabelDisplayId = ref('')
+
+const footerLabelIdDisplay = computed(() => {
+  const id = printLabelDisplayId.value.trim()
+  return id || '—'
+})
  
 const previewLoading = ref(true)
 const previewError = ref('')
@@ -811,6 +857,10 @@ const previewImageSrc = ref(&#39;&#39;)
 const systemTemplate = ref<SystemLabelTemplate | null>(null)
 /** 未合并「打印多选项」前的模板，用于反复 merge */
 const basePreviewTemplate = ref<SystemLabelTemplate | null>(null)
+/** 接口返回的 templateProductDefaults，每次合并/重绘按当前时刻重算日期时间 */
+const previewProductDefaults = ref<Record<string, string>>({})
+/** 最近一次 8.2 原始响应，便于 defaults 解析失败时重试 */
+const lastPreviewRawPayload = ref<unknown>(null)
 const printOptionSelections = ref<Record<string, string[]>>({})
 const dictLabelsByElementId = ref<Record<string, string>>({})
 const dictValuesByElementId = ref<Record<string, string[]>>({})
@@ -865,6 +915,8 @@ function dictValuesForElement(elementId: string): string[] {
 }
  
 function optionFieldTitle(el: SystemTemplateElementBase): string {
+  const preText = printInputPreText(el)
+  if (preText) return preText
   return (
     dictLabelsByElementId.value[el.id] ||
     el.elementName ||
@@ -890,13 +942,19 @@ function togglePrintOption(elementId: string, value: string) {
 }
  
 function freeFieldNameLabel(el: SystemTemplateElementBase): string {
-  const n = el.elementName || el.inputKey || 'Field'
-  return `${n}:`
+  return printInputFieldLabelFromElement(el)
+}
+
+function isWeightPrintField(el: SystemTemplateElementBase): boolean {
+  return String(el.type || '').toUpperCase() === 'WEIGHT'
 }
  
 function freeFieldPlaceholder(el: SystemTemplateElementBase): string {
   const c = el.config || {}
   const type = String(el.type || '').toUpperCase()
+  if (type === 'WEIGHT') {
+    return weightInputPlaceholder(readWeightInputMode(c))
+  }
   if (type === 'DATE' || type === 'TIME') {
     return String(c.format ?? c.Format ?? '')
   }
@@ -908,10 +966,11 @@ function freeFieldDateFormat(el: SystemTemplateElementBase): string {
   return String(c.format ?? c.Format ?? '').trim()
 }
  
-function freeFieldInputKind(el: SystemTemplateElementBase): 'text' | 'date' | 'time' | 'datetime' {
+function freeFieldInputKind(el: SystemTemplateElementBase): 'text' | 'number' | 'date' | 'time' | 'datetime' {
   const type = String(el.type || '').toUpperCase()
   const c = el.config || {}
   const inputType = String(c.inputType ?? c.InputType ?? '').toLowerCase()
+  if (inputType === 'number') return 'number'
   if (type === 'TIME') return 'time'
   if (type === 'DATE' && inputType === 'datetime') return 'datetime'
   if (type === 'DATE') return 'date'
@@ -1149,21 +1208,41 @@ function onFreeFieldInput(elementId: string, e: { detail?: { value?: string } })
   }, 280)
 }
  
-function computeMergedPreviewTemplate(): SystemLabelTemplate | null {
-  const base = basePreviewTemplate.value
+function computeMergedPreviewTemplate(at?: Date): SystemLabelTemplate | null {
+  let base = basePreviewTemplate.value
   if (!base) return null
+  const baseTime = at ?? new Date()
+  let defaults = previewProductDefaults.value
+  if (Object.keys(defaults).length === 0 && lastPreviewRawPayload.value != null) {
+    const recovered = extractTemplateProductDefaultValuesFromPreviewPayload(lastPreviewRawPayload.value)
+    if (Object.keys(recovered).length > 0) {
+      defaults = recovered
+      previewProductDefaults.value = recovered
+    }
+  }
+  if (Object.keys(defaults).length > 0) {
+    base = applyTemplateProductDefaultValuesToTemplate(base, defaults, baseTime)
+  }
   let m = mergePrintOptionSelections(
     base,
     printOptionSelections.value,
     dictLabelsByElementId.value
   )
   m = mergePrintInputFreeFields(m, printFreeFieldValues.value)
+  if (templateIncludesLabelIdElement(m) && printLabelDisplayId.value.trim()) {
+    m = applyLabelIdDisplayToTemplate(m, printLabelDisplayId.value.trim())
+  }
+  if (templateIncludesEmployeeElement(m)) {
+    m = applyEmployeeDisplayToTemplate(m)
+  }
+  m = applyLiveDateTimeFieldsToTemplate(m, baseTime)
   m = applyLabelBindingsToPreviewTemplate(m, {
     labelName: previewLabelName.value,
     labelTypeName: labelTypeName.value,
     productName: displayProductName.value,
   })
-  return m
+  m = expandNutritionElementsToFitContent(m)
+  return ensureTemplateHeightCoversElements(m)
 }
  
 async function loadDictionaryMetaForTemplate(t: SystemLabelTemplate) {
@@ -1187,7 +1266,7 @@ async function loadDictionaryMetaForTemplate(t: SystemLabelTemplate) {
   dictValuesByElementId.value = values
 }
  
-/** 画布 :width/:height 与离屏节点布局在 H5 上晚一拍，过早 canvasToTempFilePath 会裁切底部；双 nextTick + 双 rAF 再导出 */
+/** 画布 :width/:height 在 H5 / App 上可能晚一拍，过早 canvasToTempFilePath 会裁切底部黑条 */
 async function waitForCanvasLayout(): Promise<void> {
   await nextTick()
   await nextTick()
@@ -1200,6 +1279,13 @@ async function waitForCanvasLayout(): Promise&lt;void&gt; {
       setTimeout(() => resolve(), 32)
     }
   })
+  try {
+    if (typeof plus !== 'undefined') {
+      await new Promise<void>((r) => setTimeout(r, 160))
+    }
+  } catch {
+    /* H5 */
+  }
 }
  
 /** 光栅打印前同步隐藏 canvas 像素尺寸，避免缓冲区高度仍为预览值导致底部裁切 */
@@ -1259,6 +1345,12 @@ onShow(() =&gt; {
   }
 })
  
+watch(showPreviewModal, (open) => {
+  if (open && basePreviewTemplate.value) {
+    void refreshPreviewFromSelections()
+  }
+})
+
 onUnload(() => {
   if (deferredPreviewRedrawTimer != null) {
     clearTimeout(deferredPreviewRedrawTimer)
@@ -1277,7 +1369,7 @@ onLoad((opts: Record&lt;string, string | undefined&gt;) =&gt; {
  
   const name = uni.getStorageSync('storeName')
   if (typeof name === 'string' && name.trim()) locationName.value = name.trim()
-  labelIdDisplay.value = '—'
+  printLabelDisplayId.value = ''
   lastEdited.value = '—'
  
   loadPreview()
@@ -1306,6 +1398,8 @@ async function loadPreview() {
   previewImageSrc.value = ''
   systemTemplate.value = null
   basePreviewTemplate.value = null
+  previewProductDefaults.value = {}
+  lastPreviewRawPayload.value = null
   printOptionSelections.value = {}
   printFreeFieldValues.value = {}
   dictLabelsByElementId.value = {}
@@ -1316,7 +1410,9 @@ async function loadPreview() {
       locationId: loc,
       labelCode: labelCode.value,
       productId: productId.value || undefined,
+      baseTime: new Date().toISOString(),
     })
+    lastPreviewRawPayload.value = raw
     const root = raw as Record<string, unknown>
     const nested = root.data ?? root.Data
     const inner =
@@ -1324,7 +1420,7 @@ async function loadPreview() {
         ? (nested as Record<string, unknown>)
         : null
  
-    /** 8.2 预览：labelLastEdited / labelId（兼容 data 嵌套、lastEdited、PascalCase） */
+    /** 8.2 预览：labelLastEdited / labelId（兼容 printLabelDisplayId、PascalCase、data 嵌套） */
     const readLastEdited = (L: Record<string, unknown> | null): string => {
       if (!L) return ''
       const v =
@@ -1334,17 +1430,52 @@ async function loadPreview() {
         L.LastEdited
       return typeof v === 'string' && v.trim() ? v.trim() : ''
     }
-    const readLabelId = (L: Record<string, unknown> | null): string => {
+    const readPrintLabelDisplayId = (L: Record<string, unknown> | null): string => {
       if (!L) return ''
-      const v = L.labelId ?? L.LabelId
-      return v != null && String(v).trim() !== '' ? String(v).trim() : ''
+      const keys = [
+        'printLabelDisplayId',
+        'PrintLabelDisplayId',
+        'labelDisplayId',
+        'LabelDisplayId',
+        'labelId',
+        'LabelId',
+      ]
+      for (const key of keys) {
+        const v = L[key]
+        if (v != null && String(v).trim() !== '') return String(v).trim()
+      }
+      return ''
+    }
+    const readTemplateName = (...sources: Array<unknown>): string => {
+      for (const source of sources) {
+        if (source == null || typeof source !== 'object' || Array.isArray(source)) continue
+        const obj = source as Record<string, unknown>
+        const direct =
+          obj.name ??
+          obj.Name ??
+          obj.templateName ??
+          obj.TemplateName
+        if (direct != null && String(direct).trim()) return String(direct).trim()
+        const nestedTemplate = obj.template ?? obj.Template
+        if (nestedTemplate != null && typeof nestedTemplate === 'object' && !Array.isArray(nestedTemplate)) {
+          const t = nestedTemplate as Record<string, unknown>
+          const nestedName =
+            t.name ??
+            t.Name ??
+            t.templateName ??
+            t.TemplateName
+          if (nestedName != null && String(nestedName).trim()) return String(nestedName).trim()
+        }
+      }
+      return ''
     }
  
     const leStr = readLastEdited(root) || readLastEdited(inner)
     lastEdited.value = leStr || '—'
  
-    const lidStr = readLabelId(root) || readLabelId(inner)
-    if (lidStr) labelIdDisplay.value = lidStr
+    const displayIdStr =
+      readPrintLabelDisplayId(root) || readPrintLabelDisplayId(inner)
+    printLabelDisplayId.value = displayIdStr
  
     const tmplPayload =
       inner != null &&
@@ -1360,6 +1491,10 @@ async function loadPreview() {
       previewLoading.value = false
       return
     }
+    const templateNameFromApi = readTemplateName(inner, root, tmplRaw)
+    if (templateNameFromApi) {
+      templateName.value = templateNameFromApi
+    }
     const lstRaw =
       root.labelSizeText ??
       root.LabelSizeText ??
@@ -1369,7 +1504,12 @@ async function loadPreview() {
     if (labelSizeTextFromApi && labelSizeTextFromApi.trim()) {
       templateSize.value = labelSizeTextFromApi.trim()
     }
+    let tmplBase = tmplRaw
+    if (labelSizeTextFromApi && labelSizeTextFromApi.trim()) {
+      tmplBase = applyLabelSizeTextToTemplate(tmplBase, labelSizeTextFromApi)
+    }
     const productDefaults = extractTemplateProductDefaultValuesFromPreviewPayload(raw)
+    previewProductDefaults.value = productDefaults
     const readLabelName = (L: Record<string, unknown> | null): string => {
       if (!L) return ''
       const v = L.labelName ?? L.LabelName
@@ -1379,19 +1519,12 @@ async function loadPreview() {
       readLabelName(root) ||
       readLabelName(inner) ||
       ''
-    let tmplWithDefaults =
-      Object.keys(productDefaults).length > 0
-        ? applyTemplateProductDefaultValuesToTemplate(tmplRaw, productDefaults)
-        : tmplRaw
     const productCodeValue = extractProductCodeValueFromPreviewPayload(raw)
     if (productCodeValue) {
-      tmplWithDefaults = applyProductCodeValueToTemplateScanElements(
-        tmplWithDefaults,
-        productCodeValue,
-      )
+      tmplBase = applyProductCodeValueToTemplateScanElements(tmplBase, productCodeValue)
     }
-    /** 画布像素仅按接口 template 的 width / height / unit 换算（与 renderLabelPreviewCanvas.toCanvasPx 一致），不用 labelSizeText 覆盖以免单位被误判 */
-    let base = overlayProductNameOnPreviewTemplate(tmplWithDefaults, displayProductName.value)
+    /** 仅存原始模板 + 默认值；日期/时间在 computeMergedPreviewTemplate 内按同一 baseTime 重算一次 */
+    let base = overlayProductNameOnPreviewTemplate(tmplBase, displayProductName.value)
     base = applyLabelBindingsToPreviewTemplate(base, {
       labelName: previewLabelName.value,
       labelTypeName: labelTypeName.value,
@@ -1455,6 +1588,11 @@ const handlePrint = async () =&gt; {
   if (isPrinting.value || previewLoading.value || !systemTemplate.value) return
  
   preferBuiltinPrinterOnAioDevice()
+  btConnected.value = isPrinterReadySync()
+  const summaryAfterPrefer = getCurrentPrinterSummary()
+  if (summaryAfterPrefer.type === 'builtin') {
+    btDeviceName.value = summaryAfterPrefer.driverName || 'Built-in'
+  }
  
   if (!isPrinterReadySync()) {
     showNoPrinterModal.value = true
@@ -1483,7 +1621,9 @@ const handlePrint = async () =&gt; {
   }
  
   try {
-    await ensureClassicReadyForPrint()
+    if (getCurrentPrinterSummary().type === 'bluetooth') {
+      await ensureClassicReadyForPrint()
+    }
   } catch (e: any) {
     const msg = e?.message ? String(e.message) : 'CLASSIC_NOT_READY'
     uni.showModal({
@@ -1515,6 +1655,7 @@ const handlePrint = async () =&gt; {
   }
  
   isPrinting.value = true
+  startPrintRunDiagnostics()
   const printJobId = createPrintJobId()
   let watchdog: ReturnType<typeof setTimeout> | null = null
   let globalWatchdog: ReturnType<typeof setTimeout> | null = null
@@ -1535,13 +1676,14 @@ const handlePrint = async () =&gt; {
   try {
     lastShownPrintPct = -999
     uni.showLoading({ title: 'Rendering…', mask: true })
-    /** 按 label-template-*.json 结构组装 template + printInputJson；出纸与 Test Print 相同：PNG → Bitmap → TSC → BLE */
-    const mergedForPrint = computeMergedPreviewTemplate()
+    /** 出纸时刻为唯一基准：Prep / Use By 等同一次点击内共用当前时间 */
+    const printBaseTime = new Date()
+    const mergedForPrint = computeMergedPreviewTemplate(printBaseTime)
     const tmplBase = mergedForPrint ?? systemTemplate.value
     if (!tmplBase || !instance) {
       throw new Error('No label to print.')
     }
-    const tmpl = ensureTemplateHeightCoversElements(tmplBase)
+    let tmpl = ensureTemplateHeightCoversElements(tmplBase)
     const phys = getTemplatePhysicalSizeMm(tmpl)
     console.info(
       '[preview] print physical size',
@@ -1556,18 +1698,63 @@ const handlePrint = async () =&gt; {
       printFreeFieldValues.value
     )
     printStage = 'payload-ready'
+
+    /** 模板含 Label ID 时先落库以分配当日序号，再带着真实序号出纸（与 Print Log 一致） */
+    let printLogAlreadySynced = false
+    let printLogRequestBody: ReturnType<typeof buildUsAppLabelPrintRequestBody> = null
+    const printClientRequestId = createPrintClientRequestId()
+    if (templateIncludesLabelIdElement(tmpl)) {
+      printStage = 'reserve-label-id'
+      const persistTemplateDocEarly = JSON.parse(
+        JSON.stringify(buildLabelPrintJobPayload(tmpl, printInputJson).template),
+      ) as Record<string, unknown>
+      const printInputSnapshotEarly: Record<string, unknown> = {
+        ...printInputJson,
+        ...persistTemplateDocEarly,
+      }
+      printLogRequestBody = buildUsAppLabelPrintRequestBody({
+        locationId: getCurrentStoreId(),
+        labelCode: labelCode.value,
+        productId: productId.value || undefined,
+        printQuantity: printQty.value,
+        mergedTemplate: printInputSnapshotEarly,
+        clientRequestId: printClientRequestId,
+        printerMac: getBluetoothConnection()?.deviceId || undefined,
+      })
+      if (printLogRequestBody) {
+        const printOut = await postUsAppLabelPrint(printLogRequestBody)
+        const ids =
+          printOut?.printLabelDisplayIds ??
+          (printOut as { PrintLabelDisplayIds?: string[] })?.PrintLabelDisplayIds ??
+          []
+        const firstId = Array.isArray(ids) && ids.length ? String(ids[0]).trim() : ''
+        if (firstId) {
+          printLabelDisplayId.value = firstId
+          tmpl = ensureTemplateHeightCoversElements(
+            applyLabelIdDisplayToTemplate(tmpl, firstId),
+          )
+        }
+        printLogAlreadySynced = true
+      }
+    }
+
     /**
      * 经典蓝牙 + native-plugin（含 Virtual BT）：走原生 printTemplate（JSON，快，与预览坐标一致）。
-     * Virtual BT 不做 xScale/安全区收窄（易导致营养表错位、条码丢失）；光栅仅作回退。
-     * 普通蓝牙（BLE 或 classic+JS socket）：canPrintCurrentLabelViaNativeFastJob 为 false，走下方光栅/直发 TSC。
+     * Virtual BT / 内置 / 含日期时间或黑底白字：必须走 Canvas 光栅（与屏幕预览像素一致），禁止 JSON 直打。
      */
-    const tmplForNativeJob = normalizeTemplateForNativeFastJob(tmpl, printInputJson as any)
+    const tmplForNativeJob = normalizeTemplateForNativeFastJob(tmpl, printInputJson as any, printBaseTime)
+    const printSummary = getCurrentPrinterSummary()
+    const mustUseCanvasRasterPrint =
+      printSummary.type === 'builtin'
+      || templateRequiresCanvasStyleFidelity(tmpl)
+      || templateHasDateTimeElements(tmpl)
     const currentDriver = getCurrentPrinterDriver()
     const currentConn = getBluetoothConnection()
     const isD320faxClassicNative =
       currentDriver.key === 'd320fax' && currentConn?.deviceType === 'classic'
     const useNativeTemplatePrint =
-      canPrintCurrentLabelViaNativeFastJob()
+      !mustUseCanvasRasterPrint
+      && canPrintCurrentLabelViaNativeFastJob()
       && isTemplateWithinNativeFastPrintBounds(tmpl)
       && !templateHasUnsupportedNativeFastElements(tmplForNativeJob)
  
@@ -1789,7 +1976,10 @@ const handlePrint = async () =&gt; {
       const shouldUseDirectTemplate =
         driver.protocol === 'tsc' &&
         templateHasQrDataForCommandPrint(tmpl) &&
-        !templateHasUnsupportedElementsForCommandPrint(tmpl)
+        !templateHasUnsupportedElementsForCommandPrint(tmpl) &&
+        !templateRequiresCanvasStyleFidelity(tmpl) &&
+        !templateHasDateTimeElements(tmpl) &&
+        !mustUseCanvasRasterPrint
       if (shouldUseDirectTemplate) {
         const directJobMs = 240000
         if (globalWatchdog) {
@@ -1841,21 +2031,19 @@ const handlePrint = async () =&gt; {
         }
         const maxDots =
           rasterDriver.imageMaxWidthDots || (rasterDriver.protocol === 'esc' ? 384 : 576)
-        const escUseContentH = rasterDriver.protocol === 'esc'
-        const contentHpx = escUseContentH ? templateContentHeightPx(tmpl) : undefined
-        const layout = getLabelPrintRasterLayout(
-          tmpl,
-          maxDots,
-          rasterDriver.imageDpi || 203,
-          contentHpx != null ? { contentHeightPx: contentHpx } : undefined,
-        )
+        const printDpi = rasterDriver.imageDpi || 203
+        const layout = getLabelPrintRasterLayout(tmpl, maxDots, printDpi)
+        const layoutMm = rasterDotsToMillimeters(layout.outW, layout.outH, printDpi)
  
-        canvasCssW.value = layout.outW
-        canvasCssH.value = layout.outH
-        await nextTick()
-        await new Promise<void>((r) => setTimeout(r, 50))
+        await applyPrintCanvasLayout(layout)
+        await settleAfterLabelCanvasResize()
  
         const useCanvasRasterPath = shouldRasterPrintViaCanvasImageData()
+        printRunDiag('preview_raster_path', {
+          useCanvas: useCanvasRasterPath,
+          deviceType: getBluetoothConnection()?.deviceType || '-',
+          driver: driver.key,
+        })
         let tmpPath = ''
         if (useCanvasRasterPath) {
           try {
@@ -1915,8 +2103,10 @@ const handlePrint = async () =&gt; {
                   clearTopRasterRows: 0,
                   targetWidthDots: layout.outW,
                   targetHeightDots: layout.outH,
-                  useContentHeight: true,
+                  useContentHeight: false,
                   cutBetweenCopies: true,
+                  widthMm: layoutMm.widthMm,
+                  heightMm: layoutMm.heightMm,
                 },
                 (percent) => {
                   if (!isPrintJobActive(printJobId)) return
@@ -1933,6 +2123,8 @@ const handlePrint = async () =&gt; {
                     targetWidthDots: layout.outW,
                     targetHeightDots: layout.outH,
                     labelRasterFixedHeight: true,
+                    widthMm: layoutMm.widthMm,
+                    heightMm: layoutMm.heightMm,
                   },
                   (percent) => {
                     if (!isPrintJobActive(printJobId)) return
@@ -1948,7 +2140,11 @@ const handlePrint = async () =&gt; {
             /* 内置已处理完本分支，跳过下方 PNG 光栅 */
             tmpPath = '__builtin_canvas_done__'
           } catch (e) {
-            console.warn('[preview] builtin canvasGetImageData failed, fallback PNG raster', e)
+            console.warn('[preview] canvasGetImageData raster failed', e)
+            // BLE / 内置：PNG→Bitmap 会 RASTER_EMPTY_IMAGE，禁止回退 PNG。
+            if (useCanvasRasterPath) {
+              throw e
+            }
             tmpPath = ''
           }
         }
@@ -2014,8 +2210,10 @@ const handlePrint = async () =&gt; {
                 clearTopRasterRows: 0,
                 targetWidthDots: layout.outW,
                 targetHeightDots: layout.outH,
-                useContentHeight: true,
+                useContentHeight: false,
                 cutBetweenCopies: true,
+                widthMm: layoutMm.widthMm,
+                heightMm: layoutMm.heightMm,
               },
               (percent) => {
                 if (!isPrintJobActive(printJobId)) return
@@ -2031,6 +2229,8 @@ const handlePrint = async () =&gt; {
                 targetWidthDots: layout.outW,
                 targetHeightDots: layout.outH,
                 labelRasterFixedHeight: true,
+                widthMm: layoutMm.widthMm,
+                heightMm: layoutMm.heightMm,
               },
               (percent) => {
                 if (!isPrintJobActive(printJobId)) return
@@ -2047,10 +2247,10 @@ const handlePrint = async () =&gt; {
  
     /** 接口 9：仅本页业务标签出纸后落库（打印机设置/蓝牙 Test Print 不会执行此段） */
     let printLogSyncFailed = false
-    let printLogRequestBody: ReturnType<typeof buildUsAppLabelPrintRequestBody> = null
-    if (!isPrintJobActive(printJobId)) {
-      console.warn('[preview] skip post-print API/preview refresh (stale job id)')
-    } else try {
+    if (!printLogAlreadySynced) {
+      printLogRequestBody = null
+    }
+    if (!printLogAlreadySynced && isPrintJobActive(printJobId)) try {
       const bt = getBluetoothConnection()
       /**
        * 接口 9 的 `printInputJson`：整份合并模板快照（与出纸 labelPrintJobPayload.template 同源）+
@@ -2070,7 +2270,7 @@ const handlePrint = async () =&gt; {
         productId: productId.value || undefined,
         printQuantity: printQty.value,
         mergedTemplate: printInputSnapshotForApi,
-        clientRequestId: createPrintClientRequestId(),
+        clientRequestId: printClientRequestId,
         printerMac: bt?.deviceId || undefined,
       })
       if (printLogRequestBody) {
@@ -2185,6 +2385,7 @@ const handlePrint = async () =&gt; {
       })
     }
   } finally {
+    persistPrintRunDiagnostics()
     if (!isPrintJobActive(printJobId)) return
     try {
       uni.hideLoading()
@@ -2254,7 +2455,7 @@ const handlePrint = async () =&gt; {
  
 .content {
   padding: 32rpx;
-  padding-bottom: 300rpx;
+  padding-bottom: 260rpx;
   box-sizing: border-box;
   overflow-x: hidden;
   overflow-x: clip;
@@ -2273,92 +2474,15 @@ const handlePrint = async () =&gt; {
   color: #6b7280;
 }
  
-.food-card {
-  background: #fff;
-  padding: 28rpx;
-  border-radius: 20rpx;
-  margin-bottom: 24rpx;
+.qty-control,
+.bottom-qty-control {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  gap: 24rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-}
-
-.food-info {
-  flex: 1;
-  min-width: 0;
-}
-
-.food-name {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #111827;
-  display: block;
-  margin-bottom: 4rpx;
-}
-
-.food-cat {
-  font-size: 26rpx;
-  color: #6b7280;
-  display: block;
-}
-
-.food-label-type {
-  display: flex;
-  align-items: center;
-  gap: 8rpx;
-  margin-top: 12rpx;
-}
-
-.food-label-type-text {
-  font-size: 24rpx;
-  color: var(--theme-primary);
-  font-weight: 500;
-}
-
-.food-template {
   flex-shrink: 0;
-  text-align: center;
-  background: #f3f4f6;
-  padding: 16rpx 20rpx;
-  border-radius: 14rpx;
-}
-
-.template-size {
-  font-size: 28rpx;
-  font-weight: 700;
-  color: #111827;
-  display: block;
 }
  
-.template-name {
-  font-size: 22rpx;
-  color: #6b7280;
-  display: block;
-  margin-top: 4rpx;
-}
-
-.qty-card {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: #fff;
-  padding: 24rpx 28rpx;
-  border-radius: 20rpx;
-  margin-bottom: 32rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-}
-
-.qty-label {
-  font-size: 30rpx;
-  font-weight: 600;
-  color: #111827;
-}
-
-.qty-control {
-  display: flex;
-  align-items: center;
+.bottom-qty-control {
+  gap: 10rpx;
 }
  
 .qty-btn {
@@ -2369,12 +2493,27 @@ const handlePrint = async () =&gt; {
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-shrink: 0;
 }
  
-.qty-btn:active {
+.bottom-qty-control .qty-btn {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+}
+
+.bottom-qty-control .qty-btn-minus {
   background: #e5e7eb;
 }
  
+.bottom-qty-control .qty-btn-plus {
+  background: #111827;
+}
+
+.qty-btn:active {
+  opacity: 0.85;
+}
+
 .qty-btn.disabled {
   opacity: 0.35;
 }
@@ -2387,6 +2526,12 @@ const handlePrint = async () =&gt; {
   color: #111827;
 }
  
+.bottom-qty-control .qty-value {
+  width: 56rpx;
+  font-size: 34rpx;
+  font-variant-numeric: tabular-nums;
+}
+
 .print-options-card {
   background: #fff;
   border-radius: 20rpx;
@@ -2411,6 +2556,15 @@ const handlePrint = async () =&gt; {
   margin-bottom: 24rpx;
 }
  
+.print-input-prompt {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: var(--theme-primary, #1f3a8a);
+  line-height: 1.45;
+  display: block;
+  margin-bottom: 24rpx;
+}
+
 .print-option-block {
   margin-bottom: 28rpx;
 }
@@ -2562,6 +2716,41 @@ const handlePrint = async () =&gt; {
   margin-bottom: 20rpx;
 }
  
+.section-title-first {
+  margin-top: 0;
+}
+
+.meta-footer-scroll {
+  width: 100%;
+  margin-bottom: 24rpx;
+  white-space: nowrap;
+}
+
+.meta-footer-row {
+  display: inline-flex;
+  flex-direction: row;
+  align-items: stretch;
+  gap: 10rpx;
+  padding-bottom: 4rpx;
+}
+
+.meta-item {
+  flex: 0 0 auto;
+  min-width: 168rpx;
+  max-width: 280rpx;
+  background: #fff;
+  padding: 16rpx 20rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+  box-sizing: border-box;
+}
+
+.meta-item .info-value {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .label-card {
   background: #fff;
   border-radius: 20rpx;
@@ -2608,24 +2797,6 @@ const handlePrint = async () =&gt; {
   color: #9ca3af;
 }
  
-.info-row {
-  display: flex;
-  margin-bottom: 24rpx;
-}
-
-.info-item {
-  flex: 1;
-  min-width: 0;
-  background: #fff;
-  padding: 20rpx 24rpx;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-}
-
-.info-item + .info-item {
-  margin-left: 10rpx;
-}
-
 .info-label {
   font-size: 22rpx;
   color: #9ca3af;
@@ -2640,23 +2811,6 @@ const handlePrint = async () =&gt; {
   display: block;
 }
  
-.note-card {
-  display: flex;
-  align-items: flex-start;
-  gap: 16rpx;
-  padding: 24rpx 28rpx;
-  background: #eff6ff;
-  border: 1rpx solid #bfdbfe;
-  border-radius: 16rpx;
-}
-
-.note-text {
-  flex: 1;
-  font-size: 26rpx;
-  color: #1e40af;
-  line-height: 1.5;
-}
-
 .bottom-bar {
   position: fixed;
   bottom: 0;
@@ -2710,13 +2864,13 @@ const handlePrint = async () =&gt; {
  
 .bottom-actions {
   display: flex;
-  align-items: stretch;
-  gap: 24rpx;
+  align-items: center;
+  gap: 16rpx;
 }
  
 .btn-preview-sq {
-  width: 100rpx;
-  height: 100rpx;
+  width: 88rpx;
+  height: 88rpx;
   flex-shrink: 0;
   background: #fff;
   border: 2rpx solid #d1d5db;
@@ -2733,7 +2887,7 @@ const handlePrint = async () =&gt; {
 .print-btn {
   flex: 1;
   min-width: 0;
-  height: 100rpx;
+  height: 88rpx;
   background: var(--theme-primary);
   border-radius: 16rpx;
   display: flex;
@@ -32,6 +32,26 @@
       </view>
     </view>
  
+    <view class="date-filter-bar">
+      <view class="date-field">
+        <AppDatePicker
+          :model-value="datePickerModelValue"
+          :max="todayYmd"
+          placeholder="ALL"
+          dialog-title="Print date"
+          @update:model-value="onDateConfirm"
+          @cancel="onDateCancel"
+        />
+      </view>
+      <view
+        class="today-btn"
+        :class="{ active: isTodayFilter }"
+        @click="selectToday"
+      >
+        <text class="today-btn-text">Today</text>
+      </view>
+    </view>
+
     <scroll-view
       class="content"
       scroll-y
@@ -42,7 +62,7 @@
         <text class="state-text">Loading…</text>
       </view>
       <view v-else-if="!loading && !items.length" class="state-block">
-        <text class="state-text">No print records</text>
+        <text class="state-text">{{ emptyStateText }}</text>
       </view>
  
       <!-- 卡片视图 -->
@@ -54,7 +74,6 @@
         >
           <view class="card-header">
             <text class="product-name">{{ displayField(row.productName) }}</text>
-            <text class="label-id">{{ shortRef(row) }}</text>
           </view>
           <view class="card-tags">
             <text class="tag">{{ tagLabelSize(row) }}</text>
@@ -62,15 +81,15 @@
           </view>
           <view class="card-details">
             <view class="detail-row">
-              <AppIcon name="clock" size="sm" color="gray" />
+              <AppIcon name="clock" size="xs" color="gray" />
               <text class="detail-text">{{ row.printedAt }}</text>
             </view>
             <view class="detail-row">
-              <AppIcon name="user" size="sm" color="gray" />
+              <AppIcon name="user" size="xs" color="gray" />
               <text class="detail-text">{{ displayField(row.operatorName) }}</text>
             </view>
             <view class="detail-row">
-              <AppIcon name="mapPin" size="sm" color="gray" />
+              <AppIcon name="mapPin" size="xs" color="gray" />
               <text class="detail-text">{{ displayField(row.locationName) }}</text>
             </view>
           </view>
@@ -93,24 +112,24 @@
       <view v-else class="log-table-wrap">
         <view class="log-table">
           <view class="log-table-header">
-            <text class="th th-product">Product</text>
-            <text class="th th-id">Ref</text>
-            <text class="th th-size">Label size</text>
-            <text class="th th-type">Type</text>
-            <text class="th th-printed">Printed At</text>
-            <text class="th th-action">Action</text>
+            <text class="th th-wrap th-product">Product</text>
+            <text class="th th-wrap th-size">Label size</text>
+            <text class="th th-wrap th-label-id">Label ID</text>
+            <text class="th th-wrap th-type">Type</text>
+            <text class="th th-fixed th-printed">Printed At</text>
+            <text class="th th-fixed th-action">Action</text>
           </view>
           <view
             v-for="row in items"
             :key="row.taskId + '-' + row.copyIndex"
             class="log-table-row"
           >
-            <text class="td td-product">{{ displayField(row.productName) }}</text>
-            <text class="td td-id">{{ shortRef(row) }}</text>
-            <text class="td td-size">{{ tagLabelSize(row) }}</text>
-            <text class="td td-type">{{ tagTypeName(row) }}</text>
-            <text class="td td-printed">{{ row.printedAt }}</text>
-            <view class="td td-action">
+            <text class="td td-wrap td-product">{{ displayField(row.productName) }}</text>
+            <text class="td td-wrap td-size">{{ tagLabelSize(row) }}</text>
+            <text class="td td-wrap td-label-id">{{ tagLabelId(row) }}</text>
+            <text class="td td-wrap td-type">{{ tagTypeName(row) }}</text>
+            <text class="td td-fixed td-printed">{{ row.printedAt }}</text>
+            <view class="td td-fixed td-action">
               <view class="reprint-btn-sm" @click="handleReprint(row)">
                 <AppIcon name="printer" size="sm" color="white" />
               </view>
@@ -138,9 +157,10 @@
 </template>
  
 <script setup lang="ts">
-import { ref, getCurrentInstance, nextTick } from 'vue'
+import { ref, computed, getCurrentInstance, nextTick } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import AppIcon from '../../components/AppIcon.vue'
+import AppDatePicker from '../../components/AppDatePicker.vue'
 import SideMenu from '../../components/SideMenu.vue'
 import LocationPicker from '../../components/LocationPicker.vue'
 import { getStatusBarHeight } from '../../utils/statusBar'
@@ -163,6 +183,61 @@ const statusBarHeight = getStatusBarHeight()
 const isMenuOpen = ref(false)
 const viewMode = ref<'card' | 'list'>('card')
  
+function formatYmd (d: Date): string {
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+}
+
+const todayYmd = formatYmd(new Date())
+/**
+ * null = 不传 printDateDay，后端不按日过滤（6-18 返回该门店全部记录）；
+ * yyyy-MM-dd = 确认后传 printDateDay 筛选该自然日。
+ */
+const filterDateYmd = ref<string | null>(todayYmd)
+
+const isTodayFilter = computed(() => filterDateYmd.value === todayYmd)
+const isAllDatesFilter = computed(() => filterDateYmd.value === null)
+/** 查全部时不传日期，控件显示 placeholder「ALL」 */
+const datePickerModelValue = computed(() => filterDateYmd.value ?? '')
+
+function toPrintDatePayload (ymd: string): string {
+  return (ymd || '').trim()
+}
+
+function formatMdY (ymd: string): string {
+  const [y, m, d] = ymd.split('-')
+  if (!y || !m || !d) return ymd
+  return `${m}/${d}/${y}`
+}
+
+/** 6-18：未传 printDateDay 时不带该字段；选定日期时传 yyyy-MM-dd */
+function resolvePrintDateDayForApi (): string | undefined {
+  if (filterDateYmd.value === null) return undefined
+  const payload = toPrintDatePayload(filterDateYmd.value)
+  return payload || undefined
+}
+
+const emptyStateText = computed(() => {
+  if (isAllDatesFilter.value) return 'No print records'
+  const ymd = filterDateYmd.value ?? todayYmd
+  return `No print records for ${formatMdY(ymd)}`
+})
+
+function onDateConfirm (value: string) {
+  const next = (value || '').trim()
+  filterDateYmd.value = next || todayYmd
+  loadPage(true)
+}
+
+function onDateCancel () {
+  filterDateYmd.value = null
+  loadPage(true)
+}
+
+function selectToday () {
+  filterDateYmd.value = todayYmd
+  loadPage(true)
+}
+
 const reprintCanvasW = ref(400)
 const reprintCanvasH = ref(400)
 const contentHeight = ref(0)
@@ -186,10 +261,12 @@ const computeContentHeight = async () =&gt; {
   const q = uni.createSelectorQuery().in(inst as any)
   q.select('.header-hero').boundingClientRect()
   q.select('.view-toggle').boundingClientRect()
+  q.select('.date-filter-bar').boundingClientRect()
   q.exec((rects: any[]) => {
     const headerH = Number(rects?.[0]?.height || 0)
     const toggleH = Number(rects?.[1]?.height || 0)
-    const safe = Math.max(260, Math.round(windowHeight - headerH - toggleH))
+    const dateBarH = Number(rects?.[2]?.height || 0)
+    const safe = Math.max(260, Math.round(windowHeight - headerH - toggleH - dateBarH))
     contentHeight.value = safe
   })
 }
@@ -213,12 +290,6 @@ function displayField (value: string | null | undefined): string {
   return formatDisplayText(value, 'None')
 }
  
-function shortRef (row: PrintLogItemDto): string {
-  const b = String(row.batchId || row.taskId || '').trim()
-  if (b.length > 14) return `${b.slice(0, 8)}…`
-  return b || row.labelCode || '—'
-}
-
 /** 红框左：labelSizeText（兼容 PascalCase） */
 function tagLabelSize (row: PrintLogItemDto): string {
   const raw = row.labelSizeText ?? (row as unknown as { LabelSizeText?: string }).LabelSizeText
@@ -226,6 +297,13 @@ function tagLabelSize (row: PrintLogItemDto): string {
   return formatDisplayText(s, 'None')
 }
  
+/** 列表 Label ID 列：labelId（兼容 PascalCase） */
+function tagLabelId (row: PrintLogItemDto): string {
+  const raw = row.labelId ?? (row as unknown as { LabelId?: string }).LabelId
+  const s = String(raw ?? '').trim()
+  return formatDisplayText(s, 'None')
+}
+
 /** 红框右：typeName（兼容 PascalCase） */
 function tagTypeName (row: PrintLogItemDto): string {
   const raw = row.typeName ?? (row as unknown as { TypeName?: string }).TypeName
@@ -253,13 +331,15 @@ async function loadPage (reset: boolean) {
       locationId,
       skipCount: p,
       maxResultCount: pageSize,
+      printDateDay: resolvePrintDateDayForApi(),
     })
     if (reset) {
       items.value = res.items
     } else {
       items.value = [...items.value, ...res.items]
     }
-    hasMore.value = items.value.length < res.totalCount
+    const totalCount = Number(res.totalCount ?? 0)
+    hasMore.value = items.value.length < totalCount
     if (res.items.length > 0) {
       pageIndex.value = p + 1
     }
@@ -432,21 +512,10 @@ const goBack = () =&gt; {
   font-size: 34rpx;
   font-weight: 700;
   color: #111827;
-  flex: 1;
   line-height: 1.3;
   letter-spacing: -0.02em;
 }
  
-.label-id {
-  font-size: 22rpx;
-  color: #9ca3af;
-  flex-shrink: 0;
-  margin-left: 16rpx;
-  padding: 6rpx 12rpx;
-  background: #f3f4f6;
-  border-radius: 8rpx;
-}
-
 .card-tags {
   display: flex;
   flex-wrap: wrap;
@@ -466,7 +535,7 @@ const goBack = () =&gt; {
 .card-details {
   display: flex;
   flex-direction: column;
-  gap: 16rpx;
+  gap: 20rpx;
   padding: 24rpx 28rpx;
   background: #fafbfc;
   border-top: 1rpx solid #e5e7eb;
@@ -475,13 +544,15 @@ const goBack = () =&gt; {
 .detail-row {
   display: flex;
   align-items: center;
-  gap: 12rpx;
+  gap: 14rpx;
+  min-height: 36rpx;
 }
  
 .detail-text {
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #4b5563;
-  line-height: 1.4;
+  line-height: 1.5;
+  flex: 1;
 }
  
 .card-footer {
@@ -535,6 +606,47 @@ const goBack = () =&gt; {
   background: linear-gradient(135deg, #1F3A8A, #1447E6);
 }
  
+.date-filter-bar {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  padding: 20rpx 28rpx;
+  background: #fff;
+  border-bottom: 1rpx solid #e5e7eb;
+}
+
+.date-field {
+  flex: 1;
+  min-width: 0;
+}
+
+.today-btn {
+  flex-shrink: 0;
+  height: 72rpx;
+  padding: 0 28rpx;
+  border-radius: 12rpx;
+  border: 2rpx solid #e5e7eb;
+  background: #f9fafb;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.today-btn.active {
+  border-color: #1F3A8A;
+  background: #e8ecf5;
+}
+
+.today-btn-text {
+  font-size: 26rpx;
+  font-weight: 600;
+  color: #374151;
+}
+
+.today-btn.active .today-btn-text {
+  color: #1F3A8A;
+}
+
 .log-table-wrap {
   background: #fff;
   border-radius: 20rpx;
@@ -577,7 +689,7 @@ const goBack = () =&gt; {
   padding: 24rpx 28rpx;
   gap: 16rpx;
   border-bottom: 1rpx solid #e5e7eb;
-  align-items: center;
+  align-items: flex-start;
   font-size: 26rpx;
 }
  
@@ -586,15 +698,53 @@ const goBack = () =&gt; {
 }
  
 .th, .td {
+  box-sizing: border-box;
+}
+
+.th-wrap, .td-wrap {
+  flex: 0 0 auto;
+  display: block;
+  white-space: normal;
+  word-break: break-word;
+  overflow-wrap: break-word;
+  line-height: 1.45;
+}
+
+.th-fixed, .td-fixed {
   flex-shrink: 0;
   white-space: nowrap;
 }
  
-.th-product, .td-product { flex: 0 0 auto; min-width: 140rpx; }
-.th-id, .td-id { flex: 0 0 auto; min-width: 160rpx; }
-.th-size, .td-size { flex: 0 0 auto; min-width: 220rpx; max-width: 360rpx; }
-.th-type, .td-type { flex: 0 0 auto; min-width: 120rpx; }
-.th-printed, .td-printed { flex: 0 0 auto; min-width: 200rpx; }
+.th-product, .td-product {
+  width: 160rpx;
+  min-width: 160rpx;
+  max-width: 160rpx;
+}
+
+.th-size, .td-size {
+  width: 220rpx;
+  min-width: 220rpx;
+  max-width: 220rpx;
+}
+
+.th-label-id, .td-label-id {
+  width: 200rpx;
+  min-width: 200rpx;
+  max-width: 200rpx;
+}
+
+.th-type, .td-type {
+  width: 200rpx;
+  min-width: 200rpx;
+  max-width: 200rpx;
+}
+
+.th-printed, .td-printed {
+  width: 220rpx;
+  min-width: 220rpx;
+  max-width: 220rpx;
+}
+
 .th-action, .td-action {
   flex: 0 0 80rpx;
   width: 80rpx;
@@ -605,8 +755,8 @@ const goBack = () =&gt; {
 }
  
 .td-product { color: #111827; font-weight: 500; }
-.td-id { color: #6b7280; font-size: 24rpx; }
 .td-size,
+.td-label-id,
 .td-type { color: #4b5563; font-size: 24rpx; }
 .td-printed { color: #4b5563; }
  
@@ -449,6 +449,7 @@ const connectBt = async (device: any) =&gt; {
     uni.hideLoading()
     uni.showToast({ title: t('printers.connectSuccess') })
   } catch (e) {
+    refreshStatus()
     uni.hideLoading()
     uni.showToast({ title: t('printers.connectFail'), icon: 'none' })
   } finally {
@@ -128,6 +128,7 @@ export async function fetchUsAppLabelingTree(input: {
   })
 }
  
+/** 离线缓存键：仅 location + labelCode + productId（不含 baseTime，避免同步预拉与预览页 key 不一致） */
 export function buildLabelPreviewCacheKey(body: UsAppLabelPreviewInputVo): string {
   const loc = String(body.locationId || '').trim()
   const code = String(body.labelCode || '').trim()
@@ -470,19 +471,25 @@ export async function fetchUsAppLabelReport (
   return normalizeUsAppLabelReport(raw)
 }
  
-/** 接口 10：分页打印日志 */
+/** 接口 10：分页打印日志（6-18 支持 printDateDay / printDate 按自然日筛选） */
 export async function fetchUsAppPrintLogList (input: PrintLogGetListInputVo) {
-  const key = `print-log:${input.locationId}:${input.skipCount ?? 1}:${input.maxResultCount ?? 20}`
+  const printDateDay = (input.printDateDay || input.printDate || '').trim()
+  const dateKey = printDateDay || '__all_dates__'
+  const key = `print-log:${input.locationId}:${dateKey}:${input.skipCount ?? 1}:${input.maxResultCount ?? 20}`
   return fetchWithOfflineCache('labeling', key, async () => {
+    const body: Record<string, unknown> = {
+      locationId: input.locationId,
+      skipCount: input.skipCount ?? 1,
+      maxResultCount: input.maxResultCount ?? 20,
+    }
+    if (printDateDay) {
+      body.printDateDay = printDateDay
+    }
     const raw = await usAppApiRequest<unknown>({
       path: '/api/app/us-app-labeling/get-print-log-list',
       method: 'POST',
       auth: true,
-      data: {
-        locationId: input.locationId,
-        skipCount: input.skipCount ?? 1,
-        maxResultCount: input.maxResultCount ?? 20,
-      },
+      data: body,
     })
     return extractPagedItems<PrintLogItemDto>(raw)
   })
@@ -73,7 +73,10 @@ export interface UsAppLabelPreviewInputVo {
  
 /** 8.2 预览响应（解包后常见字段，供类型参考） */
 export interface UsAppLabelPreviewDto {
+  /** 门店当日打印序号（yyyyMMdd-n），页脚 Label ID 与模板 Label ID 控件展示用 */
   labelId?: string
+  /** 与 labelId 同源（部分环境字段名） */
+  printLabelDisplayId?: string
   labelLastEdited?: string
   labelCode?: string
   labelSizeText?: string | null
@@ -105,15 +108,24 @@ export interface UsAppLabelPrintOutputDto {
   printQuantity: number
   batchId?: string
   taskIds?: string[]
+  /** 模板含 Label ID 控件时：本批次各份 yyyyMMdd-n */
+  printLabelDisplayIds?: string[]
   /** 接口 11：服务端返回的历史合并模板 JSON，供本地 BLE 打印 */
   mergedTemplateJson?: string | null
 }
  
-/** 接口 10 分页入参 */
+/** 接口 10 分页入参（6-18 get-print-log-list） */
 export interface PrintLogGetListInputVo {
   locationId: string
   skipCount?: number
   maxResultCount?: number
+  /**
+   * 打印日期（自然日），优先使用 `printDateDay`（`yyyy-MM-dd`），避免 JSON DateTime UTC 歧义。
+   * 与 `printDate` 等价；二者均未传时不按日过滤（返回该门店全部记录）。
+   */
+  printDateDay?: string
+  /** @deprecated 请用 printDateDay；仍可与 printDateDay 二选一传参 */
+  printDate?: string
 }
  
 /** 接口 10 打印明细项（元素快照） */
 /**
- * 与 vite `server.proxy` 默认 target 一致；H5 开发无 VITE_US_API_BASE 时用于拼图片等静态资源全路径。
- * 修改后端环境时请同步改 vite.config.ts 的 proxy.target。
+ * 本地/打包未配置 VITE_US_API_BASE 时的兜底后端根地址（不含末尾 /）。
+ * 调试本地时请与 .env.development 保持一致；仅作 fallback，优先使用环境变量。
  */
-export const US_BACKEND_ORIGIN_FALLBACK = 'http://flus-test.3ffoodsafety.com'
+// export const US_BACKEND_ORIGIN_FALLBACK = 'http://flus-test.3ffoodsafety.com'
+export const US_BACKEND_ORIGIN_FALLBACK = 'http://192.168.31.89:19001'
  
 /**
- * 美国版后端 API 根地址（不含末尾 /）。
- * - H5 开发：可在 .env.development 留空，配合 vite proxy 走同源 /api
- * - App / 生产：在 .env 中设置 VITE_US_API_BASE，例如 http://192.168.1.10:19001
+ * 解析美国版后端根地址（不含末尾 /）。
+ * 优先级：VITE_US_API_BASE（.env.development / .env.production）> US_BACKEND_ORIGIN_FALLBACK
+ * H5 开发与 App 打包均直连后端，不再经 Vite proxy。
  */
-export function getApiBaseUrl(): string {
+export function resolveUsBackendOrigin(): string {
   const fromEnv = (import.meta.env.VITE_US_API_BASE as string | undefined)?.trim()
   if (fromEnv) return fromEnv.replace(/\/$/, '')
-  if (import.meta.env.DEV && typeof window !== 'undefined') return ''
   return US_BACKEND_ORIGIN_FALLBACK
 }
  
-/**
- * 图片等静态资源根（与 API 同域）。H5 开发时 API 仍用相对路径走 Vite /api 代理，
- * 但 /picture/... 若不加域名会请求到 dev server 导致 404，故在此返回后端根域。
- */
+/** 美国版后端 API 根地址（不含末尾 /） */
+export function getApiBaseUrl(): string {
+  return resolveUsBackendOrigin()
+}
+
+/** 图片等静态资源根（与 API 同域） */
 export function getStaticMediaOrigin(): string {
-  const apiBase = getApiBaseUrl()
-  if (apiBase) return apiBase
-  if (import.meta.env.DEV && typeof window !== 'undefined') {
-    return US_BACKEND_ORIGIN_FALLBACK
-  }
-  return ''
+  return resolveUsBackendOrigin()
 }
  
 export function buildApiUrl(path: string): string {
   const base = getApiBaseUrl()
   const p = path.startsWith('/') ? path : `/${path}`
-  return base ? `${base}${p}` : p
+  return `${base}${p}`
 }
@@ -61,3 +61,24 @@ export function getDeviceFingerprint (): string {
     .join(' | ')
     .toLowerCase()
 }
+
+/** Gprinter AOA 一体机（rk3568 / 型号含 AOA）：走内置 UPOS/TCP，勿依赖外接蓝牙扫描 */
+export function isAoaAioDevice (): boolean {
+  const identity = getDeviceIdentity()
+  const fingerprint = getDeviceFingerprint()
+  const blob = [
+    identity.model,
+    identity.product,
+    identity.device,
+    identity.brand,
+    fingerprint,
+  ]
+    .map((s) => String(s || '').toLowerCase())
+    .join(' ')
+  if (!blob.trim()) return false
+  return (
+    blob.includes('aoa_rk3568')
+    || blob.includes('rk3568')
+    || /\baoa\b/.test(blob)
+  )
+}
+export type ImageScaleMode = 'contain' | 'cover' | 'fill'
+
+export function readImageScaleMode(cfg: Record<string, unknown> | undefined | null): ImageScaleMode {
+  const v = String(cfg?.scaleMode ?? cfg?.ScaleMode ?? 'contain')
+    .trim()
+    .toLowerCase()
+  if (v === 'cover' || v === 'fill') return v
+  return 'contain'
+}
+
+export function computeImageDrawRect(
+  boxW: number,
+  boxH: number,
+  sourceW: number,
+  sourceH: number,
+  scaleMode: string,
+): { dx: number; dy: number; dw: number; dh: number } {
+  const mode = String(scaleMode ?? 'contain').trim().toLowerCase()
+  if (sourceW <= 0 || sourceH <= 0 || mode === 'fill') {
+    return { dx: 0, dy: 0, dw: boxW, dh: boxH }
+  }
+  const ratio =
+    mode === 'cover'
+      ? Math.max(boxW / sourceW, boxH / sourceH)
+      : Math.min(boxW / sourceW, boxH / sourceH)
+  const dw = Math.max(1, Math.round(sourceW * ratio))
+  const dh = Math.max(1, Math.round(sourceH * ratio))
+  return {
+    dx: Math.round((boxW - dw) / 2),
+    dy: Math.round((boxH - dh) / 2),
+    dw,
+    dh,
+  }
+}
+/** 元素 config.invertColors：黑底白字（预览与打印一致） */
+export function readInvertColors(
+  config: Record<string, unknown> | undefined | null,
+): boolean {
+  if (!config) return false
+  const v = config.invertColors ?? config.InvertColors
+  if (v === true || v === 1) return true
+  if (typeof v === 'string') {
+    const s = v.trim().toLowerCase()
+    return s === 'true' || s === '1' || s === 'yes'
+  }
+  return false
+}
+
+export const INVERT_COLORS_BG = '#000000'
+export const INVERT_COLORS_FG = '#ffffff'
+
+/** 模板是否含黑底白字元素（打印光栅需额外锐化） */
+export function templateHasInvertedTextElements(
+  template: { elements?: Array<{ config?: Record<string, unknown> | null }> | null },
+): boolean {
+  for (const el of template.elements || []) {
+    if (readInvertColors(el.config)) return true
+  }
+  return false
+}
+import type { SystemLabelTemplate } from './print/types/printer'
+
+/** 与 Web 管理端 labelTemplate.ts 保持一致 */
+export const LABEL_EDITOR_FONT_FAMILY = 'FreightSans Bold'
+
+export const LABEL_EDITOR_FONT_OPTIONS: ReadonlyArray<{ value: string; label: string }> = [
+  { value: 'FreightSans Bold', label: 'FreightSans Bold' },
+  { value: 'Roboto', label: 'Roboto' },
+  { value: 'Open Sans', label: 'Open Sans' },
+  { value: 'Lato', label: 'Lato' },
+  { value: 'Tinos', label: 'Tinos' },
+  { value: 'Roboto Mono', label: 'Roboto Mono' },
+]
+
+export const LABEL_EDITOR_BUNDLED_FONT_FAMILIES = new Set(
+  LABEL_EDITOR_FONT_OPTIONS.map((item) => item.value),
+)
+
+const LEGACY_FONT_ALIASES: Record<string, string> = {
+  arial: 'Roboto',
+  'arial, sans-serif': 'Roboto',
+  helvetica: 'Roboto',
+  'helvetica, sans-serif': 'Roboto',
+  'times new roman': 'Tinos',
+  'courier new': 'Roboto Mono',
+  verdana: 'Open Sans',
+  georgia: 'Tinos',
+}
+
+type FontVariantSpec = {
+  file: string
+  weight: 'normal' | 'bold'
+  style: 'normal' | 'italic'
+}
+
+type FontPackageSpec = {
+  family: string
+  dir: string
+  variants: FontVariantSpec[]
+}
+
+/** static/fonts 下已打包字体（与 Web src/assets/fonts 对齐） */
+export const LABEL_EDITOR_FONT_PACKAGES: FontPackageSpec[] = [
+  {
+    family: 'FreightSans Bold',
+    dir: 'freight-sans-bold',
+    variants: [{ file: 'FreightSans-Bold.ttf', weight: 'bold', style: 'normal' }],
+  },
+  {
+    family: 'Roboto',
+    dir: 'roboto',
+    variants: [
+      { file: 'roboto-latin-400-normal.woff2', weight: 'normal', style: 'normal' },
+      { file: 'roboto-latin-700-normal.woff2', weight: 'bold', style: 'normal' },
+      { file: 'roboto-latin-400-italic.woff2', weight: 'normal', style: 'italic' },
+    ],
+  },
+  {
+    family: 'Open Sans',
+    dir: 'open-sans',
+    variants: [
+      { file: 'open-sans-latin-400-normal.woff2', weight: 'normal', style: 'normal' },
+      { file: 'open-sans-latin-700-normal.woff2', weight: 'bold', style: 'normal' },
+      { file: 'open-sans-latin-400-italic.woff2', weight: 'normal', style: 'italic' },
+    ],
+  },
+  {
+    family: 'Lato',
+    dir: 'lato',
+    variants: [
+      { file: 'lato-latin-400-normal.woff2', weight: 'normal', style: 'normal' },
+      { file: 'lato-latin-700-normal.woff2', weight: 'bold', style: 'normal' },
+      { file: 'lato-latin-400-italic.woff2', weight: 'normal', style: 'italic' },
+    ],
+  },
+  {
+    family: 'Tinos',
+    dir: 'tinos',
+    variants: [
+      { file: 'tinos-latin-400-normal.woff2', weight: 'normal', style: 'normal' },
+      { file: 'tinos-latin-700-normal.woff2', weight: 'bold', style: 'normal' },
+      { file: 'tinos-latin-400-italic.woff2', weight: 'normal', style: 'italic' },
+    ],
+  },
+  {
+    family: 'Roboto Mono',
+    dir: 'roboto-mono',
+    variants: [
+      { file: 'roboto-mono-latin-400-normal.woff2', weight: 'normal', style: 'normal' },
+      { file: 'roboto-mono-latin-700-normal.woff2', weight: 'bold', style: 'normal' },
+      { file: 'roboto-mono-latin-400-italic.woff2', weight: 'normal', style: 'italic' },
+    ],
+  },
+]
+
+const loadedFaceKeys = new Set<string>()
+const loadedFamilies = new Set<string>()
+let preloadAllPromise: Promise<void> | null = null
+
+export function normalizeLabelEditorFontFamily(raw: unknown): string | null {
+  const text = String(raw ?? '').trim()
+  if (!text) return null
+  const alias = LEGACY_FONT_ALIASES[text.toLowerCase()]
+  if (alias) return alias
+  if (LABEL_EDITOR_BUNDLED_FONT_FAMILIES.has(text)) return text
+  return null
+}
+
+export function resolveLabelEditorFontFamily(
+  config: Record<string, unknown> | null | undefined,
+): string {
+  return (
+    normalizeLabelEditorFontFamily(config?.fontFamily ?? config?.FontFamily)
+    ?? LABEL_EDITOR_FONT_FAMILY
+  )
+}
+
+function fontPackageByFamily(family: string): FontPackageSpec | undefined {
+  return LABEL_EDITOR_FONT_PACKAGES.find((item) => item.family === family)
+}
+
+/** static/fonts/{dir}/{file} → 各端可访问的本地 URL */
+export function resolveStaticFontFileUrl(dir: string, file: string): string {
+  const rel = `static/fonts/${dir}/${file}`.replace(/\\/g, '/')
+  // #ifdef APP-PLUS
+  try {
+    if (typeof plus !== 'undefined' && plus.io?.convertLocalFileSystemURL) {
+      return plus.io.convertLocalFileSystemURL(`_www/${rel}`)
+    }
+  } catch (_) {
+    /* fall through */
+  }
+  // #endif
+  return `/${rel}`
+}
+
+/** Android 原生位图文字：Typeface.createFromFile 用的绝对路径 */
+export function resolveAndroidFontFilePath(
+  family: string,
+  bold: boolean,
+  italic: boolean,
+): string | null {
+  const pkg = fontPackageByFamily(family)
+  if (!pkg) return null
+  const weight = bold ? 'bold' : 'normal'
+  const style = italic ? 'italic' : 'normal'
+  let variant = pkg.variants.find((v) => v.weight === weight && v.style === style)
+  if (!variant && bold) {
+    variant = pkg.variants.find((v) => v.weight === 'bold' && v.style === 'normal')
+  }
+  if (!variant) {
+    variant = pkg.variants.find((v) => v.weight === 'normal' && v.style === 'normal')
+  }
+  if (!variant) return null
+  return resolveStaticFontFileUrl(pkg.dir, variant.file)
+}
+
+function loadFontFaceOnce(
+  family: string,
+  dir: string,
+  variant: FontVariantSpec,
+): Promise<void> {
+  const key = `${family}|${variant.weight}|${variant.style}|${variant.file}`
+  if (loadedFaceKeys.has(key)) return Promise.resolve()
+  const url = resolveStaticFontFileUrl(dir, variant.file)
+  return new Promise((resolve) => {
+    uni.loadFontFace({
+      global: true,
+      family,
+      source: `url("${url}")`,
+      desc: {
+        style: variant.style,
+        weight: variant.weight,
+      },
+      success: () => {
+        loadedFaceKeys.add(key)
+        loadedFamilies.add(family)
+        if (variant.style === 'italic') loadedItalicFamilies.add(family)
+        resolve()
+      },
+      fail: (err) => {
+        console.warn('[labelEditorFonts] loadFontFace failed', family, variant, err)
+        resolve()
+      },
+    })
+  })
+}
+
+export function isLabelEditorFontFamilyLoaded(family: string): boolean {
+  return loadedFamilies.has(family)
+}
+
+const loadedItalicFamilies = new Set<string>()
+
+export function isLabelEditorFontItalicLoaded(family: string): boolean {
+  return loadedItalicFamilies.has(family)
+}
+
+export async function ensureLabelEditorFontFamilyLoaded(family: string): Promise<void> {
+  const normalized = normalizeLabelEditorFontFamily(family) ?? LABEL_EDITOR_FONT_FAMILY
+  const pkg = fontPackageByFamily(normalized)
+  if (!pkg) return
+  await Promise.all(
+    pkg.variants.map((variant) => loadFontFaceOnce(pkg.family, pkg.dir, variant)),
+  )
+}
+
+export function collectFontFamiliesFromTemplate(template: SystemLabelTemplate): string[] {
+  const set = new Set<string>([LABEL_EDITOR_FONT_FAMILY])
+  for (const el of template.elements || []) {
+    const cfg = (el.config || {}) as Record<string, unknown>
+    const family = normalizeLabelEditorFontFamily(cfg.fontFamily ?? cfg.FontFamily)
+    if (family) set.add(family)
+  }
+  return [...set]
+}
+
+/** 预览 / 打印 canvas 绘制前调用，加载模板用到的字体 */
+export async function ensureLabelEditorFontsForTemplate(
+  template: SystemLabelTemplate,
+): Promise<void> {
+  const families = collectFontFamiliesFromTemplate(template)
+  await Promise.all(families.map((family) => ensureLabelEditorFontFamilyLoaded(family)))
+}
+
+/** App 启动后后台预加载全部打包字体，减少首次预览等待 */
+export function preloadAllLabelEditorFonts(): Promise<void> {
+  if (!preloadAllPromise) {
+    preloadAllPromise = Promise.all(
+      LABEL_EDITOR_FONT_PACKAGES.map((pkg) => ensureLabelEditorFontFamilyLoaded(pkg.family)),
+    ).then(() => undefined)
+  }
+  return preloadAllPromise
+}
+import type { SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
+
+function normalizePaletteSlug (raw: string): string {
+  return String(raw ?? '').trim().toLowerCase().replace(/[^a-z0-9]+/g, '')
+}
+
+function readTypeAdd (el: SystemTemplateElementBase): string {
+  return String((el as SystemTemplateElementBase & { typeAdd?: string }).typeAdd ?? '').trim().toLowerCase()
+}
+
+/** 当前登录用户展示名（与侧栏 / Profile 一致） */
+export function getLoggedInEmployeeDisplayName (): string {
+  const name = String(uni.getStorageSync('userName') || '').trim()
+  if (name) return name
+  const email = String(uni.getStorageSync('user_email') || '').trim()
+  if (email) {
+    const at = email.indexOf('@')
+    return at > 0 ? email.slice(0, at) : email
+  }
+  return 'Employee'
+}
+
+/** 是否为模板「Entered Automatically → Employee」控件 */
+export function isEmployeeTemplateElement (el: SystemTemplateElementBase): boolean {
+  const typeAdd = readTypeAdd(el)
+  if (typeAdd.startsWith('auto_') && typeAdd.includes('employee')) return true
+
+  const en = normalizePaletteSlug(String(el.elementName ?? ''))
+  if (/^employee\d*$/.test(en)) return true
+
+  const vst = String(el.valueSourceType ?? '').toUpperCase()
+  const type = String(el.type ?? '').toUpperCase()
+  if (vst === 'AUTO_DB' && type === 'TEXT_STATIC' && /^employee/.test(en)) return true
+
+  return false
+}
+
+export function templateIncludesEmployeeElement (
+  template: SystemLabelTemplate | null | undefined,
+): boolean {
+  return !!(template?.elements?.some(isEmployeeTemplateElement))
+}
+
+/** 将当前登录人姓名写入 Employee AUTO 控件（预览/出纸同源） */
+export function applyEmployeeDisplayToTemplate (
+  template: SystemLabelTemplate,
+  employeeName?: string | null,
+): SystemLabelTemplate {
+  const name = String(employeeName ?? '').trim() || getLoggedInEmployeeDisplayName()
+  const elements = (template.elements || []).map((el) => {
+    if (!isEmployeeTemplateElement(el)) return el
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    return {
+      ...el,
+      config: { ...cfg, text: name, Text: name },
+    }
+  })
+  return { ...template, elements }
+}
+import type { SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
+
+function normalizePaletteSlug (raw: string): string {
+  return String(raw ?? '').trim().toLowerCase().replace(/[^a-z0-9]+/g, '')
+}
+
+function readTypeAdd (el: SystemTemplateElementBase): string {
+  return String((el as SystemTemplateElementBase & { typeAdd?: string }).typeAdd ?? '').trim().toLowerCase()
+}
+
+/** 是否为模板「Entered Automatically → Label ID」控件 */
+export function isLabelIdTemplateElement (el: SystemTemplateElementBase): boolean {
+  const typeAdd = readTypeAdd(el)
+  if (typeAdd.startsWith('auto_') && typeAdd.includes('label id')) return true
+
+  const en = normalizePaletteSlug(String(el.elementName ?? ''))
+  if (/^labelid\d*$/.test(en)) return true
+
+  const vst = String(el.valueSourceType ?? '').toUpperCase()
+  const type = String(el.type ?? '').toUpperCase()
+  if (vst === 'AUTO_DB' && type === 'TEXT_STATIC' && /^labelid/.test(en)) return true
+
+  return false
+}
+
+export function templateIncludesLabelIdElement (
+  template: SystemLabelTemplate | null | undefined,
+): boolean {
+  return !!(template?.elements?.some(isLabelIdTemplateElement))
+}
+
+/** 按元素 config.prefix 拼展示行（避免重复前缀） */
+export function formatLabelIdDisplayLine (
+  rawId: string,
+  config?: Record<string, unknown>,
+): string {
+  const id = String(rawId ?? '').trim()
+  const prefix = String(config?.prefix ?? config?.Prefix ?? 'LABEL ID: ').trim()
+  if (!id) return prefix ? `${prefix}—` : '—'
+  const lowerPrefix = prefix.toLowerCase()
+  if (prefix && id.toLowerCase().startsWith(lowerPrefix)) return id
+  if (!prefix) return id
+  const needsSpace = !prefix.endsWith(':') && !prefix.endsWith(' ')
+  return needsSpace ? `${prefix} ${id}` : `${prefix}${id}`
+}
+
+/** 将 Label ID 写入模板内对应 AUTO 控件（预览/出纸同源） */
+export function applyLabelIdDisplayToTemplate (
+  template: SystemLabelTemplate,
+  labelIdText: string,
+): SystemLabelTemplate {
+  const elements = (template.elements || []).map((el) => {
+    if (!isLabelIdTemplateElement(el)) return el
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    const line = formatLabelIdDisplayLine(labelIdText, cfg)
+    return {
+      ...el,
+      config: { ...cfg, text: line, Text: line },
+    }
+  })
+  return { ...template, elements }
+}
 import type { SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
-import { resolveTemplateDefaultValueForElement } from './printInputOffset'
-import { applyNutritionDefaultJsonToConfig } from './nutritionDefaultsMerge'
+import {
+  applyLiveDateTimeFieldsToTemplate,
+  captureDateDisplayFormatInConfig,
+  isUniAppDateTimeOffsetField,
+  parseStoredPrintInputOffset,
+  resolveTemplateDefaultValueForElement,
+  sanitizeDateElementConfig,
+  tryParsePrintInputOffsetStored,
+} from './printInputOffset'
+import {
+  applyNutritionDefaultJsonToConfig,
+  collectNutritionManualFromDefaults,
+  hydrateNutritionElementsInTemplate,
+  expandNutritionElementsToFitContent,
+} from './nutritionDefaultsMerge'
+
+export { expandNutritionElementsToFitContent, reflowElementsBelowNutritionPanel }
  
 function asRecord(v: unknown): Record<string, unknown> {
   if (v != null && typeof v === 'object' && !Array.isArray(v)) return v as Record<string, unknown>
   return {}
 }
  
+const KNOWN_ELEMENT_TYPES = new Set([
+  'TEXT_STATIC',
+  'TEXT',
+  'TEXT_PRODUCT',
+  'TEXT_PRICE',
+  'TEXT_CATEGORY',
+  'TEXT_LABEL_ID',
+  'BARCODE',
+  'QRCODE',
+  'IMAGE',
+  'LOGO',
+  'DATE',
+  'TIME',
+  'DURATION',
+  'WEIGHT',
+  'NUTRITION',
+])
+
+/** 与 Web canonicalElementType 对齐：print|Number → TEXT_STATIC 等 */
+function canonicalElementType (raw: string): string {
+  const type = String(raw ?? '').trim()
+  if (!type) return 'TEXT_STATIC'
+  const upper = type.toUpperCase()
+  if (KNOWN_ELEMENT_TYPES.has(upper)) return upper
+  const m = type.match(/^([^|]+)\|(.+)$/i)
+  if (!m) return 'TEXT_STATIC'
+  const group = m[1].trim().toLowerCase()
+  const label = m[2].trim().toLowerCase()
+  if (group === 'print') {
+    if (label === 'number' || label === 'text' || label === 'multiple options') return 'TEXT_STATIC'
+    if (label === 'weight') return 'WEIGHT'
+    if (label === 'date & time' || label === 'date and time') return 'DATE'
+  }
+  if (group === 'auto') {
+    if (label.includes('current date')) return 'DATE'
+    if (label.includes('current time')) return 'TIME'
+  }
+  if (group === 'label' && label.includes('duration') && !label.includes('date')) return 'DURATION'
+  return 'TEXT_STATIC'
+}
+
 function normalizeConfig(raw: unknown): Record<string, unknown> {
   if (raw == null) return {}
   if (typeof raw === 'string') {
@@ -46,8 +102,16 @@ function mergeFlatElementFieldsIntoConfig(
     'FontSize',
     'textAlign',
     'TextAlign',
+    'verticalAlign',
+    'VerticalAlign',
     'fontFamily',
+    'FontFamily',
     'fontWeight',
+    'FontWeight',
+    'fontStyle',
+    'FontStyle',
+    'textDecoration',
+    'TextDecoration',
     'color',
     'Color',
     'src',
@@ -76,9 +140,13 @@ function mergeFlatElementFieldsIntoConfig(
     'SelectedOptionValues',
     'errorLevel',
     'scaleMode',
+    'weightInputMode',
+    'WeightInputMode',
     'showText',
     'placeholder',
     'Placeholder',
+    'invertColors',
+    'InvertColors',
   ] as const
   for (const k of keys) {
     const existing = out[k]
@@ -232,6 +300,41 @@ export function applyLabelSizeTextToTemplate(
 }
  
 /**
+ * 将接口/缓存中的默认值统一为字符串（兼容 object、双重 JSON 编码、PascalCase unit/value）。
+ */
+export function coerceTemplateProductDefaultValueToString(v: unknown): string {
+  if (v == null) return ''
+  if (typeof v === 'string') {
+    const t = v.trim()
+    if (!t) return ''
+    if (t.startsWith('{') || t.startsWith('[')) return t
+    if (t.startsWith('"') && t.endsWith('"')) {
+      try {
+        const inner = JSON.parse(t) as unknown
+        if (typeof inner === 'string') return inner.trim()
+      } catch {
+        /* ignore */
+      }
+    }
+    return t
+  }
+  if (typeof v === 'number' || typeof v === 'boolean') return String(v)
+  if (typeof v === 'object' && !Array.isArray(v)) {
+    const rec = v as Record<string, unknown>
+    const unit = rec.unit ?? rec.Unit
+    const value = rec.value ?? rec.Value
+    if (unit != null && value != null) {
+      return JSON.stringify({ unit: String(unit), value: String(value) })
+    }
+  }
+  try {
+    return JSON.stringify(v)
+  } catch {
+    return String(v)
+  }
+}
+
+/**
  * 从预览接口响应中取出 `templateProductDefaultValues`（elementId → 字符串，兼容 PascalCase / 嵌套 data）。
  */
 export function extractTemplateProductDefaultValuesFromPreviewPayload(payload: unknown): Record<string, string> {
@@ -244,10 +347,7 @@ export function extractTemplateProductDefaultValuesFromPreviewPayload(payload: u
     for (const [k, v] of Object.entries(raw as Record<string, unknown>)) {
       const key = String(k).trim()
       if (!key) continue
-      if (v == null) out[key] = ''
-      else if (typeof v === 'string') out[key] = v
-      else if (typeof v === 'number' || typeof v === 'boolean') out[key] = String(v)
-      else out[key] = JSON.stringify(v)
+      out[key] = coerceTemplateProductDefaultValueToString(v)
     }
     return Object.keys(out).length ? out : null
   }
@@ -300,9 +400,32 @@ export function extractTemplateProductDefaultValuesFromPreviewPayload(payload: u
     inner ? tryLayer(inner) : null,
     tryLayer(r),
     tryLayer(payload),
+    tryExtractFromTemplateProductDefaultsArray(r),
+    inner ? tryExtractFromTemplateProductDefaultsArray(inner) : null,
   )
 }
  
+/** Web 模板 DTO 的 templateProductDefaults 数组 → 扁平 elementId → value */
+function tryExtractFromTemplateProductDefaultsArray(layer: unknown): Record<string, string> | null {
+  if (layer == null || typeof layer !== 'object' || Array.isArray(layer)) return null
+  const L = layer as Record<string, unknown>
+  const raw = L.templateProductDefaults ?? L.TemplateProductDefaults
+  if (!Array.isArray(raw)) return null
+  const out: Record<string, string> = {}
+  for (const row of raw) {
+    if (row == null || typeof row !== 'object' || Array.isArray(row)) continue
+    const rec = row as Record<string, unknown>
+    const dv = rec.defaultValues ?? rec.DefaultValues
+    if (dv == null || typeof dv !== 'object' || Array.isArray(dv)) continue
+    for (const [k, v] of Object.entries(dv as Record<string, unknown>)) {
+      const key = String(k).trim()
+      if (!key) continue
+      out[key] = coerceTemplateProductDefaultValueToString(v)
+    }
+  }
+  return Object.keys(out).length ? out : null
+}
+
 function isTemplateSectionScanElement(el: SystemTemplateElementBase): boolean {
   const cfg = el.config || {}
   const typeAdd = String(
@@ -377,18 +500,41 @@ export function applyProductCodeValueToTemplateScanElements(
 }
  
 /**
+ * 从 templateProductDefaultValues 按 id / inputKey / elementName 匹配（大小写不敏感兜底）。
+ */
+export function lookupTemplateProductDefaultValue(
+  el: SystemTemplateElementBase,
+  defaults: Record<string, string>,
+): string | undefined {
+  const candidates = [
+    String(el.id ?? '').trim(),
+    String(el.inputKey ?? '').trim(),
+    String(el.elementName ?? '').trim(),
+  ].filter(Boolean)
+  for (const k of candidates) {
+    if (Object.prototype.hasOwnProperty.call(defaults, k)) return defaults[k]
+  }
+  const lowerEntries = Object.entries(defaults).map(([k, v]) => [k.toLowerCase(), v] as const)
+  for (const k of candidates) {
+    const lk = k.toLowerCase()
+    const hit = lowerEntries.find(([dk]) => dk === lk)
+    if (hit) return hit[1]
+  }
+  return undefined
+}
+
+/**
  * 将平台录入的默认值合并进模板元素 config，供画布预览（键与 elements[].id 一致）。
  */
 export function applyTemplateProductDefaultValuesToTemplate(
   template: SystemLabelTemplate,
-  defaults: Record<string, string>
+  defaults: Record<string, string>,
+  base: Date = new Date(),
 ): SystemLabelTemplate {
   const keys = Object.keys(defaults)
   if (!keys.length) return template
   const elements = (template.elements || []).map((el) => {
-    const byName = (el.elementName ?? '').trim()
-    const v =
-      defaults[el.id] ?? (byName ? defaults[byName] : undefined)
+    const v = lookupTemplateProductDefaultValue(el, defaults)
     if (v === undefined) return el
     const type = String(el.type || '').toUpperCase()
     const cfg = { ...(el.config || {}) } as Record<string, any>
@@ -422,28 +568,45 @@ export function applyTemplateProductDefaultValuesToTemplate(
     }
  
     if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
-      const text = resolveTemplateDefaultValueForElement(el, v, new Date())
+      captureDateDisplayFormatInConfig(cfg)
+      sanitizeDateElementConfig(el, cfg)
+      /** 偏移类字段只保留 JSON / 纯数字，展示由 applyLiveDateTimeFieldsToTemplate 按 format 重算 */
+      if (isUniAppDateTimeOffsetField(el)) {
+        const trimmed = String(v).trim()
+        if (parseStoredPrintInputOffset(trimmed) || /^\d+$/.test(trimmed)) {
+          cfg.text = trimmed
+          cfg.Text = trimmed
+        }
+        return { ...el, config: cfg }
+      }
+      const text = resolveTemplateDefaultValueForElement(el, v, base)
       cfg.text = text
       cfg.Text = text
       return { ...el, config: cfg }
     }
  
     if (type === 'NUTRITION') {
+      const manual = collectNutritionManualFromDefaults(el, defaults)
+      if (Object.keys(manual).some((k) => String(manual[k] ?? '').trim() !== '')) {
+        const merged = applyNutritionDefaultJsonToConfig(cfg, JSON.stringify(manual))
+        return { ...el, config: merged }
+      }
       const s = String(v).trim()
       if (s.startsWith('{')) {
         const merged = applyNutritionDefaultJsonToConfig(cfg, s)
         return { ...el, config: merged }
       }
-      cfg.text = s
-      cfg.Text = s
-      return { ...el, config: cfg }
+      return el
     }
  
     cfg.text = v
     cfg.Text = v
     return { ...el, config: cfg }
   })
-  return { ...template, elements }
+  return hydrateNutritionElementsInTemplate(
+    applyLiveDateTimeFieldsToTemplate({ ...template, elements }, base),
+    defaults,
+  )
 }
  
 function elementArrayLength (o: Record<string, unknown>): number {
@@ -490,6 +653,11 @@ function pickTemplateRootRecord (payload: Record&lt;string, unknown&gt;): Record&lt;strin
   return payload
 }
  
+export function normalizeTemplatePrintOrientation(raw: unknown): 'horizontal' | 'vertical' {
+  const v = String(raw ?? '').trim().toLowerCase()
+  return v === 'horizontal' ? 'horizontal' : 'vertical'
+}
+
 /**
  * 将接口 8.2 返回的 template（或整段 DTO）规范为 SystemLabelTemplate，供打印适配器与预览画布使用。
  */
@@ -510,26 +678,33 @@ export function normalizeLabelTemplateFromPreviewApi(payload: unknown): SystemLa
       e.config ?? e.Config ?? e.ConfigJson ?? e.configJson ?? e.ConfigString,
     )
     cfg = mergeFlatElementFieldsIntoConfig(e, cfg)
-    const type = String(e.type ?? e.elementType ?? e.ElementType ?? 'TEXT_STATIC')
+    captureDateDisplayFormatInConfig(cfg)
+    const type = canonicalElementType(String(e.type ?? e.elementType ?? e.ElementType ?? 'TEXT_STATIC'))
     const vst = e.valueSourceType ?? e.ValueSourceType
     const ik = e.inputKey ?? e.InputKey
     const en = e.elementName ?? e.ElementName
-    return {
+    const typeAddRaw = e.typeAdd ?? e.TypeAdd
+    const baseEl = {
       id: String(e.id ?? e.Id ?? `el-${index}`),
       type,
       x: Number(e.x ?? e.posX ?? e.PosX ?? 0),
       y: Number(e.y ?? e.posY ?? e.PosY ?? 0),
       width: Number(e.width ?? e.Width ?? 0),
       height: Number(e.height ?? e.Height ?? 0),
-      rotation: String(e.rotation ?? e.Rotation ?? 'horizontal') as 'horizontal' | 'vertical',
-      border: String(e.border ?? e.BorderType ?? e.borderType ?? 'none'),
+      rotation: String(e.rotation ?? e.Rotation ?? 'horizontal') as 'horizontal' | 'vertical' | 'left' | 'right' | 'rotate180',
+      border: String(e.border ?? e.Border ?? e.BorderType ?? e.borderType ?? 'none'),
       config: cfg as Record<string, any>,
       zIndex: Number(e.zIndex ?? e.ZIndex ?? 0),
       orderNum: Number(e.orderNum ?? e.OrderNum ?? index),
       valueSourceType: vst != null ? String(vst) : undefined,
       inputKey: ik != null && String(ik).trim() !== '' ? String(ik).trim() : undefined,
       elementName: en != null && String(en).trim() !== '' ? String(en).trim() : undefined,
-    } as SystemTemplateElementBase & { zIndex: number; orderNum: number }
+    } as SystemTemplateElementBase & { zIndex: number; orderNum: number; typeAdd?: string }
+    if (typeAddRaw != null && String(typeAddRaw).trim() !== '') {
+      baseEl.typeAdd = String(typeAddRaw).trim()
+    }
+    sanitizeDateElementConfig(baseEl, cfg as Record<string, unknown>)
+    return baseEl
   })
  
   const unitRaw = String(t.unit ?? t.Unit ?? 'inch').toLowerCase()
@@ -539,7 +714,7 @@ export function normalizeLabelTemplateFromPreviewApi(payload: unknown): SystemLa
     | 'cm'
     | 'px'
  
-  return {
+  const tmpl: SystemLabelTemplate = {
     id: String(t.id ?? t.Id ?? 'preview'),
     name: String(t.name ?? t.Name ?? 'Label'),
     labelType: String(t.labelType ?? t.LabelType ?? ''),
@@ -549,8 +724,13 @@ export function normalizeLabelTemplateFromPreviewApi(payload: unknown): SystemLa
     appliedLocation: String(t.appliedLocation ?? t.AppliedLocation ?? 'ALL'),
     showRuler: !!(t.showRuler ?? t.ShowRuler),
     showGrid: !!(t.showGrid ?? t.ShowGrid),
+    border: String(t.border ?? t.Border ?? t.BorderType ?? t.borderType ?? 'none'),
+    printOrientation: normalizeTemplatePrintOrientation(
+      t.printOrientation ?? t.PrintOrientation,
+    ),
     elements,
   }
+  return hydrateNutritionElementsInTemplate(tmpl, {})
 }
  
 export function sortElementsForPreview(
 /**
  * 将管理端保存的营养成分默认值 JSON 合并进 NUTRITION 元素 config（与 Web nutritionManualEntry 字段一致）。
+ * `<` 前缀由模板 config 决定，录入 JSON 不包含 LessThan 字段。
  */
+import type { SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
+import { NUTRITION_FACTS_LAYOUT_ROWS, buildNutritionFactsViewModel, NUTRITION_BODY_FONT_SIZE } from '../nutritionFactsLayout'
+
+/** 与 Web nutritionManualEntry.NUTRITION_FIELD_COMPOSITE_SEP 一致 */
+export const NUTRITION_FIELD_COMPOSITE_SEP = '###nut###'
+
+export function nutritionCompositeFieldKey(nutritionElementId: string, subKey: string): string {
+  return `${nutritionElementId}${NUTRITION_FIELD_COMPOSITE_SEP}${subKey}`
+}
+
+function defaultLookupCandidates(el: SystemTemplateElementBase): string[] {
+  return [
+    String(el.id ?? '').trim(),
+    String(el.inputKey ?? '').trim(),
+    String(el.elementName ?? '').trim(),
+  ].filter(Boolean)
+}
+
+/** 从 templateProductDefaultValues 解析营养成分手动录入（JSON 或 composite 列键） */
+export function collectNutritionManualFromDefaults(
+  el: SystemTemplateElementBase,
+  defaults: Record<string, string>,
+): Record<string, string> {
+  if (!defaults || !Object.keys(defaults).length) return {}
+  const candidates = defaultLookupCandidates(el)
+  for (const k of candidates) {
+    if (Object.prototype.hasOwnProperty.call(defaults, k)) {
+      const raw = String(defaults[k] ?? '').trim()
+      if (raw.startsWith('{')) {
+        try {
+          const p = JSON.parse(raw) as Record<string, string>
+          if (p && typeof p === 'object' && !Array.isArray(p)) return p
+        } catch {
+          /* ignore */
+        }
+      }
+    }
+  }
+  const lower = Object.entries(defaults).map(([k, v]) => [k.toLowerCase(), v] as const)
+  for (const k of candidates) {
+    const hit = lower.find(([dk]) => dk === k.toLowerCase())
+    if (hit) {
+      const raw = String(hit[1] ?? '').trim()
+      if (raw.startsWith('{')) {
+        try {
+          return JSON.parse(raw) as Record<string, string>
+        } catch {
+          /* ignore */
+        }
+      }
+    }
+  }
+  const id = String(el.id ?? '').trim()
+  if (!id) return {}
+  const prefix = `${id}${NUTRITION_FIELD_COMPOSITE_SEP}`
+  const manual: Record<string, string> = {}
+  for (const [k, v] of Object.entries(defaults)) {
+    if (k.startsWith(prefix)) manual[k.slice(prefix.length)] = String(v ?? '')
+  }
+  return manual
+}
+
+function parseNutritionJsonFromConfigText(cfg: Record<string, unknown>): string | null {
+  const text = String(cfg.text ?? cfg.Text ?? '').trim()
+  return text.startsWith('{') ? text : null
+}
+
+/** 接口 8.2 会把营养成分 JSON 误写入 config.text；解析进 fixedNutrients / calories 等字段 */
+export function hydrateNutritionElementsInTemplate(
+  template: SystemLabelTemplate,
+  defaults: Record<string, string> = {},
+): SystemLabelTemplate {
+  const elements = (template.elements || []).map((el) => {
+    if (String(el.type || '').toUpperCase() !== 'NUTRITION') return el
+    let cfg = { ...(el.config || {}) } as Record<string, unknown>
+    const fromText = parseNutritionJsonFromConfigText(cfg)
+    if (fromText) {
+      cfg = applyNutritionDefaultJsonToConfig(cfg, fromText)
+    }
+    const manual = collectNutritionManualFromDefaults(el, defaults)
+    if (Object.keys(manual).some((k) => String(manual[k] ?? '').trim() !== '')) {
+      cfg = applyNutritionDefaultJsonToConfig(cfg, JSON.stringify(manual))
+    }
+    if (fromText) {
+      delete cfg.text
+      delete cfg.Text
+    }
+    return { ...el, config: cfg }
+  })
+  return { ...template, elements }
+}
+
+/** 按实际行数估算营养表所需高度，避免矮框裁掉 Vitamin D / 页脚等行 */
+export function estimateNutritionPanelHeightPx(cfg: Record<string, unknown>): number {
+  const model = buildNutritionFactsViewModel(cfg)
+  const bodySize = NUTRITION_BODY_FONT_SIZE
+  const titleSize = Math.max(11, Math.min(18, model.titleFontSize))
+  const lh = (fs: number) => fs + 4
+  let y = 12
+  y += titleSize + 6
+  y += lh(bodySize) + 3 + lh(bodySize) + 5
+  y += bodySize + 8
+  for (const row of model.rows) {
+    y += lh(bodySize)
+    if (row.dividerAfter === 'double') y += 5
+    else if (row.dividerAfter === 'thin') y += 3
+  }
+  y += 24
+  return Math.ceil(y)
+}
+
+/**
+ * 仅当营养表增高时，把「原底边以下」的元素整体下移相同 delta，保持同行左右布局不变。
+ * 禁止按 cursor 重排，避免 Consume By 标签/日期、ALLERGENS 等被拆散叠在一起。
+ */
+export function reflowElementsBelowNutritionPanel(
+  template: SystemLabelTemplate,
+  previousNutritionBottom?: number,
+): SystemLabelTemplate {
+  const elements = template.elements || []
+  const nutrition = elements.find((el) => String(el.type || '').toUpperCase() === 'NUTRITION')
+  if (!nutrition) return template
+
+  const nutY = Number(nutrition.y) || 0
+  const nutBottom = nutY + (Number(nutrition.height) || 0)
+  const oldBottom = previousNutritionBottom ?? nutBottom
+  const delta = nutBottom - oldBottom
+  if (delta <= 1) return template
+
+  const threshold = oldBottom - 2
+  const next = elements.map((el) => {
+    if (el.id === nutrition.id) return el
+    const y = Number(el.y) || 0
+    if (y >= threshold) return { ...el, y: y + delta }
+    return el
+  })
+  return { ...template, elements: next }
+}
+
+/** 仅在内容确实超出模板框时微增高度，并整体下移其下元素（不重排同行） */
+export function expandNutritionElementsToFitContent(template: SystemLabelTemplate): SystemLabelTemplate {
+  const elements = [...(template.elements || [])]
+  const nutIdx = elements.findIndex((el) => String(el.type || '').toUpperCase() === 'NUTRITION')
+  if (nutIdx < 0) return template
+
+  const nutrition = elements[nutIdx]
+  const nutY = Number(nutrition.y) || 0
+  const oldH = Number(nutrition.height) || 0
+  const oldBottom = nutY + oldH
+  const need = estimateNutritionPanelHeightPx((nutrition.config || {}) as Record<string, unknown>)
+  const maxH = Math.max(oldH, need)
+  if (maxH <= oldH + 2) return template
+
+  elements[nutIdx] = { ...nutrition, height: maxH }
+  return reflowElementsBelowNutritionPanel({ ...template, elements }, oldBottom)
+}
+
+function fixedLabelForKey(key: string): string {
+  const hit = NUTRITION_FACTS_LAYOUT_ROWS.find((x) => x.key === key)
+  return hit?.label ?? key
+}
+
+function pickManual(manual: Record<string, string>, subKey: string): string {
+  return String(manual[subKey] ?? '').trim()
+}
+
 export function applyNutritionDefaultJsonToConfig(
   baseCfg: Record<string, unknown>,
   jsonStr: string,
 ): Record<string, unknown> {
-  const t = String(jsonStr ?? "").trim();
-  if (!t.startsWith("{")) return baseCfg;
-  let manual: Record<string, string> = {};
+  const t = String(jsonStr ?? '').trim()
+  if (!t.startsWith('{')) return baseCfg
+  let manual: Record<string, string> = {}
   try {
-    manual = JSON.parse(t) as Record<string, string>;
+    manual = JSON.parse(t) as Record<string, string>
   } catch {
-    return baseCfg;
-  }
-  const out: Record<string, unknown> = { ...baseCfg };
-  for (const [k, val] of Object.entries(manual)) {
-    const v = String(val ?? "").trim();
-    if (k === "calories") {
-      if (v) out.calories = v;
-      continue;
-    }
-    if (k === "servingsPerContainer") {
-      out.servingsPerContainer = v;
-      continue;
-    }
-    if (k === "servingSize") {
-      out.servingSize = v;
-      continue;
-    }
-    if (k.startsWith("extra:") && k.endsWith(":value")) {
-      const id = k.slice("extra:".length, -":value".length);
-      const arr = Array.isArray(out.extraNutrients)
-        ? ([...(out.extraNutrients as Record<string, unknown>[])])
-        : [];
-      const idx = arr.findIndex((row) => String((row as any).id ?? "") === id);
-      if (idx >= 0) {
-        arr[idx] = { ...arr[idx], value: v };
-      }
-      out.extraNutrients = arr;
-      continue;
-    }
-    const fr = Array.isArray(out.fixedNutrients)
-      ? ([...(out.fixedNutrients as Record<string, unknown>[])])
-      : [];
-    const idx = fr.findIndex((row) => String((row as any).key ?? "").trim() === k);
-    if (idx >= 0) {
-      fr[idx] = { ...fr[idx], value: v };
-    } else {
-      fr.push({ key: k, label: k, value: v, unit: "" });
-    }
-    out.fixedNutrients = fr;
+    return baseCfg
+  }
+
+  const out: Record<string, unknown> = { ...baseCfg }
+  const baseFixed = Array.isArray(baseCfg.fixedNutrients)
+    ? (baseCfg.fixedNutrients as Record<string, unknown>[])
+    : []
+
+  const cal = pickManual(manual, 'calories')
+  if (cal) out.calories = cal
+  else {
+    delete out.calories
+    delete out.Calories
+  }
+  out.servingsPerContainer = pickManual(manual, 'servingsPerContainer')
+  out.servingSize = pickManual(manual, 'servingSize')
+
+  const keysInOrder = [...NUTRITION_FACTS_LAYOUT_ROWS.map((r) => r.key)]
+  for (const row of baseFixed) {
+    const key = String(row.key ?? '').trim()
+    if (key && !keysInOrder.includes(key)) keysInOrder.push(key)
+  }
+
+  const fixedArr: Record<string, unknown>[] = []
+  for (const key of keysInOrder) {
+    const baseRow = baseFixed.find((r) => String(r.key ?? '').trim() === key)
+    const layout = NUTRITION_FACTS_LAYOUT_ROWS.find((r) => r.key === key)
+    const v = pickManual(manual, key)
+    const pct = pickManual(manual, `${key}Percent`)
+    const lessThan = Boolean(baseRow?.lessThan ?? baseCfg[`${key}LessThan`])
+    const label = String(baseRow?.label ?? layout?.label ?? fixedLabelForKey(key))
+    fixedArr.push({
+      key,
+      label,
+      value: v,
+      unit: '',
+      dailyValuePercent: pct,
+      lessThan,
+    })
+    if (v) out[key] = v
+    else delete out[key]
+    delete out[`${key}Unit`]
+    out[`${key}Percent`] = pct
+    out[`${key}LessThan`] = lessThan
+  }
+  out.fixedNutrients = fixedArr
+
+  const newExtras: Array<{ id: string; name: string; value: string; unit: string }> = []
+  for (const k of Object.keys(manual)) {
+    if (!k.startsWith('extra:') || !k.endsWith(':value')) continue
+    const id = k.slice('extra:'.length, -':value'.length)
+    newExtras.push({
+      id,
+      name: String(
+        (Array.isArray(out.extraNutrients)
+          ? (out.extraNutrients as Record<string, unknown>[]).find((row) => String(row.id ?? '') === id)
+          : undefined)?.name ?? 'Other',
+      ),
+      value: pickManual(manual, k),
+      unit: '',
+    })
+    out[`extra:${id}:percent`] = pickManual(manual, `extra:${id}:percent`)
+    out[`extra:${id}:lessThan`] = Boolean(baseCfg[`extra:${id}:lessThan`])
   }
-  return out;
+  if (newExtras.length > 0) out.extraNutrients = newExtras
+
+  delete out.ingredientsText
+  delete out.IngredientsText
+  return out
 }
@@ -13,6 +13,268 @@ const OFFSET_UNITS = new Set([
   'Years',
 ])
  
+/** 与 Web PropertiesPanel DATE_FORMAT_OPTIONS + 常用 datetime 预设一致 */
+export const DATE_DISPLAY_FORMAT_PRESETS = new Set([
+  'DD/MM/YYYY',
+  'MM/DD/YYYY',
+  'DD/MM/YY',
+  'MM/DD/YY',
+  'MM/YY',
+  'MM/DD',
+  'MM',
+  'DD',
+  'YY',
+  'FULLY DAY(WEDNESDAY)',
+  'DAY (WED)',
+  'MONTH (DECEMBER)',
+  'YEAR (2025)',
+  'DD MONTH YEAR (25 DECEMBER 2025)',
+  'YYYY-MM-DD',
+  'YYYY-MM-DD HH:mm',
+  'HH:mm',
+  '12 hr',
+  '24 hr',
+])
+
+export function isKnownDateDisplayFormat (raw: string | null | undefined): boolean {
+  return DATE_DISPLAY_FORMAT_PRESETS.has(String(raw ?? '').trim())
+}
+
+export function isStoredPrintInputOffsetPayload (raw: string | null | undefined): boolean {
+  return parseStoredPrintInputOffset(String(raw ?? '').trim()) != null
+}
+
+/** 自定义 datetime 模板（非预设名），不能作为展示 format */
+function looksLikeCustomDateTimeFormatTemplate (raw: string | null | undefined): boolean {
+  const t = String(raw ?? '').trim()
+  if (!t || isKnownDateDisplayFormat(t)) return false
+  if (/GMT/i.test(t)) return true
+  if (/\bCST\b|\bMT\+|\(CST\)/i.test(t)) return true
+  if (/HH:mm:ss/i.test(t)) return true
+  if (/:\d{2}:\d{2}/.test(t)) return true
+  if (/^\d{1,2}\s+\d{4}\s+\d{1,2}:\d{2}/.test(t)) return true
+  return false
+}
+
+/** 已展开的日期/时间乱串（GMT 等）；**不含**合法的偏移 JSON */
+export function isCorruptedDateDisplayFormat (raw: string | null | undefined): boolean {
+  const t = String(raw ?? '').trim()
+  if (!t) return false
+  if (isStoredPrintInputOffsetPayload(t)) return false
+  if (OFFSET_UNITS.has(t)) return true
+  if (looksLikeCustomDateTimeFormatTemplate(t)) return true
+  /** 如 06 2026 13:45:57 GMT+0 */
+  if (/^\d{1,2}\s+\d{4}\s+\d{1,2}:\d{2}(:\d{2})?(\s+GMT)?/i.test(t)) return true
+  /** App 端 toLocaleString 失败时的 Date.toString()：MON JUL 06 2026 14:29:07 GMT+0800 (CST) */
+  if (/^(SUN|MON|TUE|WED|THU|FRI|SAT)\s+[A-Z]{3}\s+\d{1,2}\s+\d{4}/i.test(t)) return true
+  return false
+}
+
+/** 与 normalizeLabelPanelTypeAdd 一致：优先元素 typeAdd，其次 config.typeAdd */
+export function resolveElementTypeAdd (el: SystemTemplateElementBase): string {
+  const cfg = (el.config || {}) as Record<string, unknown>
+  return String(
+    (el as { typeAdd?: string }).typeAdd ??
+      cfg.typeAdd ??
+      cfg.TypeAdd ??
+      '',
+  ).trim()
+}
+
+/** 元素命名/id  hint（用于区分 durationdate / durationdate2） */
+export function elementDateNameHint (el: SystemTemplateElementBase): string {
+  return `${el.elementName ?? ''} ${el.inputKey ?? ''} ${el.id ?? ''}`.toLowerCase()
+}
+
+/** 底部黑条星期：仅 durationdate2（**不含** Use By 的 durationdate） */
+export function isWeekdayBarNameHint (hint: string): boolean {
+  return /durationdate2|duration_date_2|durationdate_2|duration\s*date\s*2/.test(hint)
+}
+
+/** Use By / 到期日：durationdate（无 2）、use by 等 */
+export function isUseByDateNameHint (hint: string): boolean {
+  if (isWeekdayBarNameHint(hint)) return false
+  return (
+    /(?:^|\s|_)durationdate(?:\s|_|$)/.test(hint) ||
+    /duration\s*date(?!\s*2)/.test(hint) ||
+    /duration_date(?!_2)/.test(hint) ||
+    /use\s*by|must\s*use|expir/.test(hint)
+  )
+}
+
+function frozenKnownDateFormat (cfg: Record<string, unknown>): string {
+  const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+  if (preserved && isKnownDateDisplayFormat(preserved)) return preserved
+  for (const c of [cfg.format, cfg.Format, cfg.displayFormat, cfg.DisplayFormat]) {
+    const raw = String(c ?? '').trim()
+    if (raw && isKnownDateDisplayFormat(raw) && !parseStoredPrintInputOffset(raw)) return raw
+  }
+  return ''
+}
+
+/** 打印时输入的字面量字段（Number/Text/Weight），不得按日期偏移重算 */
+export function isPrintInputLiteralField (el: SystemTemplateElementBase): boolean {
+  const vst = String(el.valueSourceType || '').toUpperCase()
+  if (vst !== 'PRINT_INPUT') return false
+  const rawType = String(el.type || '').trim()
+  const typeUpper = rawType.toUpperCase()
+  if (typeUpper === 'WEIGHT' || typeUpper.includes('|WEIGHT')) return true
+  const cfg = (el.config || {}) as Record<string, unknown>
+  const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+  if (it === 'number' || it === 'text') return true
+  const ta = resolveElementTypeAdd(el).toLowerCase()
+  if (/\|\s*number\b/.test(ta) || ta.endsWith('number')) return true
+  if (/\|\s*weight\b/.test(ta) || ta.endsWith('weight')) return true
+  if (/\|\s*text\b/.test(ta) || ta.endsWith('|text')) return true
+  if (/print[\s|]*number/i.test(rawType)) return true
+  if (/print[\s|]*text/i.test(rawType)) return true
+  if (/print[\s|]*weight/i.test(rawType)) return true
+  return false
+}
+
+/** 打印时输入 Number/Text/Weight 的展示文案（与 Web 画布 print|number 一致） */
+export function resolvePrintInputLiteralDisplay (el: SystemTemplateElementBase): string {
+  const cfg = (el.config || {}) as Record<string, unknown>
+  const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+  const type = String(el.type || '').toUpperCase()
+  let body = ''
+  if (type === 'WEIGHT') {
+    body = String(cfg.value ?? cfg.Value ?? '').trim()
+    if (!body) body = String(cfg.text ?? cfg.Text ?? '').trim()
+  } else {
+    body = String(cfg.text ?? cfg.Text ?? '').trim()
+  }
+  if (!body && it === 'number') body = '0'
+  /** 字面量 Number/Text 的纯数字不能走偏移 JSON 解析（否则会误当成 Days 偏移而清空） */
+  if (isCorruptedDateDisplayFormat(body)) return ''
+  const unit = String(cfg.unit ?? cfg.Unit ?? '').trim()
+  if (unit && body && !body.endsWith(unit)) body = `${body}${unit}`
+  return applyElementPrefix(cfg, body)
+}
+
+/** Text (For Template) 等固定文案：invertColors 仅表示黑底白字，不是星期条 */
+export function isFixedStaticTextElement (el: SystemTemplateElementBase): boolean {
+  if (isPrintInputLiteralField(el)) return true
+  const type = String(el.type || '').toUpperCase()
+  if (type !== 'TEXT_STATIC' && type !== 'TEXT' && type !== 'TEXT_PRODUCT' && type !== 'TEXT_PRICE') {
+    return false
+  }
+  const vst = String(el.valueSourceType || '').toUpperCase()
+  if (vst && vst !== 'FIXED' && vst !== 'STATIC') return false
+  const cfg = (el.config || {}) as Record<string, unknown>
+  const inputType = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+  if (
+    inputType === 'date' ||
+    inputType === 'datetime' ||
+    inputType === 'number' ||
+    inputType === 'options'
+  ) {
+    return false
+  }
+  if (isUniAppDateTimeOffsetField(el)) return false
+  if (isWeekdayBarNameHint(elementDateNameHint(el))) return false
+  return true
+}
+
+/**
+ * 底部黑条星期元素（durationdate2 / FULLY DAY 格式）。
+ * invertColors 只负责黑底白字样式，不能单独判定为星期条。
+ */
+export function isWeekdayBarElement (el: SystemTemplateElementBase): boolean {
+  const type = String(el.type || '').toUpperCase()
+  /** 重打已焙成 TEXT_STATIC 的星期条不再走 live 偏移，直接画 config.text */
+  if (type === 'TEXT_STATIC' || type === 'TEXT') return false
+  if (isFixedStaticTextElement(el)) return false
+  const cfg = (el.config || {}) as Record<string, unknown>
+  const hint = elementDateNameHint(el)
+  if (isWeekdayBarNameHint(hint)) return true
+  const fmt = frozenKnownDateFormat(cfg)
+  if (fmt === 'FULLY DAY(WEDNESDAY)' || fmt === 'DAY (WED)') return true
+  return false
+}
+
+/** @deprecated 使用 isWeekdayBarElement */
+export function isInvertedWeekdayElement (el: SystemTemplateElementBase): boolean {
+  return isWeekdayBarElement(el)
+}
+
+/** 首次解析模板时冻结展示用 format，避免后续 merge 把 offset JSON / 展开串写进 format 后丢失 FULLY DAY 等 */
+export function captureDateDisplayFormatInConfig (cfg: Record<string, unknown>): void {
+  if (String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()) return
+  for (const c of [cfg.format, cfg.Format, cfg.displayFormat, cfg.DisplayFormat]) {
+    const raw = String(c ?? '').trim()
+    if (!raw || parseStoredPrintInputOffset(raw)) continue
+    if (!isKnownDateDisplayFormat(raw) || isCorruptedDateDisplayFormat(raw)) continue
+    cfg.__dateDisplayFormat = raw
+    return
+  }
+}
+
+/** 清理被污染的 format/text，恢复 FULLY DAY 等展示格式；保留合法偏移 JSON */
+export function sanitizeDateElementConfig (
+  el: SystemTemplateElementBase,
+  cfg: Record<string, unknown>,
+): void {
+  if (isFixedStaticTextElement(el)) return
+  captureDateDisplayFormatInConfig(cfg)
+  const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+  let fmt = String(cfg.format ?? cfg.Format ?? '').trim()
+  let txt = String(cfg.text ?? cfg.Text ?? '').trim()
+  const fmtOffset = isStoredPrintInputOffsetPayload(fmt)
+  const txtOffset = isStoredPrintInputOffsetPayload(txt)
+
+  /** 后端 PRINT_INPUT 可能把偏移 JSON 写进 format；统一迁到 text 并恢复展示 format */
+  if (fmtOffset && !txtOffset) {
+    cfg.text = fmt
+    cfg.Text = fmt
+    txt = fmt
+  }
+
+  if (fmtOffset || txtOffset) {
+    const hint = elementDateNameHint(el)
+    const next =
+      (preserved && isKnownDateDisplayFormat(preserved) ? preserved : '') ||
+      (isWeekdayBarNameHint(hint) ? 'FULLY DAY(WEDNESDAY)' : '') ||
+      (isUseByDateNameHint(hint) ? 'MM/DD/YYYY' : '') ||
+      'DD/MM/YYYY'
+    if (isKnownDateDisplayFormat(next)) {
+      cfg.format = next
+      cfg.Format = next
+      if (!cfg.__dateDisplayFormat) cfg.__dateDisplayFormat = next
+    }
+    fmt = String(cfg.format ?? cfg.Format ?? '').trim()
+  } else if (fmt && (isCorruptedDateDisplayFormat(fmt) || looksLikeCustomDateTimeFormatTemplate(fmt))) {
+    if (isFixedStaticTextElement(el)) return
+    const hint = elementDateNameHint(el)
+    const next =
+      preserved ||
+      (isWeekdayBarNameHint(hint) ? 'FULLY DAY(WEDNESDAY)' : '') ||
+      (isUseByDateNameHint(hint) ? 'MM/DD/YYYY' : '')
+    if (next) {
+      cfg.format = next
+      cfg.Format = next
+      if (!cfg.__dateDisplayFormat) cfg.__dateDisplayFormat = next
+    } else {
+      delete cfg.format
+      delete cfg.Format
+    }
+  }
+
+  const txtAfter = String(cfg.text ?? cfg.Text ?? '').trim()
+  if (txtAfter && isCorruptedDateDisplayFormat(txtAfter)) {
+    const hint = elementDateNameHint(el)
+    if (isUniAppDateTimeOffsetField(el) || isWeekdayBarNameHint(hint) || isUseByDateNameHint(hint)) {
+      delete cfg.text
+      delete cfg.Text
+    }
+  }
+  const pf = String(cfg.__previewFormatted ?? cfg.__PreviewFormatted ?? '').trim()
+  if (pf && isCorruptedDateDisplayFormat(pf)) {
+    delete cfg.__previewFormatted
+    delete cfg.__PreviewFormatted
+  }
+}
+
 export function applyOffsetToDate (base: Date, amount: number, unit: string): Date {
   const d = new Date(base.getTime())
   const u = String(unit ?? '').trim()
@@ -41,6 +303,70 @@ export function applyOffsetToDate (base: Date, amount: number, unit: string): Da
   return d
 }
  
+/** App 原生端 toLocaleString(weekday) 常返回整段 Date.toString()，须用手动表 */
+const WEEKDAY_LONG_EN = [
+  'SUNDAY',
+  'MONDAY',
+  'TUESDAY',
+  'WEDNESDAY',
+  'THURSDAY',
+  'FRIDAY',
+  'SATURDAY',
+] as const
+
+const WEEKDAY_SHORT_EN = ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'] as const
+
+/** 已是展开后的星期展示文案（重打快照 / 落库 __previewFormatted） */
+export function isResolvedWeekdayDisplayLiteral (raw: string | null | undefined): boolean {
+  const t = String(raw ?? '').trim().toUpperCase()
+  if (!t) return false
+  if ((WEEKDAY_LONG_EN as readonly string[]).includes(t)) return true
+  if ((WEEKDAY_SHORT_EN as readonly string[]).includes(t)) return true
+  if (/^DAY\s*\([A-Z]{3}\)$/i.test(String(raw ?? '').trim())) return true
+  return false
+}
+
+/** 重打/画布：优先读快照里已冻结的星期文案，禁止再按 today 重算 */
+export function readFrozenWeekdayDisplayFromConfig (cfg: Record<string, unknown>): string {
+  for (const key of ['__previewFormatted', '__PreviewFormatted', 'text', 'Text'] as const) {
+    const raw = String(cfg[key] ?? '').trim()
+    if (!raw) continue
+    if (parseStoredPrintInputOffset(raw)) continue
+    if (isCorruptedDateDisplayFormat(raw)) continue
+    if (isResolvedWeekdayDisplayLiteral(raw)) {
+      return raw.toUpperCase().startsWith('DAY (') ? raw : raw.toUpperCase()
+    }
+  }
+  return ''
+}
+
+const MONTH_LONG_EN = [
+  'JANUARY',
+  'FEBRUARY',
+  'MARCH',
+  'APRIL',
+  'MAY',
+  'JUNE',
+  'JULY',
+  'AUGUST',
+  'SEPTEMBER',
+  'OCTOBER',
+  'NOVEMBER',
+  'DECEMBER',
+] as const
+
+function weekdayLongEn (date: Date): string {
+  return WEEKDAY_LONG_EN[date.getDay()] ?? 'SUNDAY'
+}
+
+function weekdayShortEn (date: Date): string {
+  return WEEKDAY_SHORT_EN[date.getDay()] ?? 'SUN'
+}
+
+function monthLongEn (date: Date): string {
+  return MONTH_LONG_EN[date.getMonth()] ?? 'JANUARY'
+}
+
 function formatDateByPreset (format: string, date: Date): string {
   const yyyy = String(date.getFullYear())
   const yy = yyyy.slice(-2)
@@ -48,9 +374,11 @@ function formatDateByPreset (format: string, date: Date): string {
   const dd = String(date.getDate()).padStart(2, '0')
   const hh = String(date.getHours()).padStart(2, '0')
   const min = String(date.getMinutes()).padStart(2, '0')
-  const monthLong = date.toLocaleString('en-US', { month: 'long' }).toUpperCase()
-  const dayLong = date.toLocaleString('en-US', { weekday: 'long' }).toUpperCase()
-  const dayShort = date.toLocaleString('en-US', { weekday: 'short' }).toUpperCase()
+  const hour12 = date.getHours() % 12 || 12
+  const ampm = date.getHours() >= 12 ? 'pm' : 'am'
+  const monthLong = monthLongEn(date)
+  const dayLong = weekdayLongEn(date)
+  const dayShort = weekdayShortEn(date)
   switch (format) {
     case 'DD/MM/YYYY':
       return `${dd}/${mm}/${yyyy}`
@@ -84,9 +412,15 @@ function formatDateByPreset (format: string, date: Date): string {
       return `${yyyy}-${mm}-${dd}`
     case 'YYYY-MM-DD HH:mm':
       return `${yyyy}-${mm}-${dd} ${hh}:${min}`
+    case '12 hr':
+      return `${hour12}:${min}${ampm}`
+    case '24 hr':
     case 'HH:mm':
       return `${hh}:${min}`
     default:
+      if (isCorruptedDateDisplayFormat(format) || looksLikeCustomDateTimeFormatTemplate(format)) {
+        return `${mm}/${dd}/${yyyy}`
+      }
       return String(format || '')
         .replace(/YYYY/g, yyyy)
         .replace(/YY/g, yy)
@@ -105,7 +439,7 @@ export function isLikelyResolvedDateTimeLiteral (raw: string | null | undefined)
   if (/^\d{4}-\d{2}-\d{2}/.test(t)) return true
   if (/^\d{4}-\d{2}-\d{2}\s+\d{1,2}:\d{2}/.test(t)) return true
   if (/^\d{1,2}\/\d{1,2}\/\d{2,4}/.test(t)) return true
-  if (/^\d{1,2}:\d{2}(:\d{2})?$/.test(t)) return true
+  if (/^\d{1,2}:\d{2}(:\d{2})?(\s?[ap]m)?$/i.test(t)) return true
   return false
 }
  
@@ -123,25 +457,59 @@ function normalizeOffsetAmount (valueRaw: string): number | null {
   return Number.isFinite(n) ? n : null
 }
  
+function inferDurationWeekdayDisplayFormat (el: SystemTemplateElementBase, cfg: Record<string, unknown>): string | null {
+  if (!isWeekdayBarElement({ ...el, config: cfg })) return null
+  const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+  if (preserved === 'FULLY DAY(WEDNESDAY)' || preserved === 'DAY (WED)') return preserved
+  return 'FULLY DAY(WEDNESDAY)'
+}
+
 function dateFormatPatternForElement (
   el: SystemTemplateElementBase,
   cfg: Record<string, unknown>,
 ): string {
   const type = String(el.type || '').toUpperCase()
-  if (type === 'TIME') return 'HH:mm'
+  if (type === 'TIME') {
+    const raw = String(cfg.format ?? cfg.Format ?? '24 hr').trim()
+    return raw === '12 hr' ? '12 hr' : '24 hr'
+  }
+
+  /** 仅底部黑条星期走 FULLY DAY；Use By 仍用 MM/DD/YYYY */
+  if (isWeekdayBarElement({ ...el, config: cfg })) {
+    const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+    if (preserved === 'FULLY DAY(WEDNESDAY)' || preserved === 'DAY (WED)') return preserved
+    return 'FULLY DAY(WEDNESDAY)'
+  }
+
   const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
-  const raw =
-    (typeof cfg.format === 'string' && cfg.format.trim()
-      ? cfg.format
-      : typeof cfg.Format === 'string' && cfg.Format.trim()
-        ? cfg.Format
-        : it === 'datetime'
-          ? 'YYYY-MM-DD HH:mm'
-          : 'DD/MM/YYYY') || 'DD/MM/YYYY'
-  if (isLikelyResolvedDateTimeLiteral(raw) || OFFSET_UNITS.has(raw)) {
-    return it === 'datetime' ? 'YYYY-MM-DD HH:mm' : 'DD/MM/YYYY'
+  const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+  if (preserved && isKnownDateDisplayFormat(preserved)) return preserved
+
+  const hint = elementDateNameHint(el)
+  if (isUseByDateNameHint(hint)) return 'MM/DD/YYYY'
+
+  const candidates = [
+    cfg.format,
+    cfg.Format,
+    cfg.displayFormat,
+    cfg.DisplayFormat,
+    cfg.dateFormat,
+    cfg.DateFormat,
+  ]
+    .map((v) => (typeof v === 'string' ? v.trim() : ''))
+    .filter(Boolean)
+
+  for (const raw of candidates) {
+    if (isStoredPrintInputOffsetPayload(raw)) continue
+    if (isCorruptedDateDisplayFormat(raw) || looksLikeCustomDateTimeFormatTemplate(raw)) continue
+    if (isLikelyResolvedDateTimeLiteral(raw) || OFFSET_UNITS.has(raw)) continue
+    if (isKnownDateDisplayFormat(raw)) return raw
   }
-  return raw
+
+  const inferred = inferDurationWeekdayDisplayFormat(el, cfg)
+  if (inferred) return inferred
+
+  return it === 'datetime' ? 'YYYY-MM-DD HH:mm' : 'DD/MM/YYYY'
 }
  
 function readOffsetFromElementConfig (
@@ -149,6 +517,20 @@ function readOffsetFromElementConfig (
 ): { amount: number; unit: string } | null {
   const type = String(el.type || '').toUpperCase()
   const cfg = (el.config || {}) as Record<string, unknown>
+  const fromStoredText = parseStoredPrintInputOffset(String(cfg.text ?? cfg.Text ?? ''))
+  if (fromStoredText) {
+    const amount = normalizeOffsetAmount(fromStoredText.value)
+    if (amount !== null) {
+      return { amount, unit: fromStoredText.unit || 'Days' }
+    }
+  }
+  const fromStoredFormat = parseStoredPrintInputOffset(String(cfg.format ?? cfg.Format ?? ''))
+  if (fromStoredFormat) {
+    const amount = normalizeOffsetAmount(fromStoredFormat.value)
+    if (amount !== null) {
+      return { amount, unit: fromStoredFormat.unit || 'Days' }
+    }
+  }
   if (type === 'DURATION') {
     const unit = String(cfg.format ?? cfg.Format ?? 'Days').trim() || 'Days'
     const u = OFFSET_UNITS.has(unit) ? unit : 'Days'
@@ -189,7 +571,7 @@ function resolveFromOffsetAmount (
     return applyElementPrefix(cfg, formatDateByPreset(dateFormatPatternForElement(el, cfg), d))
   }
   if (type === 'TIME') {
-    return applyElementPrefix(cfg, formatDateByPreset('HH:mm', d))
+    return applyElementPrefix(cfg, formatDateByPreset(dateFormatPatternForElement(el, cfg), d))
   }
   return applyElementPrefix(cfg, `${amount} ${unit}`.trim())
 }
@@ -204,13 +586,18 @@ export function resolveElementDateTimeDisplay (
   const type = String(el.type || '').toUpperCase()
   if (type !== 'DATE' && type !== 'TIME' && type !== 'DURATION') return null
  
-  const cfg = (el.config || {}) as Record<string, unknown>
+  const cfg = { ...(el.config || {}) } as Record<string, unknown>
+  sanitizeDateElementConfig(el, cfg)
+  if (isPrintInputLiteralField({ ...el, config: cfg })) {
+    const line = resolvePrintInputLiteralDisplay({ ...el, config: cfg })
+    return line || null
+  }
   const vst = String(el.valueSourceType ?? '').toUpperCase()
   const inputType = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
   const rawText = String(cfg.text ?? cfg.Text ?? '').trim()
  
   const fromOffsetJson = (raw: string): string | null => {
-    const p = tryParsePrintInputOffsetStored(raw)
+    const p = parseStoredPrintInputOffset(raw)
     if (!p) return null
     const amount = normalizeOffsetAmount(p.value)
     if (amount === null) return null
@@ -219,95 +606,129 @@ export function resolveElementDateTimeDisplay (
  
   const jsonResolved = (rawText ? fromOffsetJson(rawText) : null)
     ?? fromOffsetJson(String(cfg.format ?? cfg.Format ?? ''))
-  if (jsonResolved) return jsonResolved
+  if (jsonResolved) {
+    if (isCorruptedDateDisplayFormat(jsonResolved)) {
+      if (isWeekdayBarElement({ ...el, config: cfg })) {
+        return resolveWeekdayDisplayForElement({ ...el, config: cfg }, base)
+      }
+      return null
+    }
+    return jsonResolved
+  }
+
+  const isOffsetField = isUniAppDateTimeOffsetField({ ...el, config: cfg })
  
   if (vst === 'PRINT_INPUT') {
-    /** 保质期/Prep 等相对偏移字段：须按 base 重算，勿用接口首屏写入的过期 literal */
+    /** 非相对偏移的 PRINT_INPUT 才使用固定文案；勿把已展开的 GMT/时间串当最终展示 */
     if (
       rawText &&
-      !tryParsePrintInputOffsetStored(rawText) &&
-      !isUniAppDateTimeOffsetField(el)
+      !parseStoredPrintInputOffset(rawText) &&
+      !isOffsetField &&
+      isLikelyResolvedDateTimeLiteral(rawText) &&
+      !isCorruptedDateDisplayFormat(rawText)
     ) {
       return applyElementPrefix(cfg, rawText)
     }
     if (
-      isUniAppDateTimeOffsetField(el) ||
+      isOffsetField ||
       inputType === 'date' ||
       inputType === 'datetime' ||
       type === 'TIME'
     ) {
-      const off = readOffsetFromElementConfig(el)
-      if (off) return resolveFromOffsetAmount(el, off.amount, off.unit, base)
-      /** 默认值已展开为字面日期时仍保留，避免丢失 durationdate 等 +N Days */
-      if (
-        rawText &&
-        !tryParsePrintInputOffsetStored(rawText) &&
-        isLikelyResolvedDateTimeLiteral(rawText) &&
-        !isUniAppDateTimeOffsetField(el)
-      ) {
-        return applyElementPrefix(cfg, rawText)
-      }
-      return resolveFromOffsetAmount(el, 0, 'Days', base)
+      const off = readOffsetFromElementConfig({ ...el, config: cfg })
+      if (off) return resolveFromOffsetAmount({ ...el, config: cfg }, off.amount, off.unit, base)
+      return resolveFromOffsetAmount({ ...el, config: cfg }, 0, 'Days', base)
     }
     return null
   }
  
-  /** FIXED 的 durationdate/durationtime 等：config.text 可能已是平台录入的偏移 JSON */
-  if (vst === 'FIXED' && isUniAppDateTimeOffsetField(el)) {
-    const off = readOffsetFromElementConfig(el)
-    if (off && (off.amount !== 0 || rawText)) {
-      return resolveFromOffsetAmount(el, off.amount, off.unit, base)
-    }
-    if (
-      rawText &&
-      !tryParsePrintInputOffsetStored(rawText) &&
-      isLikelyResolvedDateTimeLiteral(rawText)
-    ) {
-      return applyElementPrefix(cfg, rawText)
-    }
-    return resolveFromOffsetAmount(el, 0, 'Days', base)
+  /** FIXED 的 durationdate/durationtime 等：config.text 可能已是平台录入的偏移 JSON / 纯数字 */
+  if (vst === 'FIXED' && isOffsetField) {
+    const off = readOffsetFromElementConfig({ ...el, config: cfg })
+    if (off) return resolveFromOffsetAmount({ ...el, config: cfg }, off.amount, off.unit, base)
+    return resolveFromOffsetAmount({ ...el, config: cfg }, 0, 'Days', base)
   }
  
-  const off = readOffsetFromElementConfig(el)
-  if (off) return resolveFromOffsetAmount(el, off.amount, off.unit, base)
+  if (vst === 'AUTO_DB' && (type === 'DATE' || type === 'TIME' || type === 'DURATION' || isOffsetField)) {
+    const off = readOffsetFromElementConfig({ ...el, config: cfg })
+    if (off) return resolveFromOffsetAmount({ ...el, config: cfg }, off.amount, off.unit, base)
+    return resolveFromOffsetAmount({ ...el, config: cfg }, 0, 'Days', base)
+  }
+
+  const off = readOffsetFromElementConfig({ ...el, config: cfg })
+  if (off) return resolveFromOffsetAmount({ ...el, config: cfg }, off.amount, off.unit, base)
+  if (isOffsetField) {
+    return resolveFromOffsetAmount({ ...el, config: cfg }, 0, 'Days', base)
+  }
   if (
     rawText &&
-    !tryParsePrintInputOffsetStored(rawText) &&
-    isLikelyResolvedDateTimeLiteral(rawText) &&
-    isUniAppDateTimeOffsetField(el)
+    !parseStoredPrintInputOffset(rawText) &&
+    isLikelyResolvedDateTimeLiteral(rawText)
   ) {
     return applyElementPrefix(cfg, rawText)
   }
-  return resolveFromOffsetAmount(el, 0, 'Days', base)
+  return resolveFromOffsetAmount({ ...el, config: cfg }, 0, 'Days', base)
+}
+
+/** 底部黑条星期（durationdate2）；Use By 的 durationdate 不在此列 */
+export function resolveWeekdayDisplayForElement (
+  el: SystemTemplateElementBase,
+  base: Date = new Date(),
+): string {
+  const cfg = { ...(el.config || {}) } as Record<string, unknown>
+  sanitizeDateElementConfig(el, cfg)
+  const frozen = readFrozenWeekdayDisplayFromConfig(cfg)
+  if (frozen) return applyElementPrefix(cfg, frozen)
+  const off = readOffsetFromElementConfig({ ...el, config: cfg })
+  const amount = off?.amount ?? 0
+  const unit = off?.unit ?? 'Days'
+  const d = applyOffsetToDate(base, amount, unit)
+  const preserved = String(cfg.__dateDisplayFormat ?? cfg.__DateDisplayFormat ?? '').trim()
+  const pattern =
+    preserved === 'DAY (WED)' ? 'DAY (WED)' : 'FULLY DAY(WEDNESDAY)'
+  return applyElementPrefix(cfg, formatDateByPreset(pattern, d))
 }
  
 export function tryParsePrintInputOffsetStored (
   raw: string | null | undefined,
 ): { unit: string; value: string } | null {
   const t = String(raw ?? '').trim()
-  if (!t.startsWith('{')) return null
-  try {
-    const o = JSON.parse(t) as unknown
-    if (o == null || typeof o !== 'object' || Array.isArray(o)) return null
-    const rec = o as Record<string, unknown>
-    const unit = String(rec.unit ?? rec.Unit ?? '').trim()
-    const value = String(rec.value ?? rec.Value ?? '')
-    if (!unit || !OFFSET_UNITS.has(unit)) return null
-    return { unit, value }
-  } catch {
-    return null
+  if (!t) return null
+  if (t.startsWith('{')) {
+    try {
+      const o = JSON.parse(t) as unknown
+      if (o == null || typeof o !== 'object' || Array.isArray(o)) return null
+      const rec = o as Record<string, unknown>
+      const unit = String(rec.unit ?? rec.Unit ?? '').trim()
+      const value = String(rec.value ?? rec.Value ?? '')
+      if (!unit || !OFFSET_UNITS.has(unit)) return null
+      return { unit, value }
+    } catch {
+      return null
+    }
   }
+  /** 兼容旧版 templateProductDefaults 仅存纯数字（表示 Days） */
+  if (/^\d+$/.test(t)) return { unit: 'Days', value: t }
+  return null
 }
  
-/** 与 Web isDateTimeDataEntryField 对齐（App 侧元素无 typeAdd 时用命名兜底） */
+/** 与 Web offsetFieldUiStateFromStored 对齐 */
+export function parseStoredPrintInputOffset (
+  raw: string | null | undefined,
+): { unit: string; value: string } | null {
+  return tryParsePrintInputOffsetStored(raw)
+}
+
+/** 与 Web isDateTimeLiveResolveField 对齐：含 auto current date/time 等相对基准解析字段 */
 export function isUniAppDateTimeOffsetField (el: SystemTemplateElementBase): boolean {
+  if (isPrintInputLiteralField(el)) return false
   const type = String(el.type || '').toUpperCase()
   const cfg = (el.config || {}) as Record<string, unknown>
   if (type === 'TIME' || type === 'DURATION') return true
   if (type !== 'DATE') return false
   const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
   if (it === 'datetime' || it === 'date') return true
-  const ta = String((el as { typeAdd?: string }).typeAdd ?? '').trim().toLowerCase().replace(/\s+/g, ' ')
+  const ta = resolveElementTypeAdd(el).toLowerCase().replace(/\s+/g, ' ')
   if (ta === 'label_duration date' || ta.includes('duration date')) return true
   if (ta === 'auto_current date' || ta.includes('current date')) return true
   if (ta === 'auto_current time' || ta.includes('current time')) return true
@@ -317,6 +738,10 @@ export function isUniAppDateTimeOffsetField (el: SystemTemplateElementBase): boo
 }
  
 /**
+ * 将 templateProductDefaults 里单格字符串转为画布用的展示文案（相对 now）。
+ * 非 JSON 或无法解析时返回原串（兼容旧版已展开的日期文案）。
+ */
+/**
  * 预览/出纸前：按同一基准时刻重算所有 DATE/TIME/DURATION 及偏移类字段，保证 Prep 与 Use By 一致。
  */
 export function applyLiveDateTimeFieldsToTemplate (
@@ -325,17 +750,53 @@ export function applyLiveDateTimeFieldsToTemplate (
 ): SystemLabelTemplate {
   const elements = (template.elements || []).map((el) => {
     const type = String(el.type || '').toUpperCase()
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    const weekdayEl = isWeekdayBarElement(el)
+    if (isPrintInputLiteralField(el)) return el
     const needsLive =
       type === 'DATE' ||
       type === 'TIME' ||
       type === 'DURATION' ||
-      isUniAppDateTimeOffsetField(el)
+      isUniAppDateTimeOffsetField(el) ||
+      weekdayEl
     if (!needsLive) return el
-    const live = resolveElementDateTimeDisplay(el, base)
+    sanitizeDateElementConfig(el, cfg)
+
+    /** 仅 durationdate2 黑条：偏移 + FULLY DAY */
+    if (weekdayEl) {
+      const live = resolveWeekdayDisplayForElement({ ...el, config: cfg }, base)
+      if (!live || !String(live).trim() || isCorruptedDateDisplayFormat(live)) return el
+      const raw = String(cfg.text ?? cfg.Text ?? '').trim()
+      const keepsOffsetStorage =
+        isUniAppDateTimeOffsetField(el) &&
+        (parseStoredPrintInputOffset(raw) != null || /^\d+$/.test(raw))
+      cfg.__previewFormatted = live
+      if (!keepsOffsetStorage) {
+        cfg.text = live
+        cfg.Text = live
+      }
+      return { ...el, config: cfg }
+    }
+
+    let live: string | null = null
+    try {
+      live = resolveElementDateTimeDisplay({ ...el, config: cfg }, base)
+    } catch (err) {
+      console.warn('[printInputOffset] applyLiveDateTimeFields resolve failed', el.id, err)
+    }
+    if (live != null && isCorruptedDateDisplayFormat(live)) {
+      live = null
+    }
     if (live == null || !String(live).trim()) return el
-    const cfg = { ...(el.config || {}) } as Record<string, unknown>
-    cfg.text = live
-    cfg.Text = live
+    const raw = String(cfg.text ?? cfg.Text ?? '').trim()
+    const keepsOffsetStorage =
+      isUniAppDateTimeOffsetField(el) &&
+      (parseStoredPrintInputOffset(raw) != null || /^\d+$/.test(raw))
+    cfg.__previewFormatted = live
+    if (!keepsOffsetStorage) {
+      cfg.text = live
+      cfg.Text = live
+    }
     return { ...el, config: cfg }
   })
   return { ...template, elements }
@@ -349,7 +810,7 @@ export function resolveTemplateDefaultValueForElement (
   const s = String(stored ?? '').trim()
   if (!s) return ''
   if (!isUniAppDateTimeOffsetField(el)) return s
-  const parsed = tryParsePrintInputOffsetStored(s)
+  const parsed = parseStoredPrintInputOffset(s)
   if (parsed) {
     const amount = normalizeOffsetAmount(parsed.value)
     if (amount === null) return ''
@@ -357,7 +818,7 @@ export function resolveTemplateDefaultValueForElement (
   }
   if (isLikelyResolvedDateTimeLiteral(s)) {
     const off = readOffsetFromElementConfig(el)
-    return resolveFromOffsetAmount(el, off?.amount ?? 0, off?.unit ?? 'Days', now)
+    if (off) return resolveFromOffsetAmount(el, off.amount, off.unit, now)
   }
   return s
 }
@@ -3,6 +3,28 @@ import type {
   SystemLabelTemplate,
   SystemTemplateElementBase,
 } from '../print/types/printer'
+import { isUniAppDateTimeOffsetField, isPrintInputLiteralField } from './printInputOffset'
+import { formatWeightDisplay } from '../weightElement'
+
+/** Entered When Printing：config.text 为 Pre-text，仅作 App 打印页提示，不出现在标签上 */
+export function printInputPreText(el: SystemTemplateElementBase): string {
+  const c = el.config || {}
+  return String(c.text ?? c.Text ?? '').trim()
+}
+
+export function printInputFieldLabelFromElement(el: SystemTemplateElementBase): string {
+  const preText = printInputPreText(el)
+  if (preText) return preText
+  const type = String(el.type || '').toUpperCase()
+  const c = el.config || {}
+  const it = String(c.inputType ?? c.InputType ?? '').toLowerCase()
+  if (it === 'number') return 'Number'
+  if (it === 'text') return 'Text'
+  if (it === 'options') return 'Multiple Options'
+  if (it === 'datetime' || it === 'date') return 'Date & Time'
+  if (type === 'WEIGHT') return 'Weight'
+  return type.replace(/_/g, ' ')
+}
  
 /**
  * 打印/预览 printInputJson 的 key：与接口文档一致优先 inputKey，否则 elementName，最后兜底元素 id。
@@ -62,18 +84,32 @@ export function readFreeFieldValuesFromTemplate(template: SystemLabelTemplate): 
   const out: Record<string, string> = {}
   for (const el of template.elements || []) {
     if (!isPrintInputFreeFieldElement(el)) continue
+    if (isUniAppDateTimeOffsetField(el)) continue
+    if (isPrintInputLiteralField(el)) {
+      const c = el.config || {}
+      const it = String(c.inputType ?? c.InputType ?? '').toLowerCase()
+      const type = String(el.type || '').toUpperCase()
+      if (type === 'WEIGHT') {
+        const v = c.value ?? c.Value
+        out[el.id] = v != null && String(v).trim() !== '' ? String(v).trim() : ''
+        continue
+      }
+      if (it === 'number') {
+        out[el.id] = '0'
+        continue
+      }
+      out[el.id] = ''
+      continue
+    }
     const c = el.config || {}
     const type = String(el.type || '').toUpperCase()
-    let initial = ''
     if (type === 'WEIGHT') {
       const v = c.value ?? c.Value
-      if (v != null && String(v).trim() !== '') initial = String(v).trim()
-    } else {
-      const fmt = String(c.format ?? c.Format ?? '').trim()
-      const t = String(c.text ?? c.Text ?? '').trim()
-      if (t && (!fmt || t !== fmt)) initial = t
+      out[el.id] = v != null && String(v).trim() !== '' ? String(v).trim() : ''
+      continue
     }
-    out[el.id] = initial
+    // DATE/TIME 等：config.text 为 Pre-text，初始录入为空
+    out[el.id] = ''
   }
   return out
 }
@@ -101,12 +137,23 @@ export function mergePrintInputFreeFields(
     ...template,
     elements: (template.elements || []).map((el) => {
       if (!isPrintInputFreeFieldElement(el)) return el
+      if (isUniAppDateTimeOffsetField(el)) return el
       const cfg = { ...el.config }
       const raw = String(values[el.id] ?? '').trim()
       const unit = String(cfg.unit ?? cfg.Unit ?? '').trim()
       const type = String(el.type || '').toUpperCase()
  
       if (!raw) {
+        if (isPrintInputLiteralField(el)) {
+          const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+          if (type === 'WEIGHT') {
+            return { ...el, config: { ...cfg, text: '', value: '' } }
+          }
+          if (it === 'number') {
+            return { ...el, config: { ...cfg, text: '' } }
+          }
+          return { ...el, config: { ...cfg, text: '' } }
+        }
         if (type === 'DATE' || type === 'TIME') {
           const fmt = String(cfg.format ?? cfg.Format ?? '')
           return { ...el, config: { ...cfg, text: fmt } }
@@ -120,7 +167,12 @@ export function mergePrintInputFreeFields(
         return { ...el, config: { ...cfg, text: ph } }
       }
  
-      const display = unit && !raw.endsWith(unit) ? `${raw}${unit}` : raw
+      const display =
+        type === 'WEIGHT'
+          ? formatWeightDisplay(raw, unit)
+          : unit && !raw.endsWith(unit)
+            ? `${raw}${unit}`
+            : raw
       const next = { ...cfg, text: display } as Record<string, any>
       if (type === 'WEIGHT') {
         next.value = raw
 import type { RawImageDataSource, SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
 import { resolveMediaUrlForApp, storedValueLooksLikeImagePath } from '../resolveMediaUrl'
-import { sortElementsForPreview } from './normalizePreviewTemplate'
-import { resolveElementDateTimeDisplay, isLikelyResolvedDateTimeLiteral } from './printInputOffset'
+import { sortElementsForPreview, normalizeTemplatePrintOrientation } from './normalizePreviewTemplate'
+import { resolveLabelDesignCanvasPx } from '../print/templatePhysicalMm'
+import {
+  resolveElementDateTimeDisplay,
+  isLikelyResolvedDateTimeLiteral,
+  isCorruptedDateDisplayFormat,
+  isStoredPrintInputOffsetPayload,
+  sanitizeDateElementConfig,
+  resolveWeekdayDisplayForElement,
+  isUniAppDateTimeOffsetField,
+  isWeekdayBarElement,
+  isPrintInputLiteralField,
+  resolvePrintInputLiteralDisplay,
+} from './printInputOffset'
+import { getLoggedInEmployeeDisplayName, isEmployeeTemplateElement } from './employeeElement'
 import QRCode from 'qrcode'
+import { readInvertColors } from '../invertColorsConfig'
+import {
+  ensureLabelEditorFontsForTemplate,
+  isLabelEditorFontItalicLoaded,
+  resolveLabelEditorFontFamily,
+} from '../labelEditorFonts'
+import {
+  computeVerticalTextBlockOffset,
+  readVerticalAlign,
+  readElementBorder,
+  readFontStyle,
+  readFontWeight,
+  readTextDecoration,
+  readElementRotation,
+  elementRotationDegrees,
+  isShortSingleLineTextBox,
+  type TextVerticalAlign,
+} from '../textElementLayout'
  
-const NUTRITION_FIXED_ITEMS = [
-  { key: 'fat', label: 'Total Fat' },
-  { key: 'saturatedFat', label: 'Saturated Fat' },
-  { key: 'transFat', label: 'Trans Fat' },
-  { key: 'cholesterol', label: 'Cholesterol' },
-  { key: 'sodium', label: 'Sodium' },
-  { key: 'carbs', label: 'Total Carbohydrates' },
-  { key: 'dietaryFiber', label: 'Dietary Fiber' },
-  { key: 'totalSugar', label: 'Total Sugar' },
-  { key: 'protein', label: 'Protein' },
-  { key: 'vitaminA', label: 'Vitamin A' },
-  { key: 'vitaminC', label: 'Vitamin C' },
-  { key: 'calcium', label: 'Calcium' },
-  { key: 'iron', label: 'Iron' },
-]
+import { computeImageDrawRect, readImageScaleMode } from '../imageScaleMode'
+import {
+  buildNutritionFactsViewModel,
+  DEFAULT_NUTRITION_FOOTER_NOTE,
+  NUTRITION_AMOUNT_COL_WIDTH,
+  NUTRITION_BODY_FONT_SIZE,
+  NUTRITION_PCT_COL_WIDTH,
+  type NutritionDivider,
+} from '../nutritionFactsLayout'
  
 /** 与 Web LabelCanvas.unitToPx 一致：cm 用 37.8px/inch，保证与后台模板坐标系一致 */
 const PX_PER_CM = 37.8
@@ -62,6 +87,399 @@ function readFillColor(config: Record&lt;string, any&gt;): string {
   return String(config.color ?? config.Color ?? '#111827')
 }
  
+/** 底部黑条：模板约定 verticalAlign=center，在元素框内居中铺黑底（与 Web flex 一致） */
+function resolveDrawVerticalAlign(
+  config: Record<string, any>,
+  el: SystemTemplateElementBase,
+  opts: { invertedBar: boolean; weekdayBar: boolean },
+): TextVerticalAlign {
+  const merged = {
+    ...config,
+    verticalAlign:
+      config.verticalAlign
+      ?? config.VerticalAlign
+      ?? (el as Record<string, unknown>).verticalAlign
+      ?? (el as Record<string, unknown>).VerticalAlign,
+  }
+  const align = readVerticalAlign(merged)
+  if (opts.invertedBar && opts.weekdayBar) {
+    if (align === 'top') return 'center'
+    return align
+  }
+  return align
+}
+
+function lineHeightForTextElement(
+  printFontSize: number,
+  isDateTimeType: boolean,
+): number {
+  return isDateTimeType
+    ? Math.max(printFontSize + 2, Math.round(printFontSize * 1.2))
+    : Math.max(printFontSize + 2, Math.round(printFontSize * 1.25))
+}
+
+/**
+ * Web AlignedTextBox + 黑底行：行盒高度略小于 line-height 1.2，在元素框内垂直居中。
+ * layout 用较薄行盒算偏移，绘制用略高条带承托粗体。
+ */
+function layoutInvertedWeekdayStrip(
+  by: number,
+  bh: number,
+  printFontSize: number,
+  verticalAlign: TextVerticalAlign,
+): { stripTop: number; stripHeight: number; textY: number } {
+  const layoutH = Math.max(printFontSize + 2, Math.round(printFontSize * 1.12))
+  const stripHeight = Math.max(layoutH, Math.round(printFontSize * 1.22))
+  const effectiveAlign = verticalAlign === 'top' ? 'center' : verticalAlign
+  const verticalOffset = computeVerticalTextBlockOffset(bh, layoutH, effectiveAlign)
+  const stripTop = by + verticalOffset
+  const textY = stripTop + Math.round(stripHeight * 0.74)
+  return { stripTop, stripHeight, textY }
+}
+
+/** 单行在元素框内垂直对齐（与 Web flex + verticalAlign 一致）；多行仍用 alphabetic baseline */
+function computeLineDrawY(
+  by: number,
+  bh: number,
+  li: number,
+  fittedLineHeight: number,
+  visibleLineCount: number,
+  printFontSize: number,
+  verticalAlign: TextVerticalAlign,
+): { y: number; baseline: 'middle' | 'alphabetic' } {
+  const blockHeight = visibleLineCount * fittedLineHeight
+  const verticalOffset = computeVerticalTextBlockOffset(bh, blockHeight, verticalAlign)
+  const lineTop = by + verticalOffset + li * fittedLineHeight
+  if (visibleLineCount === 1 && verticalAlign === 'center') {
+    return { y: by + bh / 2, baseline: 'middle' }
+  }
+  if (visibleLineCount === 1 && verticalAlign === 'bottom') {
+    return {
+      y: by + bh - Math.max(1, Math.round(printFontSize * 0.12)),
+      baseline: 'alphabetic',
+    }
+  }
+  if (visibleLineCount > 1) {
+    return { y: lineTop + fittedLineHeight / 2, baseline: 'middle' }
+  }
+  return { y: lineTop + Math.round(printFontSize * 0.82), baseline: 'alphabetic' }
+}
+
+/** middle 基线时 y 在字高中心，下划线贴在数字底部略下方 */
+function computeUnderlineDrawY(
+  y: number,
+  fontSize: number,
+  baseline: 'middle' | 'alphabetic',
+): number {
+  if (baseline === 'middle') {
+    /** 数字 cap-height 约 0.72em，自 center 到字底约 0.36em */
+    return y + Math.round(fontSize * 0.36) + Math.max(1, Math.round(fontSize * 0.04))
+  }
+  return y + Math.max(1, Math.round(fontSize * 0.1))
+}
+
+function readCanvasFontWeight(config: Record<string, any>): 'normal' | 'bold' {
+  if (readFontWeight(config) === 'bold') return 'bold'
+  const family = resolveLabelEditorFontFamily(config).toLowerCase()
+  if (family.includes('bold')) return 'bold'
+  return 'normal'
+}
+
+function applyCanvasFontFromConfig(
+  ctx: UniApp.CanvasContext,
+  config: Record<string, any>,
+  fontSize: number,
+): void {
+  const fontFamily = resolveLabelEditorFontFamily(config)
+  const anyCtx = ctx as any
+  const weight = readCanvasFontWeight(config)
+  const style = readFontStyle(config) === 'italic' ? 'italic' : 'normal'
+  if (typeof anyCtx.setFontFamily === 'function') {
+    anyCtx.setFontFamily(fontFamily)
+  }
+  if (typeof anyCtx.setFontWeight === 'function') {
+    anyCtx.setFontWeight(weight)
+  }
+  if (typeof anyCtx.font !== 'undefined') {
+    anyCtx.font = `${style} ${weight} ${fontSize}px "${fontFamily}"`
+  }
+}
+
+function approxTextWidth(text: string, fontSize: number): number {
+  return Math.max(4, String(text).length * fontSize * 0.55)
+}
+
+function canvasSupportsMeasureText(ctx: UniApp.CanvasContext): boolean {
+  return typeof (ctx as any).measureText === 'function'
+}
+
+function measureCanvasLineWidth(
+  ctx: UniApp.CanvasContext,
+  text: string,
+  fontSize: number,
+  config: Record<string, any>,
+): number {
+  if (canvasSupportsMeasureText(ctx)) {
+    try {
+      applyCanvasFontFromConfig(ctx, config, fontSize)
+      const w = Number((ctx as any).measureText(String(text)).width)
+      if (Number.isFinite(w) && w > 0) return w
+    } catch {
+      /* fall through */
+    }
+  }
+  return approxTextWidth(text, fontSize)
+}
+
+function pushLongWordByMeasuredWidth(
+  ctx: UniApp.CanvasContext,
+  word: string,
+  maxWidth: number,
+  fontSize: number,
+  config: Record<string, any>,
+  out: string[],
+): string {
+  let buf = ''
+  for (let i = 0; i < word.length; i++) {
+    const ch = word.charAt(i)
+    const trial = buf + ch
+    if (buf && measureCanvasLineWidth(ctx, trial, fontSize, config) > maxWidth) {
+      out.push(buf)
+      buf = ch
+    } else {
+      buf = trial
+    }
+  }
+  return buf
+}
+
+function flushMeasuredRemainder(
+  ctx: UniApp.CanvasContext,
+  remainder: string,
+  maxWidth: number,
+  fontSize: number,
+  config: Record<string, any>,
+  out: string[],
+): void {
+  let rest = String(remainder ?? '')
+  let guard = 0
+  const guardMax = Math.max(64, rest.length * 4)
+  while (rest.length > 0 && guard++ < guardMax) {
+    const before = out.length
+    rest = pushLongWordByMeasuredWidth(ctx, rest, maxWidth, fontSize, config, out)
+    if (!rest) break
+    if (out.length === before) {
+      /** 单字宽于行宽或 push 未产出新行：强制推进 1 字符，避免 while(rest) 死循环 */
+      out.push(rest.slice(0, 1))
+      rest = rest.slice(1)
+      continue
+    }
+    if (measureCanvasLineWidth(ctx, rest, fontSize, config) <= maxWidth) {
+      out.push(rest)
+      break
+    }
+  }
+  if (rest.length > 0 && guard >= guardMax) {
+    out.push(rest)
+  }
+}
+
+/** 优先 measureText 按真实宽度断行；breakAll 与 Web `break-all` 一致 */
+function wrapTextToCanvasWidth(
+  ctx: UniApp.CanvasContext,
+  text: string,
+  innerWidthPx: number,
+  fontSize: number,
+  config: Record<string, any>,
+  breakAll = false,
+): string[] {
+  const maxW = Math.max(4, innerWidthPx)
+  const rawLines = String(text ?? '').split(/\r?\n/)
+  const out: string[] = []
+
+  for (const segment of rawLines) {
+    const s = String(segment ?? '')
+    if (!s.trim()) {
+      out.push(s)
+      continue
+    }
+    if (measureCanvasLineWidth(ctx, s, fontSize, config) <= maxW) {
+      out.push(s)
+      continue
+    }
+    if (!canvasSupportsMeasureText(ctx)) {
+      out.push(...wrapTextToWidth(s, maxCharsPerLine(maxW, fontSize)))
+      continue
+    }
+    if (breakAll) {
+      flushMeasuredRemainder(ctx, s, maxW, fontSize, config, out)
+      continue
+    }
+    const words = s.trim().split(/\s+/).filter(Boolean)
+    let cur = ''
+    for (const word of words) {
+      const trial = cur ? `${cur} ${word}` : word
+      if (measureCanvasLineWidth(ctx, trial, fontSize, config) <= maxW) {
+        cur = trial
+      } else {
+        if (cur) out.push(cur)
+        if (measureCanvasLineWidth(ctx, word, fontSize, config) <= maxW) {
+          cur = word
+        } else {
+          cur = pushLongWordByMeasuredWidth(ctx, word, maxW, fontSize, config, out)
+        }
+      }
+    }
+    if (cur) out.push(cur)
+  }
+  return out.length ? out : ['']
+}
+
+/** 黑底/静态文案行高：与 Web leading-tight（≈1.25）一致，避免矮框多行末行被 clip */
+function invertedStaticLineHeight(fontSize: number): number {
+  return lineHeightForTextElement(fontSize, false)
+}
+
+function shouldBreakAllTextWrap(_type: string, invertedStatic: boolean): boolean {
+  /** 仅黑底窄框标签需 break-all；长地址等普通 TEXT_STATIC 用词边界换行，避免逐字 measureText 卡死 */
+  return invertedStatic
+}
+
+function maxLinesForBox(
+  layoutBoxH: number,
+  fittedLineHeight: number,
+  printFontSize: number,
+): number {
+  if (layoutBoxH < printFontSize) return 1
+  const descentPad = Math.max(2, Math.round(printFontSize * 0.14))
+  return Math.max(1, Math.floor((layoutBoxH + descentPad) / fittedLineHeight))
+}
+
+function fitFontSizeToInnerWidth(
+  ctx: UniApp.CanvasContext,
+  line: string,
+  innerW: number,
+  fontSize: number,
+  config: Record<string, any>,
+): number {
+  if (!line || innerW <= 0) return fontSize
+  if (!canvasSupportsMeasureText(ctx)) {
+    const w = approxTextWidth(line, fontSize)
+    if (w <= innerW) return fontSize
+    return Math.max(8, Math.floor(fontSize * (innerW / w) * 0.98))
+  }
+  let size = fontSize
+  for (let i = 0; i < 5; i++) {
+    const w = measureCanvasLineWidth(ctx, line, size, config)
+    if (w <= innerW || w <= 0) return size
+    size = Math.max(8, Math.floor(size * (innerW / w) * 0.98))
+  }
+  return Math.max(8, size)
+}
+
+function resolveTextLinesForDraw(
+  ctx: UniApp.CanvasContext,
+  text: string,
+  innerW: number,
+  layoutBoxH: number,
+  printFontSize: number,
+  fittedLineHeight: number,
+  config: Record<string, any>,
+  opts: { breakAll: boolean; isDateTimeType: boolean },
+): { lines: string[]; drawFontSize: number } {
+  const trimmed = String(text ?? '').trim()
+  if (!trimmed) return { lines: [''], drawFontSize: printFontSize }
+  if (opts.isDateTimeType) {
+    return { lines: [trimmed.replace(/\s+/g, ' ')], drawFontSize: printFontSize }
+  }
+  const preferSingleLine =
+    !opts.breakAll &&
+    !trimmed.includes('\n') &&
+    isShortSingleLineTextBox(layoutBoxH, printFontSize, trimmed, { breakAll: opts.breakAll })
+  if (preferSingleLine) {
+    const drawFontSize = fitFontSizeToInnerWidth(ctx, trimmed, innerW, printFontSize, config)
+    return { lines: [trimmed], drawFontSize }
+  }
+  return {
+    lines: wrapTextToCanvasWidth(ctx, trimmed, innerW, printFontSize, config, opts.breakAll),
+    drawFontSize: printFontSize,
+  }
+}
+
+function computeVisibleTextLines(
+  lines: string[],
+  layoutBoxH: number,
+  fittedLineHeight: number,
+  printFontSize: number,
+  isDateTimeType: boolean,
+): string[] {
+  if (isDateTimeType) return lines.slice(0, 1)
+  if (layoutBoxH < printFontSize) return lines.slice(0, 1)
+  const maxLines = Math.min(lines.length, maxLinesForBox(layoutBoxH, fittedLineHeight, printFontSize))
+  return lines.slice(0, maxLines)
+}
+
+function drawStyledTextLine(
+  ctx: UniApp.CanvasContext,
+  line: string,
+  tx: number,
+  y: number,
+  fontSize: number,
+  align: string,
+  config: Record<string, any>,
+  fillColor: string,
+  emphasizeForPrint = false,
+  baseline: 'middle' | 'alphabetic' = 'alphabetic',
+): void {
+  const family = resolveLabelEditorFontFamily(config)
+  const italic = readFontStyle(config) === 'italic'
+  const underline = readTextDecoration(config) === 'underline'
+  const useSkewFallback = italic && !isLabelEditorFontItalicLoaded(family)
+  const anyCtx = ctx as any
+  const lineWidth = approxTextWidth(line, fontSize)
+  if (typeof anyCtx.setTextBaseline === 'function') {
+    anyCtx.setTextBaseline(baseline)
+  }
+
+  const drawFill = () => {
+    if (emphasizeForPrint) {
+      const stroke = Math.max(0.5, fontSize * 0.04)
+      for (const [ox, oy] of [[0, 0], [stroke, 0], [-stroke, 0], [0, stroke], [0, -stroke]] as const) {
+        ctx.fillText(line, tx + ox, y + oy)
+      }
+      return
+    }
+    ctx.fillText(line, tx, y)
+  }
+
+  if (useSkewFallback && typeof anyCtx.save === 'function') {
+    anyCtx.save()
+    anyCtx.transform(1, 0, -0.25, 1, tx * 0.08, 0)
+  }
+  drawFill()
+  if (underline) {
+    let x1 = tx
+    let x2 = tx + lineWidth
+    if (align === 'center') {
+      x1 = tx - lineWidth / 2
+      x2 = tx + lineWidth / 2
+    } else if (align === 'right') {
+      x1 = tx - lineWidth
+      x2 = tx
+    }
+    const underlineY = computeUnderlineDrawY(y, fontSize, baseline)
+    ctx.setStrokeStyle(fillColor)
+    ctx.setLineWidth(Math.max(1, Math.round(fontSize * 0.06)))
+    ctx.beginPath()
+    ctx.moveTo(x1, underlineY)
+    ctx.lineTo(x2, underlineY)
+    ctx.stroke()
+  }
+  if (useSkewFallback && typeof anyCtx.restore === 'function') {
+    anyCtx.restore()
+  }
+}
+
 /** 按元素框宽度估算每行最大字符数（等宽近似，兼容中英文） */
 function maxCharsPerLine(innerWidthPx: number, fontSize: number): number {
   if (innerWidthPx <= 4) return 8
@@ -123,17 +541,57 @@ function wrapTextToWidth(text: string, maxChars: number): string[] {
   return out.length ? out : ['']
 }
  
+function resolveDateTimePreviewText (
+  element: SystemTemplateElementBase,
+  baseTime: Date = new Date(),
+): string {
+  if (isPrintInputLiteralField(element)) {
+    return resolvePrintInputLiteralDisplay(element)
+  }
+  if (isWeekdayBarElement(element)) {
+    return applyConfigPrefix(
+      element.config || {},
+      resolveWeekdayDisplayForElement(element, baseTime),
+    )
+  }
+  const config = element.config || {}
+  const previewFormatted = cfgStr(config, ['__previewFormatted', '__PreviewFormatted'], '').trim()
+  if (
+    previewFormatted &&
+    !isCorruptedDateDisplayFormat(previewFormatted) &&
+    !isStoredPrintInputOffsetPayload(previewFormatted)
+  ) {
+    return applyConfigPrefix(config, previewFormatted)
+  }
+  const sanitizedCfg = { ...config } as Record<string, unknown>
+  sanitizeDateElementConfig(element, sanitizedCfg)
+  try {
+    const live = resolveElementDateTimeDisplay({ ...element, config: sanitizedCfg }, baseTime)
+    if (live != null && live.trim() && !isCorruptedDateDisplayFormat(live) && !isStoredPrintInputOffsetPayload(live)) {
+      return applyConfigPrefix(sanitizedCfg, live)
+    }
+  } catch (err) {
+    console.warn('[labelPreview] resolveElementDateTimeDisplay failed', element.id, err)
+  }
+  return ''
+}
+
 function previewTextForElement(element: SystemTemplateElementBase, baseTime: Date = new Date()): string {
   const type = String(element.type || '').toUpperCase()
   const config = element.config || {}
+  if (isPrintInputLiteralField(element)) {
+    return resolvePrintInputLiteralDisplay(element)
+  }
+  if (isWeekdayBarElement(element)) {
+    return applyConfigPrefix(config, resolveWeekdayDisplayForElement(element, baseTime))
+  }
+  if (isEmployeeTemplateElement(element)) {
+    const cfgText = cfgStr(config, ['text', 'Text'], '').trim()
+    if (cfgText && cfgText.toLowerCase() !== 'text') return applyConfigPrefix(config, cfgText)
+    return applyConfigPrefix(config, getLoggedInEmployeeDisplayName())
+  }
   if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
-    const live = resolveElementDateTimeDisplay(element, baseTime)
-    if (live != null && live.trim()) return live
-    /** applyLiveDateTimeFieldsToTemplate 已写入 config.text 时直接展示，避免二次 resolve 把 +N Days 重置为当天 */
-    const baked = cfgStr(config, ['text', 'Text'], '').trim()
-    if (baked && isLikelyResolvedDateTimeLiteral(baked)) {
-      return applyConfigPrefix(config, baked)
-    }
+    return resolveDateTimePreviewText(element, baseTime)
   }
   if (type === 'QRCODE') {
     return cfgStr(config, ['data', 'Data', 'value', 'Value'])
@@ -149,18 +607,30 @@ function previewTextForElement(element: SystemTemplateElementBase, baseTime: Dat
     const rawSel = config.selectedOptionValues ?? config.SelectedOptionValues
     const arr = Array.isArray(rawSel) ? rawSel.map((x: unknown) => String(x)) : []
     const txt = cfgStr(config, ['text', 'Text'], '')
-    if (arr.length > 0 && txt.trim()) return txt
     if (arr.length > 0) {
       const joined = arr.join(', ')
+      if (txt.trim() && arr.some((v) => txt.includes(v))) return txt
       return applyConfigPrefix(config, joined)
     }
-    const hint = txt.trim() || 'Select below'
-    return applyConfigPrefix(config, hint)
+    return ''
   }
   if (vst === 'PRINT_INPUT' && !(inputType === 'options' || hasDict)) {
+    if (
+      inputType === 'date' ||
+      inputType === 'datetime' ||
+      isUniAppDateTimeOffsetField(element)
+    ) {
+      return resolveDateTimePreviewText(element, baseTime)
+    }
     let body = cfgStr(config, ['text', 'Text'], '')
     if (!body.trim()) body = cfgStr(config, ['value', 'Value'], '')
     if (!body.trim()) body = cfgStr(config, ['format', 'Format', 'placeholder', 'Placeholder'], '')
+    const literalNumberOrText =
+      inputType === 'number' ||
+      inputType === 'text' ||
+      isPrintInputLiteralField(element)
+    if (!literalNumberOrText && isStoredPrintInputOffsetPayload(body)) return ''
+    if (isCorruptedDateDisplayFormat(body)) return ''
     const unit = String(config.unit ?? config.Unit ?? '').trim()
     if (unit && body.trim() && !body.endsWith(unit)) body = `${body}${unit}`
     return applyConfigPrefix(config, body)
@@ -179,6 +649,7 @@ function previewTextForElement(element: SystemTemplateElementBase, baseTime: Dat
     'defaultValue',
     'placeholder',
   ])
+  if (isStoredPrintInputOffsetPayload(body) || isCorruptedDateDisplayFormat(body)) return ''
   return applyConfigPrefix(config, body)
 }
  
@@ -220,11 +691,13 @@ function drawBarcodeLikePreview(
   w: number,
   h: number,
   value: string,
-  options?: { orientation?: string; showText?: boolean }
+  options?: { orientation?: string; showText?: boolean; fontSize?: number },
 ): void {
-  const bw = Math.max(40, w || 140)
-  const bh = Math.max(28, h || 56)
+  const bw = Math.max(8, w || 140)
+  const bh = Math.max(8, h || 56)
   const showText = options?.showText !== false
+  const fontSize = Math.max(8, Math.round(Number(options?.fontSize ?? 14) || 14))
+  const labelReserve = showText ? Math.max(12, fontSize + 4) : 4
   const pad = 2
   const modules = barcodeModulesFromValue(value)
   const orientation = String(options?.orientation || 'horizontal').toLowerCase()
@@ -238,42 +711,42 @@ function drawBarcodeLikePreview(
   ctx.setFillStyle('#111827')
  
   if (!isVertical) {
-    const textH = showText && txt ? Math.max(10, Math.round(bh * 0.2)) : 0
-    const barH = Math.max(10, bh - textH - pad * 2)
+    const textH = showText && txt ? labelReserve : 0
+    const barH = Math.max(20, bh - textH - pad)
     const innerW = Math.max(8, bw - pad * 2)
     const moduleW = innerW / modules.length
     let cursor = x + pad
     for (let i = 0; i < modules.length; i++) {
       if (modules[i] === 1) {
-        const rw = Math.max(0.7, moduleW * 0.72)
+        const rw = Math.max(0.7, moduleW * 0.85)
         ctx.fillRect(cursor, y + pad, rw, barH)
       }
       cursor += moduleW
     }
     if (showText && txt) {
-      ctx.setFontSize(Math.max(9, Math.min(12, Math.round(textH * 0.8))))
+      ctx.setFontSize(fontSize)
       ctx.setTextAlign('center')
-      ctx.fillText(txt, x + bw / 2, y + bh - 2)
+      ctx.fillText(txt, x + bw / 2, y + bh - Math.max(2, Math.round(fontSize * 0.2)))
       ctx.setTextAlign('left')
     }
     return
   }
  
   // vertical：条码在左，data 竖排在右
-  const textBandW = showText && txt ? Math.max(10, Math.round(bw * 0.18)) : 0
-  const barW = Math.max(10, bw - textBandW - pad * 2)
-  const innerH = Math.max(10, bh - pad * 2)
+  const textBandW = showText && txt ? Math.max(14, Math.round(fontSize + 6)) : 0
+  const barW = Math.max(12, bw - textBandW - pad * 2)
+  const innerH = Math.max(12, bh - pad * 2)
   const moduleH = innerH / modules.length
   let cursorY = y + pad
   for (let i = 0; i < modules.length; i++) {
     if (modules[i] === 1) {
-      const rh = Math.max(0.7, moduleH * 0.72)
+      const rh = Math.max(0.7, moduleH * 0.85)
       ctx.fillRect(x + pad, cursorY, barW, rh)
     }
     cursorY += moduleH
   }
   if (showText && txt) {
-    const font = Math.max(9, Math.min(11, Math.floor(textBandW * 0.75)))
+    const font = fontSize
     const cx = x + bw - textBandW / 2
     const cy = y + bh / 2
     const anyCtx = ctx as any
@@ -350,33 +823,230 @@ function drawQrCodePreview(
   }
 }
  
-function nutritionFixedField(cfg: Record<string, any>, key: string, field: 'value' | 'unit'): string {
-  const directKey = field === 'value' ? key : `${key}Unit`
-  const direct = cfg[directKey]
-  if (direct != null && String(direct).trim() !== '') return String(direct).trim()
-  const rows = Array.isArray(cfg.fixedNutrients) ? (cfg.fixedNutrients as Array<Record<string, unknown>>) : []
-  const row = rows.find((item) => String(item.key ?? '').trim() === key)
-  return String(row?.[field] ?? '').trim()
+
+/** 双下划线两线间距（px），与 Web NutritionFactsPanel 一致 */
+const NUTRITION_DOUBLE_LINE_GAP = 3
+
+function drawNutritionDivider(
+  ctx: UniApp.CanvasContext,
+  x1: number,
+  x2: number,
+  y: number,
+  kind: NutritionDivider,
+): number {
+  if (kind === 'none') return 0
+  ctx.setStrokeStyle('#111827')
+  ctx.setLineWidth(1)
+  if (kind === 'double') {
+    ctx.beginPath()
+    ctx.moveTo(x1, y)
+    ctx.lineTo(x2, y)
+    ctx.stroke()
+    const y2 = y + 1 + NUTRITION_DOUBLE_LINE_GAP
+    ctx.beginPath()
+    ctx.moveTo(x1, y2)
+    ctx.lineTo(x2, y2)
+    ctx.stroke()
+    return 1 + NUTRITION_DOUBLE_LINE_GAP + 1 + 2
+  }
+  ctx.beginPath()
+  ctx.moveTo(x1, y)
+  ctx.lineTo(x2, y)
+  ctx.stroke()
+  return 2
 }
  
-function nutritionExtraRows(cfg: Record<string, any>): Array<{ name: string; value: string; unit: string }> {
-  const raw = cfg.extraNutrients
-  if (!Array.isArray(raw)) return []
-  return raw.map((item) => {
-    const row = (item || {}) as Record<string, unknown>
-    return {
-      name: String(row.name ?? '').trim(),
-      value: String(row.value ?? '').trim(),
-      unit: String(row.unit ?? '').trim(),
+function drawNutritionFactsOnCanvas(
+  ctx: UniApp.CanvasContext,
+  config: Record<string, any>,
+  boxX: number,
+  boxY: number,
+  boxW: number,
+  boxH: number,
+): void {
+  const model = buildNutritionFactsViewModel(config)
+  const pad = 6
+  const leftX = boxX + pad
+  const rightX = boxX + boxW - pad
+  const amountColRight = rightX - NUTRITION_PCT_COL_WIDTH
+  const amountX = amountColRight - NUTRITION_AMOUNT_COL_WIDTH / 2
+  const pctX = rightX
+  const maxY = boxY + boxH - pad
+  let cursorY = boxY + pad
+  const titleSize = Math.max(11, Math.min(18, model.titleFontSize))
+  const bodySize = NUTRITION_BODY_FONT_SIZE
+  const footerSize = Math.max(8, Math.round(bodySize * 0.67))
+  /** 正文用 Roboto，避免 FreightSans Bold 导致整表加粗（与 Web 一致） */
+  const bodyCfg = { ...config, fontFamily: 'Roboto', FontFamily: 'Roboto' }
+
+  const rowStep = (fs: number) => fs + 3
+
+  const drawLine = (label: string, value: string, fs: number, labelBold = false) => {
+    const f = Math.max(8, Math.round(fs))
+    const lh = rowStep(f)
+    if (cursorY + lh > maxY) return false
+    ctx.setFillStyle('#111827')
+    ctx.setFontSize(f)
+    applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: labelBold ? 'bold' : 'normal' }, f)
+    ctx.setTextAlign('left')
+    ctx.fillText(label, leftX, cursorY + f)
+    if (value) {
+      applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: 'normal' }, f)
+      ctx.setTextAlign('right')
+      ctx.fillText(value, rightX, cursorY + f)
     }
-  })
+    cursorY += lh
+    return true
+  }
+
+  const drawNutrientRow = (
+    label: string,
+    amount: string,
+    pct: string,
+    fs: number,
+    labelBold: boolean,
+    indent: boolean,
+    divider: NutritionDivider,
+  ) => {
+    const f = Math.max(8, Math.round(fs))
+    const lh = rowStep(f)
+    if (cursorY + lh > maxY) return false
+    const labelX = leftX + (indent ? 10 : 0)
+    ctx.setFillStyle('#111827')
+    ctx.setFontSize(f)
+    applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: labelBold ? 'bold' : 'normal' }, f)
+    ctx.setTextAlign('left')
+    ctx.fillText(label, labelX, cursorY + f)
+    applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: 'normal' }, f)
+    if (amount) {
+      ctx.setTextAlign('center')
+      ctx.fillText(amount, amountX, cursorY + f)
+    }
+    if (pct) {
+      ctx.setTextAlign('right')
+      ctx.fillText(pct, pctX, cursorY + f)
+    }
+    cursorY += lh
+    if (divider !== 'none') {
+      cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, divider)
+    }
+    return true
+  }
+
+  const drawFooterNote = () => {
+    if (cursorY + footerSize + 6 > maxY) return
+    cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, 'thin')
+    ctx.setFontSize(footerSize)
+    ctx.setTextAlign('left')
+    const parts = DEFAULT_NUTRITION_FOOTER_NOTE.split(/(\b2000\b)/)
+    let fx = leftX
+    for (const part of parts) {
+      if (!part) continue
+      applyCanvasFontFromConfig(
+        ctx,
+        { ...bodyCfg, fontWeight: part === '2000' ? 'bold' : 'normal' },
+        footerSize,
+      )
+      ctx.fillText(part, fx, cursorY + footerSize)
+      fx += approxTextWidth(part, footerSize)
+    }
+    cursorY += footerSize + 2
+  }
+
+  ctx.setFillStyle('#111827')
+  ctx.setFontSize(Math.round(titleSize))
+  applyCanvasFontFromConfig(ctx, { ...config, fontWeight: 'bold' }, titleSize)
+  ctx.setTextAlign('left')
+  ctx.fillText('Nutrition Facts', leftX, cursorY + titleSize)
+  cursorY += titleSize + 1
+  cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, 'double')
+
+  drawLine(model.servingsLabel, model.servingsValue, bodySize)
+  cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, 'thin')
+  drawLine(model.servingSizeLabel, model.servingSizeValue, bodySize)
+  cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, 'double')
+
+  if (cursorY + bodySize + 3 <= maxY) {
+    ctx.setFontSize(bodySize)
+    applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: 'bold' }, bodySize)
+    ctx.setTextAlign('left')
+    ctx.fillText(model.caloriesLabel, leftX, cursorY + bodySize)
+    applyCanvasFontFromConfig(ctx, { ...bodyCfg, fontWeight: 'normal' }, bodySize)
+    ctx.setTextAlign('right')
+    ctx.fillText(model.caloriesAmountText || model.caloriesValue, rightX, cursorY + bodySize)
+    cursorY += bodySize + 1
+    cursorY += drawNutritionDivider(ctx, leftX, rightX, cursorY, 'double')
+  }
+
+  for (const row of model.rows) {
+    if (
+      !drawNutrientRow(
+        row.label,
+        row.amountText,
+        row.dailyValueText,
+        bodySize,
+        row.labelBold,
+        row.indent,
+        row.dividerAfter,
+      )
+    ) {
+      break
+    }
+  }
+
+  drawFooterNote()
+}
+
+function strokeTemplatePaperBorder (
+  ctx: UniApp.CanvasContext,
+  template: SystemLabelTemplate,
+  cw: number,
+  ch: number
+) {
+  const border = String(template.border || '').toLowerCase()
+  if (border !== 'line' && border !== 'dotted') return
+  ctx.setStrokeStyle('#374151')
+  ctx.setLineWidth(2)
+  const w = Math.max(0, cw - 1)
+  const h = Math.max(0, ch - 1)
+  if (border === 'dotted' && typeof (ctx as any).setLineDash === 'function') {
+    ;(ctx as any).setLineDash([4, 3], 0)
+    ctx.strokeRect(1, 1, w - 1, h - 1)
+    ;(ctx as any).setLineDash([], 0)
+  } else {
+    ctx.strokeRect(1, 1, w - 1, h - 1)
+  }
+}
+
+/** 元素级边框：须在背景/文字之后绘制，避免被 invert 黑底盖住 */
+function strokeElementBorder(
+  ctx: UniApp.CanvasContext,
+  x: number,
+  y: number,
+  w: number,
+  h: number,
+  border: string | undefined,
+) {
+  const line = String(border || '').toLowerCase()
+  if (line !== 'line' && line !== 'solid' && line !== 'dotted') return
+  ctx.setStrokeStyle(line === 'dotted' ? '#9ca3af' : '#111827')
+  ctx.setLineWidth(1)
+  if (line === 'dotted' && typeof (ctx as any).setLineDash === 'function') {
+    ;(ctx as any).setLineDash([3, 3], 0)
+    ctx.strokeRect(x, y, w, h)
+    ;(ctx as any).setLineDash([], 0)
+  } else {
+    ctx.strokeRect(x, y, w, h)
+  }
 }
  
-function nutritionValueWithLessThan(value: string, unit: string): string {
-  const v = String(value || '').trim()
-  const u = String(unit || '').trim()
-  if (!v && !u) return ''
-  return `<${v}${u ? ` ${u}` : ''}`
+/** 横打：与 Web printContentLayerStyle rotate(90deg) 一致，纸张尺寸不变 */
+function applyPrintContentRotation(ctx: UniApp.CanvasContext, cw: number, ch: number): void {
+  const cx = cw / 2
+  const cy = ch / 2
+  ctx.translate(cx, cy)
+  ctx.rotate(Math.PI / 2)
+  ctx.translate(-cx, -cy)
 }
  
 /** 与屏幕预览 / 位图打印共用绘制逻辑（坐标系：设计宽 cw × ch，ctx 已 scale） */
@@ -386,18 +1056,32 @@ function runLabelPreviewCanvasDraw(
   template: SystemLabelTemplate,
   cw: number,
   ch: number,
-  scale: number
+  scale: number,
+  drawOptions: { forPrint?: boolean; baseTime?: Date } = {},
 ): Promise<void> {
+  const forPrint = drawOptions.forPrint === true
+  const baseTime = drawOptions.baseTime ?? new Date()
   const sorted = sortElementsForPreview(template.elements || [])
+  const rotateContent = normalizeTemplatePrintOrientation(template.printOrientation) === 'horizontal'
  
-  return new Promise((resolve) => {
+  return ensureLabelEditorFontsForTemplate(template).then(
+    () =>
+      new Promise((resolve) => {
     const ctx = uni.createCanvasContext(canvasId, componentInstance)
     ctx.setFillStyle('#ffffff')
     ctx.scale(scale, scale)
     ctx.fillRect(0, 0, cw, ch)
+    if (rotateContent) {
+      ctx.save()
+      applyPrintContentRotation(ctx, cw, ch)
+    }
  
     const drawRest = (index: number) => {
       if (index >= sorted.length) {
+        if (rotateContent) {
+          ctx.restore()
+        }
+        strokeTemplatePaperBorder(ctx, template, cw, ch)
         ctx.draw(false, () => resolve())
         return
       }
@@ -411,110 +1095,51 @@ function runLabelPreviewCanvasDraw(
       const h = Math.max(0, Number(el.height) || 0)
  
       const next = () => drawRest(index + 1)
+      const finishElement = () => {
+        strokeElementBorder(ctx, x, y, w, h, readElementBorder(el))
+        next()
+      }
  
       if (type === 'IMAGE' || type === 'LOGO') {
         const src = resolveMediaUrlForApp(cfgStr(config, ['src', 'url', 'Src', 'Url']))
+        const boxW = w || 80
+        const boxH = h || 40
+        const scaleMode = readImageScaleMode(config)
         if (src) {
           uni.getImageInfo({
             src,
             success: (info) => {
               try {
-                ctx.drawImage(info.path, x, y, w || info.width, h || info.height)
+                const rect = computeImageDrawRect(
+                  boxW,
+                  boxH,
+                  Number(info.width) || 0,
+                  Number(info.height) || 0,
+                  scaleMode,
+                )
+                ctx.drawImage(info.path, x + rect.dx, y + rect.dy, rect.dw, rect.dh)
               } catch (_) {
                 ctx.setStrokeStyle('#cccccc')
                 ctx.setLineWidth(1)
-                ctx.strokeRect(x, y, w || 80, h || 40)
+                ctx.strokeRect(x, y, boxW, boxH)
               }
-              next()
+              finishElement()
             },
             fail: () => {
               ctx.setStrokeStyle('#cccccc')
-              ctx.strokeRect(x, y, w || 80, h || 40)
-              next()
+              ctx.strokeRect(x, y, boxW, boxH)
+              finishElement()
             },
           })
           return
         }
-        next()
+        finishElement()
         return
       }
  
       if (type === 'NUTRITION') {
-        const bw = Math.max(40, w || 120)
-        const bh = Math.max(36, h || 96)
-        const pad = 3
-        /** 数值列更贴右边框，与原生 NUTRITION_VALUE_RIGHT_MARGIN 一致 */
-        const rightX = x + bw - 1
-        const maxY = y + bh - 2
-        const titleSize = Math.max(11, Math.min(18, Number(config.nutritionTitleFontSize ?? config.NutritionTitleFontSize ?? 16) || 16))
-        const bodySize = Math.max(8, Math.min(11, Math.floor(titleSize * 0.72)))
-        let cursorY = y + pad
-
-        const servingsPerContainer = String(config.servingsPerContainer ?? config.ServingsPerContainer ?? '').trim()
-        const servingSize = String(config.servingSize ?? config.ServingSize ?? '').trim()
-        const calories = String(config.calories ?? config.Calories ?? nutritionFixedField(config, 'calories', 'value') ?? '').trim()
-        const rows = [
-          ...NUTRITION_FIXED_ITEMS.map((item) => {
-            const value = nutritionFixedField(config, item.key, 'value')
-            const unit = nutritionFixedField(config, item.key, 'unit')
-            if (!value) return null
-            return { label: item.label, value: nutritionValueWithLessThan(value, unit) }
-          }).filter(Boolean) as Array<{ label: string; value: string }>,
-          ...nutritionExtraRows(config)
-            .filter((r) => r.value)
-            .map((r) => ({
-              label: r.name || 'Other',
-              value: nutritionValueWithLessThan(r.value, r.unit),
-            })),
-        ]
-
-        const drawPair = (label: string, value: string, fs: number, bold = false): boolean => {
-          const f = Math.max(8, Math.round(fs))
-          const lh = f + 2
-          if (cursorY + lh > maxY) return false
-          ctx.setFillStyle('#111827')
-          ctx.setFontSize(f)
-          ctx.setTextAlign('left')
-          ctx.fillText(label, x + pad, cursorY + f)
-          if (bold) ctx.fillText(label, x + pad + 0.5, cursorY + f)
-          if (value) {
-            ctx.setTextAlign('right')
-            ctx.fillText(value, rightX, cursorY + f)
-            if (bold) ctx.fillText(value, rightX + 0.5, cursorY + f)
-            ctx.setTextAlign('left')
-          }
-          cursorY += lh
-          return true
-        }
-
-        ctx.setFillStyle('#ffffff')
-        ctx.fillRect(x, y, bw, bh)
-        ctx.setStrokeStyle('#111827')
-        ctx.setLineWidth(1)
-        ctx.strokeRect(x, y, bw, bh)
-
-        if (cursorY + titleSize + 2 <= maxY) {
-          ctx.setFillStyle('#111827')
-          ctx.setFontSize(Math.round(titleSize))
-          ctx.setTextAlign('left')
-          ctx.fillText('Nutrition Facts', x + pad, cursorY + Math.round(titleSize))
-          cursorY += Math.round(titleSize) + 2
-          ctx.setLineWidth(1)
-          ctx.beginPath()
-          ctx.moveTo(x + pad, cursorY)
-          ctx.lineTo(rightX, cursorY)
-          ctx.stroke()
-          cursorY += 2
-        }
-
-        if (calories) drawPair('Calories', nutritionValueWithLessThan(calories, ''), Math.max(bodySize, 9), true)
-        if (servingsPerContainer) drawPair('Servings Per Container', servingsPerContainer, bodySize)
-        if (servingSize) drawPair('Serving Size', servingSize, bodySize)
-        for (const row of rows) {
-          if (!drawPair(row.label, row.value, bodySize, true)) break
-        }
-
-        next()
+        drawNutritionFactsOnCanvas(ctx, config, x, y, Math.max(40, w || 220), Math.max(80, h || 280))
+        finishElement()
         return
       }
  
@@ -537,16 +1162,23 @@ function runLabelPreviewCanvasDraw(
         }
  
         if (type === 'BARCODE' && d) {
-          const orientation = cfgStr(config, ['orientation', 'Orientation'], 'horizontal')
+          const elementRotation = readElementRotation(el)
+          const configOrientation = cfgStr(config, ['orientation', 'Orientation'], 'horizontal').toLowerCase()
+          const orientation = elementRotation === 'vertical' ? 'vertical' : configOrientation
           const showText = String(config.showText ?? config.ShowText ?? 'true').toLowerCase() !== 'false'
-          drawBarcodeLikePreview(ctx, x, y, w || 140, h || 56, d, { orientation, showText })
-          next()
+          const barcodeFontSize = Number(config.fontSize ?? config.FontSize ?? 14) || 14
+          drawBarcodeLikePreview(ctx, x, y, w || 140, h || 56, d, {
+            orientation,
+            showText,
+            fontSize: barcodeFontSize,
+          })
+          finishElement()
           return
         }
  
         if (type === 'QRCODE' && d && !storedValueLooksLikeImagePath(d)) {
           drawQrCodePreview(ctx, x, y, w || 96, h || 96, d, cfgStr(config, ['errorLevel', 'ErrorLevel'], 'M'))
-          next()
+          finishElement()
           return
         }
  
@@ -564,11 +1196,11 @@ function runLabelPreviewCanvasDraw(
                 } catch (_) {
                   drawQrBarcodePlaceholder()
                 }
-                next()
+                finishElement()
               },
               fail: () => {
                 drawQrBarcodePlaceholder()
-                next()
+                finishElement()
               },
             })
             return
@@ -576,62 +1208,180 @@ function runLabelPreviewCanvasDraw(
         }
  
         drawQrBarcodePlaceholder()
-        next()
+        finishElement()
         return
       }
  
-      const line = String(el.border || '').toLowerCase()
-      if (line === 'line' || line === 'solid') {
-        ctx.setStrokeStyle('#111827')
-        ctx.setLineWidth(1)
-        ctx.strokeRect(x, y, w, h)
-      } else if (line === 'dotted') {
-        ctx.setStrokeStyle('#9ca3af')
-        ctx.setLineWidth(1)
-        if (typeof (ctx as any).setLineDash === 'function') {
-          ;(ctx as any).setLineDash([3, 3], 0)
-          ctx.strokeRect(x, y, w, h)
-          ;(ctx as any).setLineDash([], 0)
-        } else {
-          ctx.strokeRect(x, y, w, h)
+      const weekdayBar = isWeekdayBarElement(el)
+      let finalText = ''
+      if (weekdayBar) {
+        try {
+          finalText = resolveWeekdayDisplayForElement(el, baseTime)
+        } catch (err) {
+          console.warn('[labelPreview] resolveWeekdayDisplayForElement failed', el.id, err)
+        }
+      } else {
+        try {
+          finalText = previewTextForElement(el, baseTime)
+        } catch (err) {
+          console.warn('[labelPreview] previewTextForElement failed', el.id, err)
+        }
+        if (finalText && isCorruptedDateDisplayFormat(finalText)) {
+          finalText = ''
         }
       }
+      if ((finalText || weekdayBar) && !isGraphicOnlyType(type)) {
+        if (!finalText && weekdayBar) {
+          finalText = resolveWeekdayDisplayForElement(el, baseTime)
+        }
+        const rotationDegrees = elementRotationDegrees(el as any)
+        const drawAt = (bx: number, by: number, bw: number, bh: number) => {
+          const anyCtx = ctx as any
+          if (typeof anyCtx.save === 'function') anyCtx.save()
+          if (typeof anyCtx.beginPath === 'function' && typeof anyCtx.rect === 'function') {
+            anyCtx.beginPath()
+            anyCtx.rect(bx, by, bw, bh)
+            if (typeof anyCtx.clip === 'function') anyCtx.clip()
+          }
+
+          const fontSize = readFontSize(config)
+          const invertedBar = readInvertColors(config)
+          const printFontSize = invertedBar && forPrint ? fontSize + Math.max(1, Math.round(fontSize * 0.08)) : fontSize
+          const align = readTextAlign(config)
+          const fillColor = invertedBar ? '#ffffff' : readFillColor(config)
+          /** 与 Web AlignedTextBox 的 Tailwind px-1 一致：仅水平 4px，垂直无 padding */
+          const hPad = 4
+          const innerW = Math.max(0, bw - hPad * 2)
+          const innerH = Math.max(printFontSize, bh)
+          let tx = bx + hPad
+          if (align === 'center') tx = bx + bw / 2
+          else if (align === 'right') tx = bx + bw - hPad
+          const isDateTimeType = type === 'DATE' || type === 'TIME' || type === 'DURATION' || weekdayBar
+          const invertedStatic = invertedBar && !weekdayBar
+          const breakAll = shouldBreakAllTextWrap(type, invertedStatic)
+          const layoutBoxH = invertedBar ? bh : innerH
+          const baseLineHeight = invertedStatic
+            ? invertedStaticLineHeight(printFontSize)
+            : lineHeightForTextElement(printFontSize, isDateTimeType)
+          const { lines, drawFontSize } = resolveTextLinesForDraw(
+            ctx,
+            finalText,
+            innerW,
+            layoutBoxH,
+            printFontSize,
+            baseLineHeight,
+            config,
+            { breakAll, isDateTimeType },
+          )
+          ctx.setFontSize(drawFontSize)
+          applyCanvasFontFromConfig(ctx, config, drawFontSize)
+          const fontWeight = invertedBar && forPrint ? 'bold' : readCanvasFontWeight(config)
+          if (typeof anyCtx.setFontWeight === 'function') {
+            anyCtx.setFontWeight(fontWeight === 'bold' ? 'bold' : 'normal')
+          }
+          ctx.setTextAlign(align === 'center' ? 'center' : align === 'right' ? 'right' : 'left')
+          const fittedLineHeight =
+            isDateTimeType && !invertedBar && bh > 0
+              ? Math.min(
+                  invertedStatic
+                    ? invertedStaticLineHeight(drawFontSize)
+                    : lineHeightForTextElement(drawFontSize, isDateTimeType),
+                  bh,
+                )
+              : invertedStatic
+                ? invertedStaticLineHeight(drawFontSize)
+                : lineHeightForTextElement(drawFontSize, isDateTimeType)
+          const visibleLines = computeVisibleTextLines(
+            lines,
+            layoutBoxH,
+            fittedLineHeight,
+            drawFontSize,
+            isDateTimeType,
+          )
+          const verticalAlign = resolveDrawVerticalAlign(config, el, { invertedBar, weekdayBar })
+          const weekdayStrip = invertedBar && weekdayBar
+            ? layoutInvertedWeekdayStrip(by, bh, printFontSize, verticalAlign)
+            : null
+
+          if (weekdayStrip) {
+            ctx.setFillStyle('#000000')
+            ctx.fillRect(bx + hPad, weekdayStrip.stripTop, innerW, weekdayStrip.stripHeight)
+            ctx.setFillStyle('#ffffff')
+          } else if (invertedBar) {
+            ctx.setFillStyle('#000000')
+            /** 黑底铺满元素框（与 Web invert 控件视觉尺寸一致），避免只画文字行高导致「控件不完整」 */
+            ctx.fillRect(bx + hPad, by, innerW, bh)
+            ctx.setFillStyle('#ffffff')
+          } else {
+            ctx.setFillStyle(fillColor)
+          }
  
-      const text = previewTextForElement(el)
-      if (text && !isGraphicOnlyType(type)) {
-        const fontSize = readFontSize(config)
-        const color = readFillColor(config)
-        ctx.setFillStyle(color)
-        ctx.setFontSize(fontSize)
-        const fontWeight = String(config.fontWeight ?? config.FontWeight ?? 'normal').toLowerCase()
-        if (typeof (ctx as any).setFontWeight === 'function') {
-          ;(ctx as any).setFontWeight(fontWeight === 'bold' || fontWeight === '700' ? 'bold' : 'normal')
+          visibleLines.forEach((ln, li) => {
+            let textY: number
+            let baseline: 'middle' | 'alphabetic' = 'alphabetic'
+            if (weekdayStrip) {
+              textY = weekdayStrip.textY + li * weekdayStrip.stripHeight
+            } else {
+              const pos = computeLineDrawY(
+                by,
+                layoutBoxH,
+                li,
+                fittedLineHeight,
+                visibleLines.length,
+                drawFontSize,
+                verticalAlign,
+              )
+              textY = pos.y
+              baseline = pos.baseline
+            }
+            drawStyledTextLine(
+              ctx,
+              ln,
+              tx,
+              textY,
+              drawFontSize,
+              align,
+              config,
+              fillColor,
+              invertedBar && forPrint,
+              baseline,
+            )
+          })
+          if (typeof (ctx as any).setTextBaseline === 'function') {
+            ;(ctx as any).setTextBaseline('alphabetic')
+          }
+          ctx.setTextAlign('left')
+          if (typeof anyCtx.restore === 'function') anyCtx.restore()
+        }
+
+        if (rotationDegrees !== 0) {
+          const anyCtx = ctx as any
+          if (typeof anyCtx.save === 'function' && typeof anyCtx.rotate === 'function') {
+            const isQuarterTurn = rotationDegrees === -90 || rotationDegrees === 90
+            anyCtx.save()
+            anyCtx.translate(x + w / 2, y + h / 2)
+            anyCtx.rotate((rotationDegrees * Math.PI) / 180)
+            drawAt(
+              isQuarterTurn ? -h / 2 : -w / 2,
+              isQuarterTurn ? -w / 2 : -h / 2,
+              isQuarterTurn ? h : w,
+              isQuarterTurn ? w : h,
+            )
+            anyCtx.restore()
+          } else {
+            drawAt(x, y, w, h)
+          }
+        } else {
+          drawAt(x, y, w, h)
         }
-        const align = readTextAlign(config)
-        const pad = 2
-        const innerW = Math.max(0, w - pad * 2)
-        const innerH = Math.max(fontSize, h - pad * 2)
-        let tx = x + pad
-        if (align === 'center') tx = x + w / 2
-        else if (align === 'right') tx = x + w - pad
-        ctx.setTextAlign(align === 'center' ? 'center' : align === 'right' ? 'right' : 'left')
-        const lineHeight = fontSize + Math.max(2, Math.round(fontSize * 0.15))
-        const maxChars = maxCharsPerLine(innerW, fontSize)
-        const lines = wrapTextToWidth(text, maxChars)
-        const maxLines =
-          innerH >= fontSize ? Math.max(1, Math.floor(innerH / lineHeight)) : lines.length
-        const startY = y + pad + fontSize
-        lines.slice(0, maxLines).forEach((ln, li) => {
-          ctx.fillText(ln, tx, startY + li * lineHeight)
-        })
-        ctx.setTextAlign('left')
       }
  
-      next()
+      finishElement()
     }
  
     drawRest(0)
-  })
+      })
+  )
 }
  
 /**
@@ -683,7 +1433,7 @@ export function renderLabelPreviewCanvasToTempPathForPrint(
   layout: { cw: number, ch: number, outW: number, outH: number, scale: number }
 ): Promise<string> {
   const { cw, ch, outW, outH, scale } = layout
-  return runLabelPreviewCanvasDraw(canvasId, componentInstance, template, cw, ch, scale).then(
+  return runLabelPreviewCanvasDraw(canvasId, componentInstance, template, cw, ch, scale, { forPrint: true }).then(
     () =>
       new Promise<string>((resolve, reject) => {
         setTimeout(() => {
@@ -708,43 +1458,78 @@ export function renderLabelPreviewCanvasToTempPathForPrint(
   )
 }
  
+function countNonWhiteCanvasPixels (data: ArrayLike<number>, pixelCount: number): number {
+  let dark = 0
+  for (let i = 0; i < pixelCount; i++) {
+    const idx = i * 4
+    const red = Number(data[idx] ?? 255)
+    const green = Number(data[idx + 1] ?? 255)
+    const blue = Number(data[idx + 2] ?? 255)
+    const alpha = Number(data[idx + 3] ?? 255)
+    if (alpha > 0 && (red < 250 || green < 250 || blue < 250)) dark++
+  }
+  return dark
+}
+
+function captureLabelPreviewCanvasImageData (
+  canvasId: string,
+  componentInstance: any,
+  outW: number,
+  outH: number,
+  settleMs = 150,
+): Promise<RawImageDataSource> {
+  return new Promise<RawImageDataSource>((resolve, reject) => {
+    setTimeout(() => {
+      uni.canvasGetImageData(
+        {
+          canvasId,
+          x: 0,
+          y: 0,
+          width: outW,
+          height: outH,
+          success: (res: any) => {
+            resolve({
+              width: outW,
+              height: outH,
+              data: res.data,
+            })
+          },
+          fail: (err: any) => {
+            reject(new Error(err?.errMsg || 'canvasGetImageData for print failed'))
+          },
+        },
+        componentInstance,
+      )
+    }, settleMs)
+  })
+}
+
 /**
  * 与 `shouldRasterPrintViaCanvasImageData()` 配套：内置 UPOS 等机型不走 Bitmap int[]，与 Test Print 一致用 canvasGetImageData。
  */
-export function renderLabelPreviewCanvasImageDataForPrint(
+export async function renderLabelPreviewCanvasImageDataForPrint(
   canvasId: string,
   componentInstance: any,
   template: SystemLabelTemplate,
   layout: { cw: number, ch: number, outW: number, outH: number, scale: number }
 ): Promise<RawImageDataSource> {
   const { cw, ch, outW, outH, scale } = layout
-  return runLabelPreviewCanvasDraw(canvasId, componentInstance, template, cw, ch, scale).then(
-    () =>
-      new Promise<RawImageDataSource>((resolve, reject) => {
-        setTimeout(() => {
-          uni.canvasGetImageData(
-            {
-              canvasId,
-              x: 0,
-              y: 0,
-              width: outW,
-              height: outH,
-              success: (res: any) => {
-                resolve({
-                  width: outW,
-                  height: outH,
-                  data: res.data,
-                })
-              },
-              fail: (err: any) => {
-                reject(new Error(err?.errMsg || 'canvasGetImageData for print failed'))
-              },
-            },
-            componentInstance
-          )
-        }, 150)
-      })
-  )
+  const pixelCount = Math.max(1, outW * outH)
+
+  const drawAndCapture = async (settleMs: number) => {
+    await runLabelPreviewCanvasDraw(canvasId, componentInstance, template, cw, ch, scale, { forPrint: true })
+    return captureLabelPreviewCanvasImageData(canvasId, componentInstance, outW, outH, settleMs)
+  }
+
+  let imageData = await drawAndCapture(150)
+  if (countNonWhiteCanvasPixels(imageData.data, pixelCount) <= 0) {
+    await settleAfterLabelCanvasResize()
+    imageData = await drawAndCapture(220)
+  }
+  if (countNonWhiteCanvasPixels(imageData.data, pixelCount) <= 0) {
+    throw new Error(`CANVAS_RASTER_EMPTY:size=${outW}x${outH}`)
+  }
+  return imageData
 }
  
 /**
@@ -767,15 +1552,8 @@ export function getLabelPrintRasterLayout(
   template: SystemLabelTemplate,
   maxWidthDots: number,
   printDpi = 203,
-  opts?: { contentHeightPx?: number },
 ): { cw: number, ch: number, outW: number, outH: number, scale: number } {
-  const unit = template.unit || 'inch'
-  const cw = Math.max(40, Math.round(toCanvasPx(Number(template.width) || 2, unit)))
-  const fullH = Math.max(40, Math.round(toCanvasPx(Number(template.height) || 2, unit)))
-  const ch =
-    opts?.contentHeightPx != null && opts.contentHeightPx > 0
-      ? Math.max(40, Math.round(opts.contentHeightPx))
-      : fullH
+  const { cw, ch } = resolveLabelDesignCanvasPx(template)
   const designDpi = 96
   const idealW = Math.round(cw * (printDpi / designDpi))
   const cap = Math.max(8, Math.round(maxWidthDots || 576))
@@ -791,9 +1569,7 @@ export function getPreviewCanvasCssSize(template: SystemLabelTemplate, maxDispla
   width: number
   height: number
 } {
-  const unit = template.unit || 'inch'
-  const cw = Math.max(40, Math.round(toCanvasPx(Number(template.width) || 2, unit)))
-  const ch = Math.max(40, Math.round(toCanvasPx(Number(template.height) || 2, unit)))
+  const { cw, ch } = resolveLabelDesignCanvasPx(template)
   const scale = Math.min(1, maxDisplayWidthPx / cw)
   return {
     width: Math.max(1, Math.round(cw * scale)),
+/**
+ * US Nutrition Facts 面板布局（与 Web src/lib/nutritionFactsLayout.ts 保持一致）
+ */
+export type NutritionDivider = 'none' | 'thin' | 'double'
+
+export type NutritionLayoutRowDef = {
+  key: string
+  label: string
+  defaultUnit: string
+  labelBold?: boolean
+  indent?: boolean
+  dividerAfter?: NutritionDivider
+}
+
+export const NUTRITION_FACTS_LAYOUT_ROWS: readonly NutritionLayoutRowDef[] = [
+  { key: 'fat', label: 'Total Fat', defaultUnit: 'g', labelBold: true, dividerAfter: 'double' },
+  { key: 'transFat', label: 'Trans Fat', defaultUnit: 'g', dividerAfter: 'thin' },
+  { key: 'cholesterol', label: 'Cholesterol', defaultUnit: 'mg', labelBold: true, dividerAfter: 'double' },
+  { key: 'sodium', label: 'Sodium', defaultUnit: 'mg', labelBold: true, dividerAfter: 'double' },
+  { key: 'carbs', label: 'Total Carbo.', defaultUnit: 'g', labelBold: true, dividerAfter: 'double' },
+  { key: 'totalSugar', label: 'Sugars', defaultUnit: 'g', dividerAfter: 'thin' },
+  { key: 'dietaryFiber', label: 'Dietary Fiber', defaultUnit: 'g', dividerAfter: 'thin' },
+  { key: 'protein', label: 'Protein', defaultUnit: 'g', labelBold: true, dividerAfter: 'double' },
+  { key: 'calcium', label: 'Calcium', defaultUnit: 'mg', dividerAfter: 'thin' },
+  { key: 'potassium', label: 'Potassium', defaultUnit: 'mg', dividerAfter: 'thin' },
+  { key: 'vitaminA', label: 'Vitamin A', defaultUnit: 'mg', dividerAfter: 'thin' },
+  { key: 'vitaminD', label: 'Vitamin D', defaultUnit: 'mg', dividerAfter: 'thin' },
+  { key: 'iron', label: 'Iron', defaultUnit: 'mg', dividerAfter: 'none' },
+] as const
+
+export const DEFAULT_NUTRITION_FOOTER_NOTE =
+  '* Percent Daily Values are based on a 2000 calorie diet'
+
+/** 与 Web src/lib/nutritionFactsLayout.ts 一致 */
+export const NUTRITION_AMOUNT_COL_WIDTH = 64
+export const NUTRITION_PCT_COL_WIDTH = 44
+export const NUTRITION_BODY_FONT_SIZE = 12
+
+export type NutritionFactsRowView = {
+  key: string
+  label: string
+  amountText: string
+  dailyValueText: string
+  labelBold: boolean
+  indent: boolean
+  dividerAfter: NutritionDivider
+}
+
+export type NutritionFactsViewModel = {
+  titleFontSize: number
+  servingsLabel: string
+  servingsValue: string
+  servingSizeLabel: string
+  servingSizeValue: string
+  caloriesLabel: string
+  caloriesValue: string
+  caloriesAmountText: string
+  rows: NutritionFactsRowView[]
+  footerNote: string
+  ingredientsText: string
+}
+
+function cfgStr(cfg: Record<string, unknown>, keys: string[], fallback = ''): string {
+  for (const k of keys) {
+    const v = cfg[k]
+    if (v != null && String(v).trim() !== '') return String(v).trim()
+  }
+  return fallback
+}
+
+function cfgBool(cfg: Record<string, unknown>, keys: string[]): boolean {
+  for (const k of keys) {
+    const v = cfg[k]
+    if (v === true || v === 'true' || v === 1 || v === '1') return true
+    if (v === false || v === 'false' || v === 0 || v === '0') return false
+  }
+  return false
+}
+
+function fixedRows(cfg: Record<string, unknown>): Record<string, unknown>[] {
+  return Array.isArray(cfg.fixedNutrients) ? (cfg.fixedNutrients as Record<string, unknown>[]) : []
+}
+
+function rowFromFixed(cfg: Record<string, unknown>, key: string): Record<string, unknown> | undefined {
+  return fixedRows(cfg).find((r) => String(r.key ?? '').trim() === key)
+}
+
+export function readNutritionLessThan(cfg: Record<string, unknown>, key: string): boolean {
+  const row = rowFromFixed(cfg, key)
+  if (row && row.lessThan != null) return cfgBool({ lessThan: row.lessThan }, ['lessThan'])
+  return cfgBool(cfg, [`${key}LessThan`, `${key}UseLessThan`])
+}
+
+export function nutritionFixedField(
+  cfg: Record<string, unknown>,
+  key: string,
+  field: 'value' | 'unit' | 'dailyValuePercent',
+): string {
+  const row = rowFromFixed(cfg, key)
+  if (field === 'dailyValuePercent') {
+    const fromRow = row?.dailyValuePercent ?? row?.percent ?? row?.Percent
+    if (fromRow != null && String(fromRow).trim() !== '') return String(fromRow).trim()
+    return cfgStr(cfg, [`${key}Percent`, `${key}DailyValue`, `${key}DailyValuePercent`], '')
+  }
+  if (field === 'unit') {
+    const fromRow = row?.unit
+    if (fromRow != null && String(fromRow).trim() !== '') return String(fromRow).trim()
+    const def = NUTRITION_FACTS_LAYOUT_ROWS.find((r) => r.key === key)
+    return cfgStr(cfg, [`${key}Unit`], def?.defaultUnit ?? '')
+  }
+  const fromRow = row?.value
+  if (fromRow != null && String(fromRow).trim() !== '') return String(fromRow).trim()
+  return cfgStr(cfg, [key, key.charAt(0).toUpperCase() + key.slice(1)], '')
+}
+
+export function formatNutritionAmount(
+  value: string,
+  _unit?: string,
+  lessThan?: boolean,
+): string {
+  const v = String(value ?? '').trim()
+  if (!v) return ''
+  const prefix = lessThan ? '<' : ''
+  return `${prefix}${v}`
+}
+
+export function formatNutritionDailyValue(raw: string): string {
+  const v = String(raw ?? '').trim()
+  if (!v) return ''
+  return v.endsWith('%') ? v : `${v}%`
+}
+
+function nutritionExtraRows(cfg: Record<string, unknown>): Array<{ id: string; name: string; value: string; unit: string }> {
+  const raw = cfg.extraNutrients
+  if (!Array.isArray(raw)) return []
+  return raw.map((item, idx) => {
+    const row = item as Record<string, unknown>
+    return {
+      id: String(row.id ?? `extra-${idx}`),
+      name: String(row.name ?? ''),
+      value: String(row.value ?? ''),
+      unit: String(row.unit ?? ''),
+    }
+  })
+}
+
+export function buildNutritionFactsViewModel(cfg: Record<string, unknown>): NutritionFactsViewModel {
+  const titleFontSize = Number(cfg.nutritionTitleFontSize ?? cfg.NutritionTitleFontSize ?? 16) || 16
+  const servingsValue = cfgStr(cfg, ['servings', 'servingsPerContainer', 'ServingsPerContainer'])
+  const servingSizeValue = cfgStr(cfg, ['servingSize', 'ServingSize'])
+  const caloriesRaw = nutritionFixedField(cfg, 'calories', 'value') || cfgStr(cfg, ['calories', 'Calories'])
+  const caloriesLessThan = readNutritionLessThan(cfg, 'calories')
+  const layoutByKey = new Map(NUTRITION_FACTS_LAYOUT_ROWS.map((r) => [r.key, r]))
+  const rows: NutritionFactsRowView[] = []
+  const seen = new Set<string>()
+
+  for (const def of NUTRITION_FACTS_LAYOUT_ROWS) {
+    seen.add(def.key)
+    const value = nutritionFixedField(cfg, def.key, 'value')
+    const lessThan = readNutritionLessThan(cfg, def.key)
+    const pct = nutritionFixedField(cfg, def.key, 'dailyValuePercent')
+    rows.push({
+      key: def.key,
+      label: String(rowFromFixed(cfg, def.key)?.label ?? def.label),
+      amountText: formatNutritionAmount(value, '', lessThan),
+      dailyValueText: formatNutritionDailyValue(pct),
+      labelBold: def.labelBold ?? false,
+      indent: def.indent ?? false,
+      dividerAfter: def.dividerAfter ?? 'none',
+    })
+  }
+
+  for (const ex of nutritionExtraRows(cfg)) {
+    const key = `extra:${ex.id}`
+    if (seen.has(key)) continue
+    const lessThan = cfgBool(cfg, [`extra:${ex.id}:lessThan`])
+    rows.push({
+      key,
+      label: ex.name.trim() || 'Other',
+      amountText: formatNutritionAmount(ex.value, '', lessThan),
+      dailyValueText: formatNutritionDailyValue(
+        cfgStr(cfg, [`extra:${ex.id}:percent`, `extra:${ex.id}:dailyValuePercent`]),
+      ),
+      labelBold: false,
+      indent: false,
+      dividerAfter: 'thin',
+    })
+  }
+
+  for (const fr of fixedRows(cfg)) {
+    const key = String(fr.key ?? '').trim()
+    if (!key || seen.has(key)) continue
+    const def = layoutByKey.get(key)
+    const value = String(fr.value ?? '').trim()
+    const lessThan = cfgBool({ lessThan: fr.lessThan }, ['lessThan'])
+    rows.push({
+      key,
+      label: String(fr.label ?? def?.label ?? key),
+      amountText: formatNutritionAmount(value, '', lessThan),
+      dailyValueText: formatNutritionDailyValue(String(fr.dailyValuePercent ?? fr.percent ?? '')),
+      labelBold: def?.labelBold ?? false,
+      indent: def?.indent ?? false,
+      dividerAfter: def?.dividerAfter ?? 'thin',
+    })
+  }
+
+  return {
+    titleFontSize,
+    servingsLabel: cfgStr(cfg, ['servingsLabel'], 'Servings'),
+    servingsValue,
+    servingSizeLabel: cfgStr(cfg, ['servingSizeLabel'], 'Serve size'),
+    servingSizeValue,
+    caloriesLabel: cfgStr(cfg, ['caloriesLabel'], 'Calories'),
+    caloriesValue: caloriesRaw,
+    caloriesAmountText: formatNutritionAmount(caloriesRaw, '', caloriesLessThan),
+    rows,
+    footerNote: cfgStr(cfg, ['nutritionFooterNote', 'footerNote'], DEFAULT_NUTRITION_FOOTER_NOTE),
+    ingredientsText: cfgStr(cfg, ['ingredientsText', 'ingredients', 'IngredientsText']),
+  }
+}
@@ -6,6 +6,7 @@ import {
   fetchUsAppPrintLogList,
   prefetchUsAppLabelPreviewsForLocation,
 } from '../services/usAppLabeling'
+import type { UsAppLabelCategoryTreeNodeDto } from '../types/usAppLabeling'
 import { fetchGlobalSupportContact } from '../services/locationSupport'
 import {
   getAccessToken,
@@ -84,6 +85,19 @@ function setLastSyncExecutionDetail(detail: OfflineSyncExecutionDetail): void {
   uni.setStorageSync(KEY_LAST_SYNC_EXECUTION, JSON.stringify(detail))
 }
  
+/** 后台预拉标签 preview（不阻塞登录/同步 UI） */
+async function prefetchLabelPreviewsInBackground(
+  tasks: Array<{ locId: string; tree: UsAppLabelCategoryTreeNodeDto[] }>,
+): Promise<void> {
+  for (const { locId, tree } of tasks) {
+    try {
+      await prefetchUsAppLabelPreviewsForLocation(locId, tree)
+    } catch {
+      // 单店失败不阻断其余门店
+    }
+  }
+}
+
 export async function performInitialOfflineSync(): Promise<void> {
   await initOfflineSqlite()
   const online = await isNetworkOnline()
@@ -102,6 +116,7 @@ export async function performInitialOfflineSync(): Promise&lt;void&gt; {
       [currentStoreId, ...locations.map((x) => x.id).filter(Boolean)].filter((x) => !!String(x).trim())
     )
   )
+  const previewPrefetchTasks: Array<{ locId: string; tree: UsAppLabelCategoryTreeNodeDto[] }> = []
   for (const locId of targetLocationIds) {
     // 每个门店一组缓存，确保离线切店后仍有可读数据
     const [, treeResult] = await Promise.allSettled([
@@ -110,7 +125,7 @@ export async function performInitialOfflineSync(): Promise&lt;void&gt; {
       fetchUsAppPrintLogList({ locationId: locId, skipCount: 1, maxResultCount: 20 }),
     ])
     if (treeResult.status === 'fulfilled' && Array.isArray(treeResult.value)) {
-      await prefetchUsAppLabelPreviewsForLocation(locId, treeResult.value)
+      previewPrefetchTasks.push({ locId, tree: treeResult.value })
     }
   }
   await Promise.allSettled([
@@ -133,6 +148,11 @@ export async function performInitialOfflineSync(): Promise&lt;void&gt; {
   }
  
   setLastSyncAt(Date.now())
+
+  // 预览接口仅用于离线缓存，逐条 POST 成本高；放后台预拉，避免阻塞登录/手动同步
+  if (previewPrefetchTasks.length > 0) {
+    void prefetchLabelPreviewsInBackground(previewPrefetchTasks)
+  }
 }
  
 export async function flushPendingMutations(): Promise<number> {
 /**
- * 部分标签机 BLE 串口：GATT 同时声明 write / writeNoResponse，但数据口实际只接受 Write Command（无响应）。
- * 用默认「带响应写」时常见首包过、第二包起 writeBLECharacteristicValue:fail property not support (10007)。
- * printerManager 在「同时声明两种属性」时对本白名单 UUID 优先选 writeNoResponse；若系统只暴露 write，则绝不强行 Command 写（否则 10007）。
- * sendViaBle 在已选无响应写仍 10007 时，对白名单禁止翻到带响应写（避免佳博长任务第二包必挂）。
+ * 佳博 GP-D320FX 等 Nordic UART 数据口：实机必须 writeNoResponse 才能稳定长任务下发。
+ * 安卓 GATT 常只声明 write，若按 GATT 走带响应写，可能首包或跑十几包后 10007 property not support。
+ * 白名单 UUID 连接/打印时一律优先 writeNoResponse；首包仍 10007 时才允许试一次带响应写。
+ * 已用 writeNoResponse 跑通后禁止切回带响应写。
  */
  
 export function normalizeBleUuid (uuid: string): string {
@@ -11,16 +11,25 @@ export function normalizeBleUuid (uuid: string): string {
  
 /** serviceUuid + characteristicUuid（无横线小写） */
 const FORCE_WRITE_NO_RESPONSE: Array<{ service: string; characteristic: string }> = [
-  /** 佳博 GP-D320FX 等常见 Nordic UART 风格串口（与你机子日志一致） */
+  /** 佳博 GP-D320FX 等 Silicon Labs / 旧 Nordic UART */
   {
     service: '49535343fe7d4ae58fa99fafd205e455',
     characteristic: '49535343884143f4a8d4ecbe34729bb3',
   },
+  /** 标准 Nordic UART (NUS) */
+  {
+    service: '6e400001b5a3f393e0a9e50e24dcca9e',
+    characteristic: '6e400002b5a3f393e0a9e50e24dcca9e',
+  },
 ]
  
+const NORDIC_UART_SERVICE_IDS = new Set(
+  FORCE_WRITE_NO_RESPONSE.map((p) => p.service),
+)
+
 export function blePairRequiresWriteNoResponse (
   serviceId: string,
-  characteristicId: string
+  characteristicId: string,
 ): boolean {
   const s = normalizeBleUuid(serviceId)
   const c = normalizeBleUuid(characteristicId)
@@ -29,6 +38,5 @@ export function blePairRequiresWriteNoResponse (
  
 /** 是否为本仓库维护的 Nordic UART 风格串口服务（需写前开 notify、分包间留间隔等） */
 export function isNordicUartStyleBleService (serviceId: string): boolean {
-  const s = normalizeBleUuid(serviceId)
-  return FORCE_WRITE_NO_RESPONSE.some((p) => p.service === s)
+  return NORDIC_UART_SERVICE_IDS.has(normalizeBleUuid(serviceId))
 }
-/** 扫描/配对列表仅展示以下蓝牙名称（大小写不敏感，须完整匹配） */
+/** 扫描/配对列表仅展示以下蓝牙名称（大小写不敏感；支持完整匹配或关键字包含） */
 export const ALLOWED_BLUETOOTH_PRINTER_NAMES = [
   'GP-D320FX-spp_A7FO',
   'Virtual BT Printer',
@@ -8,6 +8,13 @@ const ALLOWED_BLUETOOTH_PRINTER_NAME_SET = new Set(
   ALLOWED_BLUETOOTH_PRINTER_NAMES.map((name) => name.toLowerCase()),
 )
  
+/** 名称包含以下片段也视为允许（兼容系统配对名略有差异） */
+const ALLOWED_BLUETOOTH_PRINTER_NAME_FRAGMENTS = [
+  'virtual bt',
+  'gp-d320fx',
+  'd320fx',
+] as const
+
 export function normalizeBluetoothPrinterName (name: string | undefined | null): string {
   return String(name ?? '').trim()
 }
@@ -16,7 +23,9 @@ export function normalizeBluetoothPrinterName (name: string | undefined | null):
 export function isAllowedBluetoothPrinterName (name: string | undefined | null): boolean {
   const normalized = normalizeBluetoothPrinterName(name)
   if (!normalized) return false
-  return ALLOWED_BLUETOOTH_PRINTER_NAME_SET.has(normalized.toLowerCase())
+  const lower = normalized.toLowerCase()
+  if (ALLOWED_BLUETOOTH_PRINTER_NAME_SET.has(lower)) return true
+  return ALLOWED_BLUETOOTH_PRINTER_NAME_FRAGMENTS.some((frag) => lower.includes(frag))
 }
  
 /** 一体机虚拟蓝牙名（走整页光栅与预览一致，不走 native printTemplate） */
@@ -80,6 +80,24 @@ function isConnectionStateConnected (state) {
   return String(state || '').trim().toLowerCase() === 'connected'
 }
  
+function getClassicBondState (device) {
+  // #ifdef APP-PLUS
+  try {
+    const state = invoke(device, 'getBondState')
+    return typeof state === 'number' ? state : Number(state)
+  } catch (_) {
+    return null
+  }
+  // #endif
+  return null
+}
+
+function isClassicBonded (device) {
+  const state = getClassicBondState(device)
+  if (state == null || Number.isNaN(state)) return true
+  return state === 12
+}
+
 function runOnUiThread (fn) {
   // #ifdef APP-PLUS
   try {
@@ -380,8 +398,9 @@ var blueToothTool = {
       callback && callback(false)
       return false
     }
+    let device = null
     try {
-      let device = invoke(btAdapter, 'getRemoteDevice', address)
+      device = invoke(btAdapter, 'getRemoteDevice', address)
       const candidates = createSocketCandidates(device)
       let socket = null
       let lastError = null
@@ -415,6 +434,9 @@ var blueToothTool = {
  
     try {
       invoke(btSocket, 'connect')
+      if (!isClassicBonded(device)) {
+        throw new Error('Bluetooth PIN or pairing key is incorrect')
+      }
       const streamReady = this.readData()
       if (!streamReady) {
         throw new Error(this.state.lastError || 'Bluetooth output stream not ready')
@@ -2,6 +2,47 @@ import type { MonochromeImageData, PrintImageOptions, PrinterDriver, RawImageDat
 import { printRunDiag } from './printRunDiagnostics'
  
 const DEFAULT_IMAGE_THRESHOLD = 180
+/** 黑底白字标签：提高阈值保留更多白字像素，减轻抗锯齿边缘被二值化成黑 */
+export const INVERTED_TEXT_IMAGE_THRESHOLD = 205
+
+/**
+ * 仅对「深陷黑块内的白字」做 1px 白膨胀，避免热敏渗墨吞字；不影响普通黑字白底。
+ */
+export function sharpenInvertedTextInMonochromeRaster (
+  image: MonochromeImageData,
+): MonochromeImageData {
+  const { width, height, pixels } = image
+  if (!width || !height || !pixels?.length) return image
+  const next = pixels.slice()
+
+  for (let y = 0; y < height; y++) {
+    for (let x = 0; x < width; x++) {
+      const idx = y * width + x
+      if (pixels[idx] !== 0) continue
+
+      let blackNeighbors = 0
+      for (let dy = -1; dy <= 1; dy++) {
+        for (let dx = -1; dx <= 1; dx++) {
+          if (dx === 0 && dy === 0) continue
+          const nx = x + dx
+          const ny = y + dy
+          if (nx < 0 || ny < 0 || nx >= width || ny >= height) continue
+          if (pixels[ny * width + nx]) blackNeighbors++
+        }
+      }
+      if (blackNeighbors < 5) continue
+
+      for (const [dx, dy] of [[-1, 0], [1, 0], [0, -1], [0, 1]] as const) {
+        const nx = x + dx
+        const ny = y + dy
+        if (nx < 0 || ny < 0 || nx >= width || ny >= height) continue
+        if (pixels[ny * width + nx]) next[ny * width + nx] = 0
+      }
+    }
+  }
+
+  return { width, height, pixels: next }
+}
  
 /** 去掉位图底部全白行（内置 ESC 光栅按图像高度走纸，否则会拖很长空白） */
 export function trimMonochromeImageBottomWhitespace (
-import { blePairRequiresWriteNoResponse } from '../bleWriteModeRules'
 import {
   clearPrinter,
+  discoverBleWriteCharacteristic,
   ensureBleUartNotifyIfNeeded,
   getBluetoothConnection,
   getCurrentPrinterDriverKey,
   getPrinterType,
   getStoredUposPrintOptions,
   isNativeBaseClassicBluetoothTransport,
+  isVirtualBtBluetoothConnection,
   sendToPrinter,
   setBluetoothConnection,
   setBuiltinPrinter,
 } from '../printerConnection'
 // @ts-ignore - js bridge module (app-plus only)
 import classicBluetooth from '../bluetoothTool.js'
-import { rasterizeImageData, rasterizeImageForPrinter, trimMonochromeImageBottomWhitespace } from '../imageRaster'
+import { rasterizeImageData, rasterizeImageForPrinter, trimMonochromeImageBottomWhitespace, sharpenInvertedTextInMonochromeRaster, INVERTED_TEXT_IMAGE_THRESHOLD } from '../imageRaster'
 import { buildEscPosImageData, buildEscPosTemplateData } from '../protocols/escPosBuilder'
 import { buildTscImageData, buildTscTemplateData } from '../protocols/tscProtocol'
 import type { LabelPrintJobPayload } from '../../labelPreview/buildLabelPrintPayload'
@@ -32,12 +33,13 @@ import {
 } from '../../labelPreview/renderLabelPreviewCanvas'
 import {
   ensureTemplateHeightCoversElements,
-  templateContentHeightPx,
-  templateSizeToMillimeters,
+  rasterDotsToMillimeters,
 } from '../templatePhysicalMm'
 import { storedValueLooksLikeImagePath } from '../../resolveMediaUrl'
 import { printRunDiag } from '../printRunDiagnostics'
 import { adaptSystemLabelTemplate } from '../systemTemplateAdapter'
+import { templateRequiresCanvasStyleFidelity } from '../nativeTemplateElementSupport'
+import { templateHasInvertedTextElements } from '../../invertColorsConfig'
 import { hydrateSystemTemplateImagesForPrint } from '../hydrateTemplateImagesForPrint'
 import { TEST_PRINT_SYSTEM_TEMPLATE, TEST_PRINT_TEMPLATE_DATA } from '../templates/testPrintTemplate'
 import { describePrinterCandidate, getPrinterDriverByKey, resolvePrinterDriver } from './driverRegistry'
@@ -97,14 +99,6 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
         }
         classicBluetooth.connDevice(device.deviceId, (ok: boolean) => {
           if (ok) {
-            setBluetoothConnection({
-              deviceId: device.deviceId,
-              deviceName: device.name || 'Bluetooth Printer',
-              deviceType: 'classic',
-              transportMode: 'generic',
-              driverKey: driver.key,
-              mtu: driver.preferredBleMtu || 20,
-            })
             /**
              * connDevice 回调 ok 可能早于 socket/outputStream 就绪；
              * 若立刻测试打印，会出现 state=idle、outputReady=false。
@@ -116,10 +110,19 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
                 : null
               const ready = !!st?.outputReady && (!!st?.socketConnected || String(st?.connectionState || '').toLowerCase() === 'connected')
               if (ready) {
+                setBluetoothConnection({
+                  deviceId: device.deviceId,
+                  deviceName: device.name || 'Bluetooth Printer',
+                  deviceType: 'classic',
+                  transportMode: 'generic',
+                  driverKey: driver.key,
+                  mtu: driver.preferredBleMtu || 20,
+                })
                 resolve()
                 return
               }
               if (Date.now() - start > 2500) {
+                clearPrinter()
                 reject(new Error('Classic Bluetooth connection is not ready'))
                 return
               }
@@ -131,9 +134,11 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
           const message = typeof classicBluetooth.getLastError === 'function'
             ? classicBluetooth.getLastError()
             : ''
+          clearPrinter()
           reject(new Error(message || 'Classic Bluetooth connection failed.'))
         })
       } catch (error: any) {
+        clearPrinter()
         reject(error instanceof Error ? error : new Error(String(error || 'Classic Bluetooth connection failed.')))
       }
     }
@@ -173,93 +178,6 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
   })
 }
  
-/**
- * 优先带响应 write（与 uni 默认写入方式一致）；仅当没有 write 再用 writeNoResponse（需在下发时传 writeType）。
- * 若系统 GATT 只声明 write、未声明 writeNoResponse，却强行 writeNoResponse，会报 property not support (10007)。
- */
-function hasBleWriteProperty (item: any): boolean {
-  const w = item.properties?.write
-  return w === true || w === 'true'
-}
-
-function hasBleWriteNoResponseProperty (item: any): boolean {
-  const p = item.properties || {}
-  return (
-    p.writeNoResponse === true ||
-    p.writeNoResponse === 'true' ||
-    p.writeWithoutResponse === true ||
-    p.writeWithoutResponse === 'true'
-  )
-}
-
-/**
- * 无 writeNoResponse 属性则绝不走 Command 写。
- * Nordic 白名单在「同时声明 write + writeNoResponse」时优先无响应写（佳博等实测）；否则有 write 时优先带响应。
- */
-function pickBleWriteUsesNoResponse (serviceId: string, item: any): boolean {
-  const hw = hasBleWriteProperty(item)
-  const hn = hasBleWriteNoResponseProperty(item)
-  if (!hn) return false
-  if (!hw) return true
-  return blePairRequiresWriteNoResponse(serviceId, String(item.uuid || ''))
-}
-
-function findBleWriteCharacteristic (deviceId: string): Promise<{
-  serviceId: string
-  characteristicId: string
-  bleWriteUsesNoResponse: boolean
-} | null> {
-  return new Promise((resolve) => {
-    uni.getBLEDeviceServices({
-      deviceId,
-      success: (serviceRes) => {
-        const services = serviceRes.services || []
-        const next = (index: number) => {
-          if (index >= services.length) {
-            resolve(null)
-            return
-          }
-          const serviceId = services[index].uuid
-          uni.getBLEDeviceCharacteristics({
-            deviceId,
-            serviceId,
-            success: (charRes) => {
-              const chars = charRes.characteristics || []
-              const writable = (item: any) => hasBleWriteProperty(item) || hasBleWriteNoResponseProperty(item)
-              for (const item of chars) {
-                const cid = String(item.uuid || '')
-                if (blePairRequiresWriteNoResponse(serviceId, cid) && writable(item)) {
-                  resolve({
-                    serviceId,
-                    characteristicId: cid,
-                    bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, item),
-                  })
-                  return
-                }
-              }
-              const withResp = chars.find(hasBleWriteProperty)
-              const noResp = chars.find(hasBleWriteNoResponseProperty)
-              const target = withResp || noResp
-              if (target) {
-                resolve({
-                  serviceId,
-                  characteristicId: String(target.uuid || ''),
-                  bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, target),
-                })
-                return
-              }
-              next(index + 1)
-            },
-            fail: () => next(index + 1),
-          })
-        }
-        next(0)
-      },
-      fail: () => resolve(null),
-    })
-  })
-}
-
 function requestBleMtu (deviceId: string, preferredMtu: number): Promise<number> {
   return new Promise((resolve) => {
     const targetMtu = Math.max(20, Math.min(512, Math.round(preferredMtu || 20)))
@@ -286,7 +204,7 @@ function requestBleMtu (deviceId: string, preferredMtu: number): Promise&lt;number&gt;
  
 function connectBlePrinter (device: PrinterCandidate, driver: PrinterDriver): Promise<void> {
   const finalizeExistingBleConnection = async () => {
-    const write = await findBleWriteCharacteristic(device.deviceId)
+    const write = await discoverBleWriteCharacteristic(device.deviceId)
     if (!write) {
       throw new Error('No writable characteristic found. This device may not support printing.')
     }
@@ -329,21 +247,26 @@ function connectBlePrinter (device: PrinterCandidate, driver: PrinterDriver): Pr
  
 export async function connectBluetoothPrinter (device: PrinterCandidate): Promise<PrinterDriver> {
   const driver = resolvePrinterDriver(device)
-  if (driver.key === 'gp-d320fx') {
-    try {
-      await connectBlePrinter(device, driver)
-    } catch (_) {
+  try {
+    if (driver.key === 'gp-d320fx') {
+      try {
+        await connectBlePrinter(device, driver)
+      } catch (_) {
+        await connectClassicBluetooth(device, driver)
+      }
+      return driver
+    }
+    const resolvedType = driver.resolveConnectionType(device)
+    if (resolvedType === 'classic') {
       await connectClassicBluetooth(device, driver)
+    } else {
+      await connectBlePrinter(device, driver)
     }
     return driver
+  } catch (error) {
+    clearPrinter()
+    throw error
   }
-  const resolvedType = driver.resolveConnectionType(device)
-  if (resolvedType === 'classic') {
-    await connectClassicBluetooth(device, driver)
-  } else {
-    await connectBlePrinter(device, driver)
-  }
-  return driver
 }
  
 export function useBuiltinPrinter (driverKey = 'generic-tsc') {
@@ -469,11 +392,15 @@ export function canPrintCurrentLabelViaNativeFastJob (): boolean {
  
 /**
  * 整页标签光栅是否一律走 canvasGetImageData（纯 JS 二值化），而不用「PNG → Bitmap.getPixels → readJavaIntArrayValue」。
- * 内置 UPOS 一体机在部分 Uni 基座上 int[] 桥接读数恒为 0 → black=0、长时间重试/超时；所有 **打印机类型选内置** 的机型统一走本路径。
- * 若以后需按 Android 型号再细分，只改此函数即可。
+ * - 内置 / Virtual BT：一体机 Bitmap int[] 桥接读数恒为 0
+ * - 纯蓝牙 BLE（如 GP-D320FX-ble）：手机基座 strip getPixels 同样全白 → RASTER_EMPTY_IMAGE
  */
 export function shouldRasterPrintViaCanvasImageData (): boolean {
-  return getPrinterType() === 'builtin'
+  if (getPrinterType() === 'builtin') return true
+  if (isVirtualBtBluetoothConnection()) return true
+  const conn = getBluetoothConnection()
+  if (conn?.deviceType === 'ble') return true
+  return false
 }
  
 /**
@@ -702,10 +629,15 @@ export async function printLabelForCurrentPrinter (
 }
  
 /**
- * 界面仍可存 generic-tsc；内置 UPOS 实际需 ESC/POS 位图，故整页光栅强制 generic-esc（与预览像素一致，避免 TSPL 当文本打出）。
+ * 界面仍可存 generic-tsc；内置 UPOS（rk3568 等）实际需 ESC/POS 位图。
+ * D320FAX Virtual BT 佳博 SDK 连接为 TSC 模式，禁止转 ESC，否则 write 成功但不出纸。
  */
 export function resolveRasterPrintDriver (driver: PrinterDriver): PrinterDriver {
-  if (getPrinterType() === 'builtin' && driver.protocol === 'tsc') {
+  const useEscRaster =
+    getPrinterType() === 'builtin'
+    && !isVirtualBtBluetoothConnection()
+    && driver.protocol === 'tsc'
+  if (useEscRaster) {
     return getPrinterDriverByKey('generic-esc')
   }
   return driver
@@ -859,7 +791,7 @@ export async function printImageForCurrentPrinter (
     }
   }
  
-  const rasterForPrint = finalizeRasterForEscPrint(raster, rasterDriver.protocol, options)
+  const rasterForPrint = finalizeRasterForPrint(raster, rasterDriver.protocol, options)
   let data: number[] = []
   if (rasterDriver.protocol === 'esc') {
     data = buildEscPosImageData(rasterForPrint, options)
@@ -936,6 +868,7 @@ export async function printImageForCurrentPrinter (
     }
   } else {
     try {
+      const sendStageMs = isVirtualBtBluetoothConnection() ? 600000 : 180000
       await withStageTimeout(
         sendToPrinter(data, (p) => {
           lastExternalProgressAt = Date.now()
@@ -944,7 +877,7 @@ export async function printImageForCurrentPrinter (
             printRunDiag('printImage_send_progress', { p })
           }
         }),
-        180000,
+        sendStageMs,
         'sendToPrinter'
       )
     } finally {
@@ -972,12 +905,37 @@ export async function printImageDataForCurrentPrinter (
   const driver = getCurrentPrinterDriver()
   const rasterDriver = resolveRasterPrintDriver(driver)
   let raster = rasterizeImageData(imageData, options)
-  raster = finalizeRasterForEscPrint(raster, rasterDriver.protocol, options)
-  if (onProgress) onProgress(5)
+  raster = finalizeRasterForPrint(raster, rasterDriver.protocol, options)
+  if (onProgress) onProgress(18)
   const data = rasterDriver.protocol === 'esc'
     ? buildEscPosImageData(raster, options)
     : buildTscImageData(raster, options, rasterDriver.imageDpi || 203)
-  await sendToPrinter(data, onProgress)
+  let sendVisual = 22
+  let lastExternalAt = Date.now()
+  const reportSend = (p: number) => {
+    if (!onProgress) return
+    const mapped = 22 + Math.round((Math.min(100, Math.max(0, p)) / 100) * 78)
+    if (mapped > sendVisual) {
+      sendVisual = mapped
+      onProgress(sendVisual)
+    } else {
+      lastExternalAt = Date.now()
+    }
+  }
+  const keepAlive = onProgress
+    ? setInterval(() => {
+        if (Date.now() - lastExternalAt < 1200) return
+        if (sendVisual >= 96) return
+        sendVisual += sendVisual < 80 ? 2 : 1
+        onProgress(sendVisual)
+      }, 800)
+    : null
+  try {
+    await sendToPrinter(data, reportSend)
+  } finally {
+    if (keepAlive) clearInterval(keepAlive)
+  }
+  if (onProgress) onProgress(100)
   return driver
 }
  
@@ -1022,6 +980,33 @@ function finalizeRasterForEscPrint (
   return trimMonochromeImageBottomWhitespace(raster, 8)
 }
  
+function finalizeRasterForPrint (
+  raster: { width: number; height: number; pixels: number[] },
+  protocol: string,
+  options: PrintImageOptions,
+) {
+  let out = finalizeRasterForEscPrint(raster, protocol, options)
+  if (options.sharpenInvertedText) {
+    out = sharpenInvertedTextInMonochromeRaster(out)
+  }
+  return out
+}
+
+function buildInvertedTextPrintImageOptions (
+  template: SystemLabelTemplate,
+  base: PrintImageOptions = {},
+): PrintImageOptions {
+  if (!templateHasInvertedTextElements(template)) return base
+  return {
+    ...base,
+    threshold: base.threshold ?? INVERTED_TEXT_IMAGE_THRESHOLD,
+    bilinearImageScale: base.bilinearImageScale ?? false,
+    sharpenInvertedText: base.sharpenInvertedText ?? true,
+    density: base.density ?? 10,
+    printSpeed: base.printSpeed ?? 4,
+  }
+}
+
 export async function printSystemTemplateForCurrentPrinter (
   template: SystemLabelTemplate,
   data: LabelTemplateData = {},
@@ -1038,28 +1023,15 @@ export async function printSystemTemplateForCurrentPrinter (
     !!canvasRaster
     && templateHasQrDataForCommandPrint(template)
     && !templateHasUnsupportedElementsForCommandPrint(template)
+    && !templateRequiresCanvasStyleFidelity(template)
  
   if (canvasRaster && !bypassCanvasRasterForQr) {
     if (onProgress) onProgress(1)
     const templateForDraw = templateForRasterPrint(template)
     const maxDots =
       rasterDriver.imageMaxWidthDots || (rasterDriver.protocol === 'esc' ? 384 : 576)
-    const escUseContentH = rasterDriver.protocol === 'esc'
-    const contentHpx = escUseContentH ? templateContentHeightPx(templateForDraw) : undefined
-    const layout = getLabelPrintRasterLayout(
-      templateForDraw,
-      maxDots,
-      rasterDriver.imageDpi || 203,
-      contentHpx != null ? { contentHeightPx: contentHpx } : undefined,
-    )
-    if (escUseContentH) {
-      printRunDiag('raster_layout_content_height', {
-        contentHpx,
-        layoutCh: layout.ch,
-        outW: layout.outW,
-        outH: layout.outH,
-      })
-    }
+    const printDpi = rasterDriver.imageDpi || 203
+    const layout = getLabelPrintRasterLayout(templateForDraw, maxDots, printDpi)
     if (onProgress) onProgress(4)
     if (canvasRaster.applyLayout) {
       await Promise.resolve(canvasRaster.applyLayout(layout))
@@ -1067,24 +1039,17 @@ export async function printSystemTemplateForCurrentPrinter (
     if (onProgress) onProgress(7)
     await settleAfterLabelCanvasResize()
     if (onProgress) onProgress(9)
-    const printOpts: PrintImageOptions = {
+    const layoutMm = rasterDotsToMillimeters(layout.outW, layout.outH, printDpi)
+    const printOpts = buildInvertedTextPrintImageOptions(templateForDraw, {
       printQty: options.printQty || 1,
       clearTopRasterRows: 0,
       targetWidthDots: layout.outW,
       targetHeightDots: layout.outH,
-      useContentHeight: escUseContentH,
+      useContentHeight: false,
       cutBetweenCopies: true,
-      widthMm: templateSizeToMillimeters(
-        templateForDraw.unit,
-        Number(templateForDraw.width) || 0,
-        Number(templateForDraw.height) || 0,
-      ).widthMm,
-      heightMm: templateSizeToMillimeters(
-        templateForDraw.unit,
-        Number(templateForDraw.width) || 0,
-        Number(templateForDraw.height) || 0,
-      ).heightMm,
-    }
+      widthMm: layoutMm.widthMm,
+      heightMm: layoutMm.heightMm,
+    })
     const mapRasterProgress = onProgress
       ? (p: number) => {
           onProgress(12 + Math.round((Math.min(100, Math.max(0, p)) / 100) * 88))
@@ -3,6 +3,14 @@ import type {
   SystemTemplateElementBase,
   SystemTemplateTextAlign,
 } from './types/printer'
+import { readInvertColors } from '../invertColorsConfig'
+import { readVerticalAlign, readFontWeight, readFontStyle, readTextDecoration } from '../textElementLayout'
+import {
+  LABEL_EDITOR_FONT_FAMILY,
+  normalizeLabelEditorFontFamily,
+  resolveAndroidFontFilePath,
+  resolveLabelEditorFontFamily,
+} from '../labelEditorFonts'
  
 declare const plus: any
  
@@ -172,7 +180,12 @@ function splitTextLines (text: string, paint: any, maxWidth: number): string[] {
   return lines.length > 0 ? lines : ['']
 }
  
-export function shouldRasterizeTextElement (text: string, type: string): boolean {
+export function shouldRasterizeTextElement (
+  text: string,
+  type: string,
+  config: Record<string, unknown> = {}
+): boolean {
+  if (readInvertColors(config)) return true
   const normalizedType = String(type || '').toUpperCase()
   const normalizedText = normalizePrinterLikeText(text)
   if (!normalizedText) return false
@@ -182,6 +195,11 @@ export function shouldRasterizeTextElement (text: string, type: string): boolean
    */
   if (normalizedType === 'TEXT_PRICE') return true
   if (/[€£¥￥éÉáàâäãåæçèêëìíîïñòóôöõøùúûüýÿœšž]/.test(normalizedText)) return true
+  if (readFontStyle(config) === 'italic') return true
+  if (readTextDecoration(config) === 'underline') return true
+  if (readFontWeight(config) === 'bold') return true
+  const normalizedFont = normalizeLabelEditorFontFamily(config.fontFamily ?? config.FontFamily)
+  if (normalizedFont && normalizedFont !== LABEL_EDITOR_FONT_FAMILY) return true
   return /[^\x20-\x7E]/.test(normalizedText)
 }
  
@@ -208,18 +226,35 @@ export function createTextBitmapPatch (params: {
   const height = Math.max(16, pxToDots(element.height, dpi) + TEXT_PADDING_DOTS * 2)
   const bitmap = Bitmap.createBitmap(width, height, BitmapConfig.ARGB_8888)
   const canvas = new Canvas(bitmap)
-  canvas.drawColor(Color.WHITE)
+  const inverted = readInvertColors(config)
+  canvas.drawColor(inverted ? Color.BLACK : Color.WHITE)
  
   const paint = new Paint()
   paint.setAntiAlias(true)
   paint.setDither(true)
-  paint.setColor(Color.BLACK)
+  paint.setColor(inverted ? Color.WHITE : Color.BLACK)
   paint.setSubpixelText(true)
   const fontSizeDots = Math.max(14, pxToDots(Number(config.fontSize || 14), dpi))
   paint.setTextSize(fontSizeDots)
-  const isBold = String(config.fontWeight || '').toLowerCase() === 'bold' || String(element.type || '').toUpperCase() === 'TEXT_PRICE'
-  paint.setFakeBoldText(isBold)
-  paint.setTypeface(isBold ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT)
+  const family = resolveLabelEditorFontFamily(config)
+  const isBold = readFontWeight(config) === 'bold' || String(element.type || '').toUpperCase() === 'TEXT_PRICE'
+  const isItalic = readFontStyle(config) === 'italic'
+  const isUnderline = readTextDecoration(config) === 'underline'
+  const fontPath = resolveAndroidFontFilePath(family, isBold, isItalic)
+  let typeface = isBold ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT
+  if (fontPath && typeof Typeface.createFromFile === 'function') {
+    try {
+      const loaded = Typeface.createFromFile(fontPath)
+      if (loaded) typeface = loaded
+    } catch (_) {
+      /* use default */
+    }
+  }
+  paint.setFakeBoldText(isBold && !fontPath)
+  if (typeof paint.setTextSkewX === 'function') {
+    paint.setTextSkewX(isItalic && !fontPath ? -0.25 : 0)
+  }
+  paint.setTypeface(typeface)
  
   const maxTextWidth = Math.max(8, contentWidth)
   const lines = splitTextLines(text, paint, maxTextWidth)
@@ -229,10 +264,13 @@ export function createTextBitmapPatch (params: {
     Math.ceil(Math.abs(Number(fontMetrics.top)) + Math.abs(Number(fontMetrics.bottom)) + 2)
   )
   const totalHeight = lines.length * lineHeight
-  const isCenteredVertically = String(element.type || '').toUpperCase() === 'TEXT_PRICE'
-  const topOffset = isCenteredVertically
-    ? Math.max(TEXT_PADDING_DOTS, Math.floor((height - totalHeight) / 2))
-    : TEXT_PADDING_DOTS
+  const verticalAlign = readVerticalAlign(config)
+  let topOffset = TEXT_PADDING_DOTS
+  if (verticalAlign === 'center') {
+    topOffset = Math.max(TEXT_PADDING_DOTS, Math.floor((height - totalHeight) / 2))
+  } else if (verticalAlign === 'bottom') {
+    topOffset = Math.max(TEXT_PADDING_DOTS, height - totalHeight - TEXT_PADDING_DOTS)
+  }
  
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i]
@@ -245,6 +283,15 @@ export function createTextBitmapPatch (params: {
     }
     const baseline = topOffset + i * lineHeight - Number(fontMetrics.top)
     canvas.drawText(line, drawX, baseline, paint)
+    if (isUnderline) {
+      const lineWidth = Number(paint.measureText(line))
+      const underlineY = baseline + Math.max(2, Math.round(fontSizeDots * 0.08))
+      const strokePaint = new Paint()
+      strokePaint.setColor(inverted ? Color.WHITE : Color.BLACK)
+      strokePaint.setStrokeWidth(Math.max(1, Math.round(fontSizeDots * 0.06)))
+      strokePaint.setStyle(graphics.Paint.Style.STROKE)
+      canvas.drawLine(drawX, underlineY, drawX + lineWidth, underlineY, strokePaint)
+    }
   }
  
   const image = bitmapToMonochromeImage(bitmap)
@@ -158,24 +158,26 @@ export function getNativeFastPrinterDebugInfo () {
       }
       nativePlugin.getDebugInfo((payload: any) => {
         const res = parsePluginResult(payload)
-        const prev = { ...nativeFastPrinterState }
+        const prev = getNativeFastPrinterState() || {}
         const patch: NativePrinterResult = {
+          ...prev,
           ...res,
           lastAction: 'getDebugInfo',
+          available: isNativeFastPrinterAvailable(),
         }
-        /** getDebugInfo 常只带插件元数据；勿把上次 print 的 commandBytes/writeMs/stage 冲成 0 或空 */
-        const resBytes = Number(res.commandBytes ?? 0)
-        const resWrite = Number(res.writeMs ?? 0)
-        const prevBytes = Number(prev.commandBytes ?? 0)
-        if ((resBytes <= 0 && resWrite <= 0) && prevBytes > 0) {
-          patch.commandBytes = prev.commandBytes
-          patch.writeMs = prev.writeMs
-          if (res.stage == null || String(res.stage).trim() === '') {
-            patch.stage = prev.stage
-          }
+        const resStage = String(res.stage ?? '').trim()
+        if (resStage) patch.stage = resStage
+        if (res.writeMs != null && Number.isFinite(Number(res.writeMs))) {
+          patch.writeMs = Number(res.writeMs)
+        }
+        if (res.commandBytes != null && Number(res.commandBytes) > 0) {
+          patch.commandBytes = Number(res.commandBytes)
+        }
+        if (res.lastError != null && String(res.lastError).trim()) {
+          patch.lastError = String(res.lastError)
         }
         updateNativeState(patch)
-        resolve(res)
+        resolve({ ...patch })
       })
     } catch (error: any) {
       reject(error instanceof Error ? error : new Error(String(error || 'NATIVE_FAST_PRINTER_DEBUG_FAILED')))
@@ -351,6 +353,51 @@ export function isNativePrintCommandBytesSupported (): boolean {
   return !!plugin && typeof plugin.printCommandBytes === 'function'
 }
  
+function sleepMs (ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+/**
+ * printCommandBytes 原生仅首帧回调 queued 即 success，真实写出在后台线程。
+ * 轮询 debugInfo 直到 printCommandBytes:ok / writeMs 增长 / :error。
+ */
+export async function waitForNativeCommandBytesWriteComplete (
+  timeoutMs = 300000,
+  onPoll?: (percentInWait: number) => void,
+): Promise<{ writeMs: number; commandBytes: number; stage: string }> {
+  const started = Date.now()
+  const baselineWriteMs = Number(getNativeFastPrinterState()?.writeMs || 0)
+  while (Date.now() - started < timeoutMs) {
+    try {
+      await getNativeFastPrinterDebugInfo()
+    } catch (_) {
+      /* 单次 getDebugInfo 失败不中断，继续读缓存 state */
+    }
+    const info = getNativeFastPrinterState() || {}
+    const stage = String(info.stage || '').toLowerCase()
+    const writeMs = Number(info.writeMs || 0)
+    const commandBytes = Number(info.commandBytes || 0)
+
+    if (stage.includes('printcommandbytes:error')) {
+      throw new Error(String(info.lastError || 'NATIVE_PRINT_COMMAND_BYTES_ERROR'))
+    }
+    if (stage.includes('printcommandbytes:ok')) {
+      return { writeMs, commandBytes, stage: String(info.stage || '') }
+    }
+    /** 部分 AAR stage 字段缺失，但 writeMs 相对 queued 前已增长 → 纸已出 */
+    if (writeMs > baselineWriteMs && writeMs > 0) {
+      return { writeMs, commandBytes, stage: stage || 'printCommandBytes:ok' }
+    }
+    if (onPoll) {
+      const elapsed = Date.now() - started
+      const cap = Math.min(timeoutMs, 90000)
+      onPoll(Math.min(99, Math.round((elapsed / cap) * 100)))
+    }
+    await sleepMs(150)
+  }
+  throw new Error('NATIVE_PRINT_COMMAND_BYTES_WRITE_TIMEOUT')
+}
+
 export function printNativeUposCommandBytes (options: {
   base64: string
   prefer?: 'builtin' | 'serial'
@@ -9,6 +9,22 @@ import type {
 } from './types/printer'
 import { formatBarcodeValueForTsc, normalizeBarcodeType } from '../barcodeFormat'
 import { applyTemplateData } from './templateRenderer'
+import {
+  isCorruptedDateDisplayFormat,
+  parseStoredPrintInputOffset,
+  resolveElementDateTimeDisplay,
+} from '../labelPreview/printInputOffset'
+import { readInvertColors } from '../invertColorsConfig'
+import { normalizeTemplatePrintOrientation } from '../labelPreview/normalizePreviewTemplate'
+import {
+  readElementBorder,
+  readElementRotation,
+  readFontStyle,
+  readFontWeight,
+  readTextDecoration,
+  readVerticalAlign,
+} from '../textElementLayout'
+import { normalizeLabelEditorFontFamily, LABEL_EDITOR_FONT_FAMILY } from '../labelEditorFonts'
  
 function isElementHandledByNativeFastPrinter (el: SystemTemplateElementBase): boolean {
   const type = String(el.type || '').toUpperCase()
@@ -88,46 +104,27 @@ function prepareBarcodeElementForNativePrint (el: SystemTemplateElementBase): Sy
   return { ...el, config: cfg }
 }
  
+function readNativeSnapshotText (config: Record<string, any>): string {
+  for (const key of ['__previewFormatted', '__PreviewFormatted', 'text', 'Text'] as const) {
+    const raw = String(config[key] ?? '').trim()
+    if (!raw) continue
+    if (parseStoredPrintInputOffset(raw)) continue
+    if (isCorruptedDateDisplayFormat(raw)) continue
+    return raw
+  }
+  return ''
+}
+
 /**
  * 将 WEIGHT / DATE / TIME / DURATION 转为 TEXT_STATIC（展示文案与合并后的 config.text 一致），
  * LOGO → IMAGE，使同一套模板可走 native printTemplate，避免仅因元素类型名而整页光栅（进度长期停在 ~12–14%）。
  */
 export function normalizeTemplateForNativeFastJob (
   template: SystemLabelTemplate,
-  data: LabelTemplateData
+  data: LabelTemplateData,
+  baseTime: Date = new Date(),
 ): SystemLabelTemplate {
-  const now = new Date()
-  const pad2 = (n: number): string => String(n).padStart(2, '0')
-  const formatDateByPreset = (fmt: string, d: Date): string => {
-    const yyyy = String(d.getFullYear())
-    const yy = yyyy.slice(-2)
-    const mm = pad2(d.getMonth() + 1)
-    const dd = pad2(d.getDate())
-    const hh = pad2(d.getHours())
-    const min = pad2(d.getMinutes())
-    switch (fmt) {
-      case 'DD/MM/YYYY': return `${dd}/${mm}/${yyyy}`
-      case 'MM/DD/YYYY': return `${mm}/${dd}/${yyyy}`
-      case 'DD/MM/YY': return `${dd}/${mm}/${yy}`
-      case 'MM/DD/YY': return `${mm}/${dd}/${yy}`
-      case 'MM/YY': return `${mm}/${yy}`
-      case 'MM/DD': return `${mm}/${dd}`
-      case 'MM': return mm
-      case 'DD': return dd
-      case 'YY': return yy
-      case 'YYYY-MM-DD': return `${yyyy}-${mm}-${dd}`
-      case 'YYYY-MM-DD HH:mm': return `${yyyy}-${mm}-${dd} ${hh}:${min}`
-      case 'HH:mm': return `${hh}:${min}`
-      default:
-        return String(fmt || '')
-          .replace('YYYY', yyyy)
-          .replace('YY', yy)
-          .replace('MM', mm)
-          .replace('DD', dd)
-          .replace('HH', hh)
-          .replace('mm', min)
-    }
-  }
+  const now = baseTime
  
   const extras: SystemTemplateElementBase[] = []
   const elements = (template.elements || []).map((el) => {
@@ -138,41 +135,18 @@ export function normalizeTemplateForNativeFastJob (
     }
     if (type === 'WEIGHT' || type === 'DATE' || type === 'TIME' || type === 'DURATION') {
       let text = ''
-      /** 与 renderLabelPreviewCanvas.previewTextForElement 一致：后端 AUTO_DB 的 DATE/TIME 常把算好的展示串写在 format 而非 text */
-      let raw = String(config.text ?? config.Text ?? '').trim()
-      const vst = String(el.valueSourceType || '').toUpperCase()
-      const inputType = String(config.inputType ?? config.InputType ?? '').toLowerCase()
-      if (type === 'DATE') {
-        if (raw) {
-          text = applyTemplateData(raw, data)
-        } else if (vst === 'PRINT_INPUT' && (inputType === 'date' || inputType === 'datetime')) {
-          const fmt = String(config.format ?? config.Format ?? (inputType === 'datetime' ? 'YYYY-MM-DD HH:mm' : 'DD/MM/YYYY')).trim()
-          text = fmt
+      if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
+        const snap = readNativeSnapshotText(config)
+        if (snap) {
+          text = applyTemplateData(snap, data)
         } else {
-          const fmt = String(config.format ?? config.Format ?? 'DD/MM/YYYY').trim() || 'DD/MM/YYYY'
-          const offset = Number(config.offsetDays ?? config.OffsetDays ?? 0) || 0
-          const d = new Date(now.getTime())
-          d.setDate(d.getDate() + offset)
-          text = formatDateByPreset(fmt, d)
-        }
-      } else if (type === 'TIME') {
-        if (raw) {
-          text = applyTemplateData(raw, data)
-        } else if (vst === 'PRINT_INPUT') {
-          text = String(config.format ?? config.Format ?? 'HH:mm').trim() || 'HH:mm'
-        } else {
-          text = formatDateByPreset('HH:mm', now)
-        }
-      } else if (type === 'DURATION') {
-        if (raw) {
-          text = applyTemplateData(raw, data)
-        } else {
-          const unit = String(config.format ?? config.Format ?? 'Days').trim() || 'Days'
-          const rawV = config.durationValue ?? config.value ?? config.offsetDays ?? config.DurationValue ?? config.Value ?? config.OffsetDays
-          const val = Number.isFinite(Number(rawV)) ? Number(rawV) : 0
-          text = `${val} ${unit}`.trim()
+          const live = resolveElementDateTimeDisplay(el, now)
+          if (live != null && live.trim()) {
+            text = applyTemplateData(live, data)
+          }
         }
       } else if (type === 'WEIGHT') {
+        let raw = String(config.text ?? config.Text ?? '').trim()
         if (!raw) raw = String(config.value ?? config.Value ?? '').trim()
         if (raw) text = applyTemplateData(raw, data)
       }
@@ -183,10 +157,14 @@ export function normalizeTemplateForNativeFastJob (
         if (v && u && !v.endsWith(u)) text = `${v}${u}`
         else text = v || u
       }
+      const nextConfig: Record<string, unknown> = { ...config, text, nativeSourceType: type }
+      if (readInvertColors(config)) {
+        nextConfig.forceRasterText = true
+      }
       return {
         ...el,
         type: 'TEXT_STATIC' as typeof el.type,
-        config: { ...config, text, nativeSourceType: type },
+        config: nextConfig,
       }
     }
     if (type === 'NUTRITION') {
@@ -222,7 +200,14 @@ export function normalizeTemplateForNativeFastJob (
     }
     return el
   })
-  const merged = resolveNativeLayoutCollisions([...elements, ...extras])
+  const withInvertRaster = elements.map((el) => {
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    if (readInvertColors(cfg)) {
+      cfg.forceRasterText = true
+    }
+    return { ...el, config: cfg }
+  })
+  const merged = resolveNativeLayoutCollisions([...withInvertRaster, ...extras])
   return { ...template, elements: merged }
 }
  
@@ -233,3 +218,59 @@ export function templateHasUnsupportedNativeFastElements (template: SystemLabelT
   }
   return false
 }
+
+/** DATE/TIME/DURATION 在原生 printTemplate 中易丢 config.text，须与预览同源走 Canvas 光栅 */
+export function templateHasDateTimeElements (template: SystemLabelTemplate): boolean {
+  for (const el of template.elements || []) {
+    const type = String(el.type || '').toUpperCase()
+    if (type === 'DATE' || type === 'TIME' || type === 'DURATION') return true
+  }
+  return false
+}
+
+/** 元素边框 / 黑底白字 / 斜体下划线 / 自定义字体 / 垂直对齐 / 竖排 / 横打等，原生路径无法完整还原时须走 canvas 光栅 */
+export function templateRequiresCanvasStyleFidelity (template: SystemLabelTemplate): boolean {
+  const paperBorder = String(template.border ?? (template as any).Border ?? '').trim().toLowerCase()
+  if (paperBorder === 'line' || paperBorder === 'dotted' || paperBorder === 'solid') {
+    return true
+  }
+  if (normalizeTemplatePrintOrientation(template.printOrientation) === 'horizontal') {
+    return true
+  }
+
+  for (const el of template.elements || []) {
+    const border = readElementBorder(el)
+    const type = String(el.type || '').toUpperCase()
+    if (border === 'line' || border === 'dotted' || border === 'solid') {
+      return true
+    }
+    if (readElementRotation(el) !== 'horizontal') {
+      return true
+    }
+    const cfg = (el.config || {}) as Record<string, unknown>
+    if (readInvertColors(cfg)) {
+      return true
+    }
+    if (readFontStyle(cfg) === 'italic') {
+      return true
+    }
+    if (readTextDecoration(cfg) === 'underline') {
+      return true
+    }
+    if (readFontWeight(cfg) === 'bold') {
+      return true
+    }
+    if (readVerticalAlign(cfg) !== 'top') {
+      return true
+    }
+    const normalizedFont = normalizeLabelEditorFontFamily(cfg.fontFamily ?? cfg.FontFamily)
+    if (normalizedFont && normalizedFont !== LABEL_EDITOR_FONT_FAMILY) {
+      return true
+    }
+    /** 营养表使用独立排版，原生与 canvas 字体/间距易不一致 */
+    if (type === 'NUTRITION') {
+      return true
+    }
+  }
+  return false
+}
@@ -42,3 +42,30 @@ export function getPrintRunDiagnosticsTextForModal (maxChars = 3800): string {
   if (full.length <= maxChars) return full
   return `...(start omitted, ${full.length - maxChars} chars)\n\n${full.slice(-maxChars)}`
 }
+
+const STORAGE_LAST_PRINT_DIAG = 'lastPrintRunDiagnostics'
+const STORAGE_LAST_PRINT_DIAG_AT = 'lastPrintRunDiagnosticsAt'
+
+/** 打印结束后写入 storage，Printer 页可查看最近一次任务时间线 */
+export function persistPrintRunDiagnostics (): void {
+  try {
+    uni.setStorageSync(STORAGE_LAST_PRINT_DIAG, getPrintRunDiagnosticsText())
+    uni.setStorageSync(STORAGE_LAST_PRINT_DIAG_AT, String(Date.now()))
+  } catch (_) {}
+}
+
+export function getPersistedPrintRunDiagnostics (): string {
+  try {
+    return String(uni.getStorageSync(STORAGE_LAST_PRINT_DIAG) || '')
+  } catch (_) {
+    return ''
+  }
+}
+
+export function getPersistedPrintRunDiagnosticsAt (): number {
+  try {
+    return Number(uni.getStorageSync(STORAGE_LAST_PRINT_DIAG_AT) || 0) || 0
+  } catch (_) {
+    return 0
+  }
+}
@@ -3,7 +3,7 @@
  */
 import type { ActiveBtDeviceType, PrinterType } from './types/printer'
 import classicBluetooth from './bluetoothTool.js'
-import { getDeviceFingerprint } from '../deviceInfo'
+import { getDeviceFingerprint, isAoaAioDevice } from '../deviceInfo'
 import {
   blePairRequiresWriteNoResponse,
   isNordicUartStyleBleService,
@@ -19,6 +19,7 @@ import {
   isNativePrintCommandBytesSupported,
   printNativeCommandBytes,
   printNativeUposCommandBytes,
+  waitForNativeCommandBytesWriteComplete,
 } from './nativeFastPrinter'
 import { printRunDiag } from './printRunDiagnostics'
  
@@ -43,9 +44,9 @@ const STORAGE_PRINTER_DEBUG_LOG = &#39;printerDebugLog&#39; // &#39;1&#39; | &#39;0&#39;
 const BUILTIN_PROBE_PORTS = [9100, 4000, 9000, 6000]
 const BUILTIN_PRINTER_DEVICE_KEYWORDS: string[] = [
   // 在这里补充需要走 Built-in 的设备型号关键字（小写匹配）
-  // 例如：'desktop-aio', 'pos-terminal-x1'
   'rk3568',
   'aoa_rk3568',
+  'aoa',
 ]
 export type BtDeviceType = ActiveBtDeviceType
  
@@ -185,7 +186,9 @@ type PrinterDebugSnapshot = {
     uposSupported: boolean
     uposOptions: ReturnType<typeof getStoredUposPrintOptions>
     keywordMatched: boolean
+    virtualBtLinked: boolean
     uposWillTry: boolean
+    sendChannelHint: string
     tcpPluginAvailable: boolean
     savedPort: number
   }
@@ -208,8 +211,17 @@ export async function getPrinterDebugSnapshot (options?: {
   const uposOptions = getUposOptionsFromStorage()
   const keywordMatched = !!deviceFingerprint
     && (deviceFingerprint.includes('rk3568') || deviceFingerprint.includes('aoa_rk3568'))
+  const virtualBtLinked = !!bluetoothConnection
+    && String(bluetoothConnection.deviceName || '').toLowerCase().includes('virtual bt')
+  const isD320faxDevice = !!deviceFingerprint
+    && (deviceFingerprint.includes('d320fax') || deviceFingerprint.includes('msm8953'))
   const uposSupported = isNativeUposPrintSupported()
-  const uposWillTry = uposSupported && (uposOptions.force || keywordMatched)
+  const uposWillTry = uposSupported && (
+    uposOptions.force
+    || (keywordMatched && !isD320faxDevice)
+    || (virtualBtLinked && !isD320faxDevice)
+    || (printerType === 'builtin' && !isD320faxDevice)
+  )
  
   let tcpPluginAvailable = false
   try {
@@ -241,7 +253,9 @@ export async function getPrinterDebugSnapshot (options?: {
       uposSupported,
       uposOptions,
       keywordMatched,
+      virtualBtLinked,
       uposWillTry,
+      sendChannelHint: resolvePrintSendChannelHint(),
       tcpPluginAvailable,
       savedPort,
     },
@@ -263,6 +277,153 @@ export async function logPrinterDebug (options?: {
  
 const BLE_MTU_DEFAULT = 20
  
+function hasBleWriteProperty (item: any): boolean {
+  const w = item.properties?.write
+  return w === true || w === 'true'
+}
+
+function hasBleWriteNoResponseProperty (item: any): boolean {
+  const p = item.properties || {}
+  return (
+    p.writeNoResponse === true ||
+    p.writeNoResponse === 'true' ||
+    p.writeWithoutResponse === true ||
+    p.writeWithoutResponse === 'true'
+  )
+}
+
+/**
+ * Nordic 白名单：GATT 可能只报 write，但机芯数据口仍须 writeNoResponse（长任务带响应写易 mid-job 10007）。
+ * 非白名单：按 GATT 属性选择。
+ */
+function pickBleWriteUsesNoResponse (serviceId: string, item: any): boolean {
+  const cid = String(item.uuid || '')
+  const hw = hasBleWriteProperty(item)
+  const hn = hasBleWriteNoResponseProperty(item)
+  if (blePairRequiresWriteNoResponse(serviceId, cid)) {
+    return hw || hn
+  }
+  if (!hn) return false
+  if (!hw) return true
+  return false
+}
+
+function listBleCharacteristics (
+  deviceId: string,
+  serviceId: string,
+): Promise<Array<{ uuid?: string; properties?: Record<string, unknown> }>> {
+  return new Promise((resolve) => {
+    uni.getBLEDeviceCharacteristics({
+      deviceId,
+      serviceId,
+      success: (charRes) => resolve((charRes.characteristics || []) as Array<{ uuid?: string; properties?: Record<string, unknown> }>),
+      fail: () => resolve([]),
+    })
+  })
+}
+
+function resolveBleWriteTargetFromChars (
+  serviceId: string,
+  chars: Array<{ uuid?: string; properties?: Record<string, unknown> }>,
+): { serviceId: string; characteristicId: string; bleWriteUsesNoResponse: boolean } | null {
+  const writable = (item: { properties?: Record<string, unknown> }) =>
+    hasBleWriteProperty(item) || hasBleWriteNoResponseProperty(item)
+  for (const item of chars) {
+    const cid = String(item.uuid || '')
+    if (blePairRequiresWriteNoResponse(serviceId, cid) && writable(item)) {
+      return {
+        serviceId,
+        characteristicId: cid,
+        bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, item),
+      }
+    }
+  }
+  return null
+}
+
+function resolveBleGenericWriteFromChars (
+  serviceId: string,
+  chars: Array<{ uuid?: string; properties?: Record<string, unknown> }>,
+): { serviceId: string; characteristicId: string; bleWriteUsesNoResponse: boolean } | null {
+  const withResp = chars.find(hasBleWriteProperty)
+  const noResp = chars.find(hasBleWriteNoResponseProperty)
+  const target = withResp || noResp
+  if (!target) return null
+  return {
+    serviceId,
+    characteristicId: String(target.uuid || ''),
+    bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, target),
+  }
+}
+
+/** 连接/打印前重新发现可写特征，避免 storage 里仍是错误写入方式 */
+export function discoverBleWriteCharacteristic (deviceId: string): Promise<{
+  serviceId: string
+  characteristicId: string
+  bleWriteUsesNoResponse: boolean
+} | null> {
+  return new Promise((resolve) => {
+    uni.getBLEDeviceServices({
+      deviceId,
+      success: async (serviceRes) => {
+        const services = serviceRes.services || []
+        try {
+          /** 第一轮：只认 Nordic 打印串口，避免误选其它服务的可写特征导致 property not support */
+          for (const svc of services) {
+            const serviceId = String(svc.uuid || '')
+            const chars = await listBleCharacteristics(deviceId, serviceId)
+            const nordic = resolveBleWriteTargetFromChars(serviceId, chars)
+            if (nordic) {
+              console.log('[BLE] discover: nordic uart', nordic)
+              resolve(nordic)
+              return
+            }
+          }
+          for (const svc of services) {
+            const serviceId = String(svc.uuid || '')
+            const chars = await listBleCharacteristics(deviceId, serviceId)
+            const generic = resolveBleGenericWriteFromChars(serviceId, chars)
+            if (generic) {
+              console.log('[BLE] discover: generic writable', generic)
+              resolve(generic)
+              return
+            }
+          }
+          resolve(null)
+        } catch {
+          resolve(null)
+        }
+      },
+      fail: () => resolve(null),
+    })
+  })
+}
+
+async function refreshBlePrintTarget (deviceId: string, driverKey: string): Promise<{
+  serviceId: string
+  characteristicId: string
+  bleWriteUsesNoResponse: boolean
+} | null> {
+  const write = await discoverBleWriteCharacteristic(deviceId)
+  if (!write) return null
+  const driver = getPrinterDriverByKey(driverKey)
+  await ensureBleUartNotifyIfNeeded(deviceId, write.serviceId, write.characteristicId)
+  const negotiatedMtu = await requestBleMtuNegotiation(deviceId, driver.preferredBleMtu || BLE_MTU_DEFAULT)
+  setBluetoothConnection({
+    deviceId,
+    deviceName: uni.getStorageSync(STORAGE_BT_DEVICE_NAME) || 'Bluetooth Printer',
+    serviceId: write.serviceId,
+    characteristicId: write.characteristicId,
+    deviceType: 'ble',
+    mtu: negotiatedMtu,
+    driverKey,
+    bleWriteUsesNoResponse: blePairRequiresWriteNoResponse(write.serviceId, write.characteristicId)
+      ? true
+      : write.bleWriteUsesNoResponse,
+  })
+  return write
+}
+
 export function getPrinterType (): PrinterType | '' {
   const type = (uni.getStorageSync(STORAGE_PRINTER_TYPE) as PrinterType) || ''
   if (!type) return ''
@@ -389,6 +550,8 @@ export function isBuiltinPrinterAvailable (): boolean {
   // #endif
 }
  
+export { isAoaAioDevice } from '../deviceInfo'
+
 export function isBuiltinPrinterEnabledByDeviceModel (): boolean {
   const fingerprint = getDeviceFingerprint()
   if (!fingerprint) return false
@@ -398,18 +561,92 @@ export function isBuiltinPrinterEnabledByDeviceModel (): boolean {
 /**
  * 一体机（AIO）上若当前连的是 Virtual BT Printer，打印改走内置 ESC 光栅（与预览 Canvas 一致，避免 JSON 直打空白）。
  */
-export function preferBuiltinPrinterOnAioDevice (): boolean {
-  if (!isBuiltinPrinterAvailable() || !isBuiltinPrinterEnabledByDeviceModel()) return false
-  if (getPrinterType() === 'builtin') return true
+export function isAioBuiltinPrintCapable (): boolean {
+  return isBuiltinPrinterAvailable() || isNativeUposPrintSupported()
+}
+
+/** Gprinter D320FAX 一体机（Qualcomm msm8953）：UPOS 串口不可用，走佳博 SDK + Virtual BT TSC */
+export function isD320faxAioDevice (): boolean {
+  const fp = getDeviceFingerprint().toLowerCase()
+  return fp.includes('d320fax') || fp.includes('msm8953')
+}
+
+/** D320FAX 误切 builtin 后恢复 bluetooth + native-plugin，避免 UPOS 假成功 */
+export function restoreD320faxVirtualBtBluetoothMode (): void {
+  if (!isD320faxAioDevice() || !isVirtualBtBluetoothConnection()) return
+  const conn = getBluetoothConnection()
+  if (!conn || getPrinterType() !== 'builtin') return
+  setBluetoothConnection({
+    deviceId: conn.deviceId,
+    deviceName: conn.deviceName,
+    serviceId: conn.serviceId,
+    characteristicId: conn.characteristicId,
+    deviceType: conn.deviceType,
+    transportMode: conn.transportMode || 'native-plugin',
+    mtu: conn.mtu,
+    driverKey: getCurrentPrinterDriverKey() || 'd320fax',
+  })
+}
+
+/** 当前打印字节预计走哪条物理通道（供 Printer 页 Debug 展示） */
+export function resolvePrintSendChannelHint (): string {
+  const type = getPrinterType()
+  const virtualBt = isVirtualBtBluetoothConnection()
+  const conn = getBluetoothConnection()
+  const uposSupported = isNativeUposPrintSupported()
+  const uposPrefer = getUposOptionsFromStorage().prefer || 'builtin'
+  if (virtualBt) {
+    if (conn?.transportMode === 'native-plugin' && isNativePrintCommandBytesSupported()) {
+      return 'Gprinter SDK TSC (Virtual BT)'
+    }
+    return 'Bluetooth classic TSC (Virtual BT)'
+  }
+  if (type === 'builtin') {
+    if (uposSupported) return `UPOS/${uposPrefer}`
+    if (isBuiltinPrinterAvailable()) return 'TCP localhost'
+    return 'builtin-unavailable'
+  }
+  if (type === 'bluetooth') {
+    if (conn?.deviceType === 'ble') {
+      return 'Bluetooth BLE (Canvas→TSC raster)'
+    }
+    if (conn?.transportMode === 'native-plugin' && isNativePrintCommandBytesSupported()) {
+      return 'Bluetooth printCommandBytes (Gprinter SDK)'
+    }
+    if (conn?.deviceType === 'classic') return 'Bluetooth classic JS'
+    return 'Bluetooth'
+  }
+  return 'none'
+}
+
+/** 当前经典蓝牙是否连到一体机 Virtual BT（虚拟 SPP 别名） */
+export function isVirtualBtBluetoothConnection (): boolean {
   const conn = getBluetoothConnection()
-  const btName = String(conn?.deviceName || '').toLowerCase()
-  if (!btName.includes('virtual bt')) return false
+  if (!conn) return false
+  return String(conn.deviceName || '').toLowerCase().includes('virtual bt')
+}
+
+export function preferBuiltinPrinterOnAioDevice (): boolean {
+  restoreD320faxVirtualBtBluetoothMode()
+
+  if (getPrinterType() === 'builtin') {
+    if (isVirtualBtBluetoothConnection()) return false
+    return true
+  }
+  if (!isAioBuiltinPrintCapable()) return false
+
+  /** 一体机已连 Virtual BT：保持 Bluetooth + 佳博 TSC，勿切 Built-in/UPOS */
+  if (isVirtualBtBluetoothConnection()) {
+    return false
+  }
+
+  if (!isBuiltinPrinterEnabledByDeviceModel()) return false
   setBuiltinPrinter(getCurrentPrinterDriverKey() || 'generic-tsc')
   return true
 }
  
 export function getAvailablePrinterTypes (): PrinterType[] {
-  if (isBuiltinPrinterAvailable() && isBuiltinPrinterEnabledByDeviceModel()) {
+  if (isAioBuiltinPrintCapable() && (isBuiltinPrinterEnabledByDeviceModel() || !!getBluetoothConnection())) {
     // AIO 机型同时保留蓝牙入口，避免只能走内置打印导致无法连接 Virtual BT Printer。
     return ['bluetooth', 'builtin']
   }
@@ -451,6 +688,12 @@ export function sendToPrinter (
   void logPrinterDebug({ reason: 'sendToPrinter', dataBytes: data?.length || 0 })
   const type = getPrinterType()
   printRunDiag('sendToPrinter', { type, dataBytes: data?.length || 0 })
+
+  /** Virtual BT：TSC 光栅必须走佳博 SDK / 经典蓝牙 SPP，禁止误投 UPOS（TSC 字节 UPOS 不认会卡死） */
+  if (isVirtualBtBluetoothConnection()) {
+    return sendViaVirtualBtTsc(data, onProgress)
+  }
+
   if (type === 'bluetooth') {
     const conn = getBluetoothConnection()
     if (conn && conn.deviceType === 'classic') {
@@ -639,7 +882,10 @@ function sendViaBle (
   if (!conn) {
     return Promise.reject(new Error('Bluetooth printer not connected.'))
   }
-  const { deviceId, serviceId, characteristicId, bleWriteUsesNoResponse } = conn
+  const deviceId = conn.deviceId
+  let serviceId = conn.serviceId
+  let characteristicId = conn.characteristicId
+  let bleWriteUsesNoResponse = conn.bleWriteUsesNoResponse
  
   const runWritesWithPayloadSize = (payloadSize: number): Promise<void> => {
     const chunks: number[][] = []
@@ -661,11 +907,10 @@ function sendViaBle (
             ? 2
             : 10
  
-    /** Nordic 白名单：仅用于失败时是否禁止翻到带响应写（佳博等）；写入方式以连接时写入 storage 的 bleWriteUsesNoResponse 为准 */
+    /** 佳博 Nordic 白名单：无视 storage 里旧的 false，长任务必须 writeNoResponse */
     const blePairForceNoResponse = blePairRequiresWriteNoResponse(serviceId, characteristicId)
  
-    /** 本 job 内若因 property not support 翻过模式，后续包统一用 effectiveUseNoResp */
-    let effectiveUseNoResp = bleWriteUsesNoResponse
+    let effectiveUseNoResp = blePairForceNoResponse ? true : bleWriteUsesNoResponse
     let hasFlippedWriteModeThisJob = false
     let pendingPersistUseNoResp: boolean | null = null
  
@@ -691,7 +936,7 @@ function sendViaBle (
         errCode: err?.errCode,
         errno: err?.errno,
         code: err?.code,
-        writeTypeUsed: useNoResp ? 'writeNoResponse' : '(omitted, default write)',
+        writeTypeUsed: useNoResp ? 'writeNoResponse' : 'write',
         effectiveUseNoResp,
         bleWriteUsesNoResponseSaved: bleWriteUsesNoResponse,
         bufferLen,
@@ -715,10 +960,8 @@ function sendViaBle (
             characteristicId,
             value: buffer,
           }
-          /** 仅无响应写显式声明；带响应写不传 writeType，与 uni 历史默认一致，避免部分机型报 property not support */
-          if (useNoResp) {
-            opts.writeType = 'writeNoResponse'
-          }
+          /** 无响应写 / 带响应写均显式声明 writeType，兼容新版 Android BLE 栈 */
+          opts.writeType = useNoResp ? 'writeNoResponse' : 'write'
           uni.writeBLECharacteristicValue({
             ...opts,
             success: () => {
@@ -740,27 +983,37 @@ function sendViaBle (
                 msg.includes('property not support') ||
                 msg.includes('not support') ||
                 String(err?.errCode) === '10007'
-              if (allowFlip && !hasFlippedWriteModeThisJob && notSupport) {
+              if (notSupport) {
                 const nextUseNoResp = !useNoResp
-                /**
-                 * 佳博等 Nordic 串口：GATT 虽声明 write，实测只接受 writeNoResponse。
-                 * 若 writeNoResponse 偶发失败后翻到「默认写」，首包可能仍 success，从第二包起必现 10007（打印量变长更易触发）。
-                 */
-                if (blePairForceNoResponse && !nextUseNoResp) {
+                /** 白名单 mid-job：带响应写跑若干包后 10007 → 立即改 writeNoResponse 重试本包 */
+                if (blePairForceNoResponse && !useNoResp && nextUseNoResp) {
+                  effectiveUseNoResp = true
+                  pendingPersistUseNoResp = true
+                  console.warn('[sendViaBle] 白名单串口 mid-job write→writeNoResponse 重试', {
+                    sentIndex: sent,
+                    totalChunks: total,
+                  })
+                  tryWrite(true, false)
+                  return
+                }
+                /** 白名单已用 writeNoResponse 跑通后，禁止切到带响应写 */
+                if (blePairForceNoResponse && !nextUseNoResp && sent > 0) {
                   console.warn(
-                    '[sendViaBle] 白名单串口禁止切到带响应写；请保持 writeNoResponse 或检查连接/MTU'
+                    '[sendViaBle] 白名单串口已发包后禁止切到带响应写；请保持 writeNoResponse'
                   )
                   reject(new Error(msg || 'BLE write failed'))
                   return
                 }
-                hasFlippedWriteModeThisJob = true
-                effectiveUseNoResp = nextUseNoResp
-                pendingPersistUseNoResp = effectiveUseNoResp
-                console.warn('[sendViaBle] property not support → 切换写入方式重试本包', {
-                  nextMode: effectiveUseNoResp ? 'writeNoResponse' : 'defaultWrite(no writeType)',
-                })
-                tryWrite(effectiveUseNoResp, false)
-                return
+                if (allowFlip && !hasFlippedWriteModeThisJob && sent === 0) {
+                  hasFlippedWriteModeThisJob = true
+                  effectiveUseNoResp = nextUseNoResp
+                  pendingPersistUseNoResp = effectiveUseNoResp
+                  console.warn('[sendViaBle] property not support → 首包切换写入方式重试', {
+                    nextMode: effectiveUseNoResp ? 'writeNoResponse' : 'write',
+                  })
+                  tryWrite(effectiveUseNoResp, false)
+                  return
+                }
               }
               reject(new Error(msg || 'BLE write failed'))
             },
@@ -830,14 +1083,23 @@ function sendViaBle (
  
   // #ifdef APP-PLUS
   if (conn.deviceType === 'ble') {
-    const driver = getPrinterDriverByKey(getCurrentPrinterDriverKey())
-    const preferred = driver.preferredBleMtu || BLE_MTU_DEFAULT
+    const driverKey = getCurrentPrinterDriverKey()
+    const driver = getPrinterDriverByKey(driverKey)
+    const nordicLikely = isNordicUartStyleBleService(serviceId)
     return bleOpenAdapter()
       .then(() => bleEnsureDeviceConnected(deviceId))
-      .then(() => new Promise<void>((r) => setTimeout(r, 100)))
-      .then(() => ensureBleUartNotifyIfNeeded(deviceId, serviceId, characteristicId))
-      .then(() => requestBleMtuNegotiation(deviceId, preferred))
-      .then((negotiated) => runWritesWithPayloadSize(mtuToPayloadSize(negotiated)))
+      .then(() => new Promise<void>((r) => setTimeout(r, nordicLikely ? 200 : 100)))
+      .then(() => refreshBlePrintTarget(deviceId, driverKey || driver.key))
+      .then(() => {
+        const latest = getBluetoothConnection()
+        if (latest) {
+          serviceId = latest.serviceId
+          characteristicId = latest.characteristicId
+          bleWriteUsesNoResponse = latest.bleWriteUsesNoResponse
+        }
+        const mtu = latest?.mtu || driver.preferredBleMtu || BLE_MTU_DEFAULT
+        return runWritesWithPayloadSize(mtuToPayloadSize(mtu))
+      })
   }
   // #endif
   return runWritesWithPayloadSize(mtuToPayloadSize(conn.mtu || BLE_MTU_DEFAULT))
@@ -867,11 +1129,58 @@ function numberArrayToBase64 (data: number[]): string {
 }
  
 /**
+ * Virtual BT（含 D320FAX / AOA 一体机）：Canvas 光栅 TSC 指令 → 佳博 SDK printCommandBytes 或经典蓝牙 SPP。
+ */
+async function sendViaVirtualBtTsc (
+  data: number[],
+  onProgress?: (percent: number) => void,
+): Promise<void> {
+  printRunDiag('sendToPrinter_virtual_bt_tsc', { dataBytes: data?.length || 0 })
+  await ensureNativeClassicTransportIfPossible()
+  const conn = getBluetoothConnection()
+  if (conn?.transportMode === 'native-plugin' && isNativePrintCommandBytesSupported()) {
+    const nativeWaitMs = Math.min(
+      600000,
+      Math.max(60000, estimateClassicSendTimeoutMs(data.length)),
+    )
+    try {
+      await sendViaNativeClassicPlugin(data, onProgress, { writeTimeoutMs: nativeWaitMs })
+      return
+    } catch (e) {
+      printRunDiag('virtual_bt_native_bytes_fallback_js', {
+        err: String((e as Error)?.message || e),
+        dataBytes: data.length,
+      })
+      try {
+        if (classicBluetooth?.ensureConnection) {
+          classicBluetooth.ensureConnection(conn.deviceId)
+        }
+      } catch (_) {}
+      return sendViaClassic(data, onProgress)
+    }
+  }
+  if (conn?.deviceType === 'classic') {
+    printRunDiag('sendToPrinter_virtual_bt_classic_js', { dataBytes: data?.length || 0 })
+    return sendViaClassic(data, onProgress)
+  }
+  return Promise.reject(new Error('Virtual BT printer not connected.'))
+}
+
+/** @deprecated 使用 sendViaVirtualBtTsc；保留别名兼容旧诊断关键字 */
+async function sendViaD320faxVirtualBt (
+  data: number[],
+  onProgress?: (percent: number) => void,
+): Promise<void> {
+  return sendViaVirtualBtTsc(data, onProgress)
+}
+
+/**
  * 经典蓝牙已走 native-fast-printer 佳博 SDK 时，整页光栅字节经 printCommandBytes 下发，避免 JS 蓝牙慢发。
  */
 function sendViaNativeClassicPlugin (
   data: number[],
-  onProgress?: (percent: number) => void
+  onProgress?: (percent: number) => void,
+  options: { writeTimeoutMs?: number } = {},
 ): Promise<void> {
   const conn = getBluetoothConnection()
   if (!conn || conn.deviceType !== 'classic' || conn.transportMode !== 'native-plugin') {
@@ -884,13 +1193,40 @@ function sendViaNativeClassicPlugin (
   if (!base64) {
     return Promise.reject(new Error('BASE64_ENCODE_FAILED'))
   }
+  const writeTimeoutMs = options.writeTimeoutMs
+    ?? Math.min(600000, Math.max(45000, estimateClassicSendTimeoutMs(data.length)))
   if (onProgress) onProgress(5)
+  let waitVisual = 5
+  const waitKeepAlive = onProgress
+    ? setInterval(() => {
+        if (waitVisual >= 95) return
+        waitVisual = Math.min(95, waitVisual + 1)
+        onProgress(waitVisual)
+      }, 1200)
+    : null
   return printNativeCommandBytes({
     deviceId: conn.deviceId,
     deviceName: conn.deviceName,
     base64,
-  }).then(() => {
-    if (onProgress) onProgress(100)
+  }).then(async () => {
+    printRunDiag('native_printCommandBytes_queued', { dataBytes: data.length })
+    try {
+      const verified = await waitForNativeCommandBytesWriteComplete(writeTimeoutMs, (waitPct) => {
+        if (onProgress) {
+          const p = Math.max(waitVisual, 8 + Math.round(waitPct * 0.9))
+          waitVisual = p
+          onProgress(p)
+        }
+      })
+      printRunDiag('native_printCommandBytes_verified', {
+        writeMs: verified.writeMs,
+        commandBytes: verified.commandBytes,
+        stage: verified.stage,
+      })
+      if (onProgress) onProgress(100)
+    } finally {
+      if (waitKeepAlive) clearInterval(waitKeepAlive)
+    }
   })
 }
  
@@ -1071,6 +1407,7 @@ function sendViaBuiltin (data: number[]): Promise&lt;void&gt; {
               console.log('[builtin] connected on port ' + port)
               uni.setStorageSync(STORAGE_BUILTIN_PORT, String(port))
               moeTcp.sendHexStr({ message: hexStr })
+              printRunDiag('builtin_tcp_sent', { port, dataBytes: data.length })
               setTimeout(() => {
                 try { moeTcp.disconnect() } catch (_) {}
                 resolve()
@@ -1088,11 +1425,20 @@ function sendViaBuiltin (data: number[]): Promise&lt;void&gt; {
     // rk3568 类一体机：优先走 UnifiedPOS 内置/串口直打（无需蓝牙配对、无需 localhost 端口服务）
     const fingerprint = getDeviceFingerprint()
     const uposOptions = getUposOptionsFromStorage()
+    const isD320faxDevice = isD320faxAioDevice()
     const matchesKeywords = !!fingerprint
       && (fingerprint.includes('rk3568') || fingerprint.includes('aoa_rk3568'))
+    const virtualBtLinked = isVirtualBtBluetoothConnection()
     const uposSupported = isNativeUposPrintSupported()
-    const shouldTryUpos = uposSupported && (uposOptions.force || matchesKeywords)
-    const shouldPreferTcpFirst = matchesKeywords && !uposOptions.force && uposOptions.prefer !== 'serial'
+    const shouldTryUpos = uposSupported && (
+      uposOptions.force
+      || (matchesKeywords && !isD320faxDevice)
+      || (getPrinterType() === 'builtin' && !isD320faxDevice && !virtualBtLinked)
+    )
+    const shouldPreferTcpFirst = (matchesKeywords || isD320faxDevice)
+      && !uposOptions.force
+      && uposOptions.prefer !== 'serial'
+      && !virtualBtLinked
     console.warn(
       '[builtin] route decision'
       + ' fingerprint=' + String(fingerprint || '-')
@@ -1173,9 +1519,25 @@ function sendViaBuiltin (data: number[]): Promise&lt;void&gt; {
         }
       })
  
-      return uposJob.catch((e: any) => {
+      return uposJob.catch(async (e: any) => {
         const msg = e instanceof Error ? e.message : String(e || 'UPOS_PRINT_FAILED')
-        printRunDiag('builtin_upos_fail_fallback_tcp', { err: msg.slice(0, 240), waitMs: Date.now() - tUpos })
+        printRunDiag('builtin_upos_fail_fallback', { err: msg.slice(0, 240), waitMs: Date.now() - tUpos })
+
+        if (isVirtualBtBluetoothConnection()) {
+          try {
+            await sendViaVirtualBtTsc(data, onProgress)
+            return
+          } catch (gErr: any) {
+            const gMsg = gErr instanceof Error ? gErr.message : String(gErr || 'VIRTUAL_BT_TSC_FAILED')
+            throw new Error(`UPOS failed (${msg}); Virtual BT TSC failed (${gMsg})`)
+          }
+        }
+
+        if (isD320faxAioDevice()) {
+          console.warn('[builtin] D320FAX UPOS failed, fallback localhost TCP', msg)
+          return sendViaBuiltinTcpLocalhost()
+        }
+
         console.warn('[builtin] UPOS failed/timeout, fallback localhost TCP', msg)
         return sendViaBuiltinTcpLocalhost()
       })
@@ -6,6 +6,11 @@ import {
   shouldRasterizeTextElement,
 } from './nativeBitmapPatch'
 import { applyTemplateData } from './templateRenderer'
+import {
+  isPrintInputLiteralField,
+  resolvePrintInputLiteralDisplay,
+} from '../labelPreview/printInputOffset'
+import { readElementBorder } from '../textElementLayout'
 import type {
   EscTemplateItem,
   LabelTemplateData,
@@ -37,6 +42,10 @@ function templateWidthPx (template: SystemLabelTemplate): number {
   return toMillimeter(template.width, template.unit || 'inch') / 25.4 * DESIGN_DPI
 }
  
+function templateHeightPx (template: SystemLabelTemplate): number {
+  return toMillimeter(template.height, template.unit || 'inch') / 25.4 * DESIGN_DPI
+}
+
 function pxToDots (value: number, dpi: number): number {
   return Math.max(0, Math.round((Number(value) || 0) * dpi / DESIGN_DPI))
 }
@@ -167,6 +176,9 @@ function resolveElementText (
   element: SystemTemplateElementBase,
   data: LabelTemplateData
 ): string {
+  if (isPrintInputLiteralField(element)) {
+    return resolvePrintInputLiteralDisplay(element)
+  }
   const config = element.config || {}
   const type = String(element.type || '').toUpperCase()
   const hasText = config.text != null && config.text !== ''
@@ -249,7 +261,11 @@ function toEscAlign (align: SystemTemplateTextAlign): 0 | 1 | 2 {
 }
  
 function resolveRotation (value?: string): number {
-  return value === 'vertical' ? 90 : 0
+  const rotation = String(value || 'horizontal').trim().toLowerCase()
+  if (rotation === 'vertical' || rotation === 'left' || rotation === 'rotate-left' || rotation === 'left90') return 90
+  if (rotation === 'right' || rotation === 'rotate-right' || rotation === 'right90') return 270
+  if (rotation === 'rotate180' || rotation === '180' || rotation === 'down' || rotation === 'inverted') return 180
+  return 0
 }
  
 function normalizeQrLevel (value?: string): 'L' | 'M' | 'Q' | 'H' {
@@ -334,14 +350,30 @@ function sanitizeTextForTscBuiltinFont (text: string): string {
 }
  
 /** 估算 TSC 项底部点坐标，用于避免 SIZE 高度略小于内容时裁掉最后一行（常见于底部价格） */
+/** 整标签纸外框（配置区 Border，与元素 border 不同） */
+function pushTemplatePaperBorderIfNeeded (
+  items: TscTemplateItem[],
+  template: SystemLabelTemplate,
+  dpi: number
+) {
+  const border = String(template.border || '').toLowerCase()
+  if (border !== 'line' && border !== 'dotted') return
+  items.push({
+    type: 'box',
+    x: 0,
+    y: 0,
+    width: Math.max(1, pxToDots(templateWidthPx(template), dpi)),
+    height: Math.max(1, pxToDots(templateHeightPx(template), dpi)),
+    lineWidth: border === 'dotted' ? 2 : 3,
+  })
+}
+
 function pushElementBorderBoxIfNeeded (
   items: TscTemplateItem[],
   element: SystemTemplateElementBase,
   dpi: number
 ) {
-  const type = String(element.type || '').toUpperCase()
-  if (type === 'BLANK') return
-  const border = String(element.border || '').toLowerCase()
+  const border = readElementBorder(element)
   if (border !== 'line' && border !== 'dotted') return
   items.push({
     type: 'box',
@@ -391,6 +423,7 @@ function buildTscTemplate (
   const items: TscTemplateItem[] = []
  
   const pageWidth = templateWidthPx(template)
+  pushTemplatePaperBorderIfNeeded(items, template, dpi)
  
   sortElements(template.elements).forEach((element) => {
     const config = element.config || {}
@@ -421,7 +454,7 @@ function buildTscTemplate (
         options.allowCurrencyBitmapWhenDisabled !== false &&
         (currencyGlyph || type === 'TEXT_PRICE')
       const tryTextBitmap =
-        shouldRasterizeTextElement(text, type) &&
+        shouldRasterizeTextElement(text, type, config) &&
         (!options.disableBitmapText || allowBitmapWhenDisabled)
       if (tryTextBitmap) {
         const bitmapPatch = createTextBitmapPatch({
@@ -527,16 +560,6 @@ function buildTscTemplate (
       if (bitmapPatch) items.push(bitmapPatch)
       return
     }
-
-    if (type === 'BLANK' && String(element.border || '').toLowerCase() === 'line') {
-      items.push({
-        type: 'bar',
-        x: pxToDots(element.x, dpi),
-        y: pxToDots(element.y, dpi),
-        width: Math.max(1, pxToDots(element.width, dpi)),
-        height: Math.max(1, pxToDots(element.height || 1, dpi)),
-      })
-    }
   })
  
   const maxBottomDots = items.reduce(
@@ -627,7 +650,7 @@ function buildEscTemplate (
       return
     }
  
-    if (type === 'BLANK' && String(element.border || '').toLowerCase() === 'line') {
+    if (type === 'BLANK' && readElementBorder(element) === 'line') {
       items.push({
         type: 'rule',
         width: clamp(element.width / 8, 8, 48),
@@ -125,6 +125,43 @@ export function templateSizeToMillimeters (
   return { widthMm, heightMm }
 }
  
+/** 设计画布像素（96dpi 坐标系）→ 物理毫米，与 Web unitToPx / App toCanvasPx 一致 */
+export function designCanvasPxToMillimeters (
+  cw: number,
+  ch: number,
+): { widthMm: number; heightMm: number } {
+  return {
+    widthMm: Math.round(((cw / DESIGN_DPI) * 25.4) * 10) / 10,
+    heightMm: Math.round(((ch / DESIGN_DPI) * 25.4) * 10) / 10,
+  }
+}
+
+/** 光栅出纸像素（printDpi）→ 物理毫米，SIZE 与位图一致，各机型比例统一 */
+export function rasterDotsToMillimeters (
+  widthDots: number,
+  heightDots: number,
+  printDpi: number,
+): { widthMm: number; heightMm: number } {
+  const dpi = Math.max(1, printDpi)
+  return {
+    widthMm: Math.round(((widthDots / dpi) * 25.4) * 10) / 10,
+    heightMm: Math.round(((heightDots / dpi) * 25.4) * 10) / 10,
+  }
+}
+
+/**
+ * 预览 / 打印共用设计画布尺寸（与后台 LabelCanvas unitToPx 同一坐标系）。
+ * 默认用模板根 height，与后台预览一致；不再对 ESC 单独裁 content 高度。
+ */
+export function resolveLabelDesignCanvasPx (
+  template: Pick<SystemLabelTemplate, 'unit' | 'width' | 'height'>,
+): { cw: number; ch: number } {
+  const unit = String(template.unit || 'inch')
+  const cw = Math.max(40, Math.round(toCanvasPx(Number(template.width) || 2, unit)))
+  const ch = Math.max(40, Math.round(toCanvasPx(Number(template.height) || 2, unit)))
+  return { cw, ch }
+}
+
 export function isTemplateWithinNativeFastPrintBounds (
   template: Pick<SystemLabelTemplate, 'unit' | 'width' | 'height'>
 ): boolean {
@@ -262,8 +262,8 @@ export function buildTscImageLabel (
   add(`SIZE ${roundMm(widthMm)} mm,${roundMm(heightMm)} mm`)
   add('GAP 0 mm,0 mm')
   add('CODEPAGE 1252')
-  add('DENSITY 14')
-  add('SPEED 5')
+  add(`DENSITY ${Math.max(0, Math.min(15, Math.round(options.density ?? 14)))}`)
+  add(`SPEED ${Math.max(1, Math.min(10, Math.round(options.printSpeed ?? 5)))}`)
   add('CLS')
   addCommandBytes(out, `BITMAP ${x},${y},${bytesPerRow},${image.height},0,`)
   for (let i = 0; i < bitmapBytes.length; i++) out.push(bitmapBytes[i])
@@ -23,6 +23,12 @@ export interface LabelPrintPayload {
 export interface PrintImageOptions {
   printQty?: number
   threshold?: number
+  /** TSC 打印浓度 0–15；含黑底白字时略降可减轻热敏渗墨 */
+  density?: number
+  /** TSC 打印速度；略降可减轻黑底内白字糊化 */
+  printSpeed?: number
+  /** 光栅后对白字区域做 1px 膨胀，减轻热敏黑底渗墨导致白字发糊 */
+  sharpenInvertedText?: boolean
   maxWidthDots?: number
   targetWidthDots?: number
   targetHeightDots?: number
@@ -62,7 +68,8 @@ export interface RawImageDataSource {
 export type LabelTemplateValue = string | number
 export type LabelTemplateData = Record<string, LabelTemplateValue>
 export type PrinterTemplateUnit = 'inch' | 'mm' | 'cm' | 'px'
-export type SystemTemplateRotation = 'horizontal' | 'vertical'
+export type SystemTemplateRotation = 'horizontal' | 'vertical' | 'left' | 'right' | 'rotate180'
+export type SystemTemplatePrintOrientation = 'horizontal' | 'vertical'
 export type SystemTemplateTextAlign = 'left' | 'center' | 'right'
  
 export interface SystemTemplateElementBase {
@@ -91,6 +98,10 @@ export interface SystemLabelTemplate {
   appliedLocation?: string
   showRuler?: boolean
   showGrid?: boolean
+  /** 整标签外框：none / line / dotted */
+  border?: string
+  /** vertical=竖打（默认）；horizontal=横打（内容整体旋转 90°，纸张 W×H 不变） */
+  printOrientation?: SystemTemplatePrintOrientation
   elements: SystemTemplateElementBase[]
 }
  
@@ -4,7 +4,14 @@ import {
   sortElementsForPreview,
 } from './labelPreview/normalizePreviewTemplate'
 import {
+  isCorruptedDateDisplayFormat,
+  isWeekdayBarElement,
+  parseStoredPrintInputOffset,
+  resolveWeekdayDisplayForElement,
+} from './labelPreview/printInputOffset'
+import {
   canPrintCurrentLabelViaNativeFastJob,
+  getCurrentPrinterSummary,
   printLabelPrintJobPayloadForCurrentPrinter,
   printSystemTemplateForCurrentPrinter,
   type SystemTemplatePrintCanvasRasterOptions,
@@ -14,14 +21,17 @@ import {
   setLastLabelPrintJobPayload,
 } from './labelPreview/buildLabelPrintPayload'
 import { getCurrentStoreId } from './stores'
-import { ensureNativeClassicTransportIfPossible } from './print/printerConnection'
+import { ensureNativeClassicTransportIfPossible, getBluetoothConnection, preferBuiltinPrinterOnAioDevice } from './print/printerConnection'
+import { isVirtualBtPrinterDeviceName } from './print/bluetoothPrinterAllowlist'
 import {
   hydrateSystemTemplateImagesForPrint,
   resetHydrateImageDebugRecords,
 } from './print/hydrateTemplateImagesForPrint'
 import {
   normalizeTemplateForNativeFastJob,
+  templateHasDateTimeElements,
   templateHasUnsupportedNativeFastElements,
+  templateRequiresCanvasStyleFidelity,
 } from './print/nativeTemplateElementSupport'
 import {
   ensureTemplateHeightCoversElements,
@@ -60,11 +70,35 @@ function formatPriceLineForBake (config: Record&lt;string, any&gt;, rawText: string): 
   return `${prefix}${value}${suffix}`
 }
  
+function parseReprintBaseTime (row: PrintLogItemDto): Date {
+  const raw = String(row.printedAt ?? '').trim()
+  if (raw) {
+    const d = new Date(raw)
+    if (!Number.isNaN(d.getTime())) return d
+  }
+  return new Date()
+}
+
+/** 重打快照里已算好的展示文案（优先 __previewFormatted，其次 config.text） */
+function readReprintSnapshotLine (cfg: Record<string, any>): string {
+  for (const key of ['__previewFormatted', '__PreviewFormatted', 'text', 'Text'] as const) {
+    const raw = String(cfg[key] ?? '').trim()
+    if (!raw) continue
+    if (parseStoredPrintInputOffset(raw)) continue
+    if (isCorruptedDateDisplayFormat(raw)) continue
+    return raw
+  }
+  return ''
+}
+
 /**
  * 原生快打插件对 TEXT_PRODUCT / TEXT_PRICE / DATE 等仍会按类型做绑定；重打时 dataJson 为空，
  * 必须把接口/落库快照里已填好的展示值焙成 TEXT_STATIC，否则会出现第二行商品名、价格 0、日期成 format 等问题。
  */
-export function bakeReprintTemplateSnapshot (tmpl: SystemLabelTemplate): SystemLabelTemplate {
+export function bakeReprintTemplateSnapshot (
+  tmpl: SystemLabelTemplate,
+  reprintBaseTime: Date = new Date(),
+): SystemLabelTemplate {
   const elements = (tmpl.elements || []).map((el) => {
     const vst = String(el.valueSourceType || '').toUpperCase()
     const type = String(el.type || '').toUpperCase()
@@ -74,9 +108,47 @@ export function bakeReprintTemplateSnapshot (tmpl: SystemLabelTemplate): SystemL
       ...el,
       type: 'TEXT_STATIC',
       valueSourceType: 'FIXED',
-      config: { ...cfg, text: line, Text: line },
+      config: {
+        ...cfg,
+        text: line,
+        Text: line,
+        __previewFormatted: line,
+        __PreviewFormatted: line,
+      },
     })
  
+    /** 黑条星期：快照有 FRIDAY 等则冻结；仅有偏移 JSON 时按原打印时刻 + 偏移还原 */
+    if (isWeekdayBarElement({ ...el, config: cfg })) {
+      let line = readReprintSnapshotLine(cfg)
+      if (!line) {
+        try {
+          const live = resolveWeekdayDisplayForElement({ ...el, config: cfg }, reprintBaseTime)
+          if (live && !isCorruptedDateDisplayFormat(live)) line = live
+        } catch {
+          /* ignore */
+        }
+      }
+      if (line) return toStatic(line)
+    }
+
+    /** 快照里 DATE/TIME/DURATION 的 config.text 已是当时出纸值；重打禁止再按 now 重算 */
+    if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
+      const line = readReprintSnapshotLine(cfg)
+      if (line) return toStatic(line)
+    }
+
+    if (type === 'WEIGHT') {
+      const line =
+        readReprintSnapshotLine(cfg)
+        || (() => {
+          const v = String(cfg.value ?? cfg.Value ?? '').trim()
+          const u = String(cfg.unit ?? cfg.Unit ?? '').trim()
+          if (v && u) return v.endsWith(u) ? v : `${v}${u}`
+          return v || u
+        })()
+      if (line) return toStatic(line)
+    }
+
     if (vst === 'FIXED') {
       if (type === 'TEXT_PRODUCT' || type === 'TEXT_CATEGORY' || type === 'TEXT_LABEL_ID') {
         const t = String(cfg.text ?? cfg.Text ?? '').trim()
@@ -97,10 +169,6 @@ export function bakeReprintTemplateSnapshot (tmpl: SystemLabelTemplate): SystemL
     }
  
     if (vst === 'PRINT_INPUT') {
-      if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
-        const textVal = String(cfg.text ?? cfg.Text ?? '').trim()
-        if (textVal) return toStatic(textVal)
-      }
       if (type === 'WEIGHT') {
         const textVal = String(cfg.text ?? cfg.Text ?? '').trim()
         const v = String(cfg.value ?? cfg.Value ?? '').trim()
@@ -149,7 +217,8 @@ export function bakeReprintTemplateSnapshot (tmpl: SystemLabelTemplate): SystemL
  *    normalizeLabelTemplateFromPreviewApi 只读 e.config，会得到空 config，打印全空。
  */
 function inferElementTypeFromPrintSnapshotConfig (cfg: Record<string, unknown>): string {
-  const inputType = String(cfg.inputType ?? '').toLowerCase()
+  const inputType = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+  if (inputType === 'number' || inputType === 'text') return 'TEXT_STATIC'
   const hasUnit = cfg.unit != null || cfg.Unit != null
   const hasValue = cfg.value != null || cfg.Value != null
   if (hasUnit && hasValue) return 'WEIGHT'
@@ -237,6 +306,25 @@ function elementFromPrintDataItem (
       base.id = item.elementId
       base.Id = item.elementId
     }
+    const cfgRaw = base.config ?? base.Config ?? base.ConfigJson ?? base.configJson
+    let cfg: Record<string, unknown>
+    if (cfgRaw != null && typeof cfgRaw === 'object' && !Array.isArray(cfgRaw)) {
+      cfg = { ...(cfgRaw as Record<string, unknown>) }
+    } else if (typeof cfgRaw === 'string' && cfgRaw.trim()) {
+      try {
+        cfg = JSON.parse(cfgRaw) as Record<string, unknown>
+      } catch {
+        cfg = {}
+      }
+    } else {
+      cfg = {}
+    }
+    const elType = String(
+      base.type ?? base.Type ?? base.elementType ?? base.ElementType ?? inferElementTypeFromPrintSnapshotConfig(cfg),
+    )
+    applyRenderValueToSnapshotConfig(cfg, elType, item.renderValue)
+    base.config = cfg
+    base.Config = cfg
     return base
   }
  
@@ -356,12 +444,20 @@ async function printReprintTemplateWithPreviewStrategy (
   options: PrintFromPrintLogOptions,
 ): Promise<void> {
   await ensureNativeClassicTransportIfPossible()
+  preferBuiltinPrinterOnAioDevice()
   const templateData = labelTemplateDataForSnapshotReprint()
   const printInputJson: Record<string, unknown> = {}
   const tmplSized = ensureTemplateHeightCoversElements(tmpl)
   const tmplForNative = normalizeTemplateForNativeFastJob(tmplSized, printInputJson as any)
+  const summary = getCurrentPrinterSummary()
+  const conn = getBluetoothConnection()
+  const mustUseCanvasRaster =
+    summary.type === 'builtin'
+    || templateRequiresCanvasStyleFidelity(tmplSized)
+    || templateHasDateTimeElements(tmplSized)
   const useNative =
-    canPrintCurrentLabelViaNativeFastJob()
+    !mustUseCanvasRaster
+    && canPrintCurrentLabelViaNativeFastJob()
     && isTemplateWithinNativeFastPrintBounds(tmplSized)
     && !templateHasUnsupportedNativeFastElements(tmplForNative)
  
@@ -439,8 +535,9 @@ export async function printFromPrintDataListRow (
   }
  
   const templateData = labelTemplateDataForSnapshotReprint()
+  const reprintBase = parseReprintBaseTime(row)
   tmpl = overlayReprintResolvedFields(tmpl, row, templateData)
-  tmpl = bakeReprintTemplateSnapshot(tmpl)
+  tmpl = bakeReprintTemplateSnapshot(tmpl, reprintBase)
  
   tmpl = {
     ...tmpl,
@@ -571,8 +668,9 @@ export async function printFromMergedTemplateJsonString (
     throw new Error('Cannot parse merged template')
   }
   const templateData = labelTemplateDataForSnapshotReprint()
+  const reprintBase = parseReprintBaseTime(row)
   tmpl = overlayReprintResolvedFields(tmpl, row, templateData)
-  tmpl = bakeReprintTemplateSnapshot(tmpl)
+  tmpl = bakeReprintTemplateSnapshot(tmpl, reprintBase)
   tmpl = {
     ...tmpl,
     elements: sortElementsForPreview(tmpl.elements || []),
 import { buildApiUrl, getStaticMediaOrigin } from './apiBase'
  
-/** 相对路径拼后端根（含 H5 开发时的静态资源域名）；绝对 URL / data URL 原样返回 */
+/** 相对路径拼后端根；绝对 URL / data URL 原样返回 */
 export function resolveMediaUrlForApp(stored: string | null | undefined): string {
   const s = (stored ?? '').trim()
   if (!s) return ''
+export type SmartScaleReadKind = 'tared' | 'gross'
+
+const STORAGE_IP = 'smart_scale_ip'
+const STORAGE_PORT = 'smart_scale_port'
+const DEFAULT_IP = '127.0.0.1'
+const DEFAULT_PORT = 6900
+const READ_TIMEOUT_MS = 4000
+
+type MoeTcpPlugin = {
+  connect: (opts: { ip: string; port: number }, cb: (res: { code?: number; msg?: string }) => void) => void
+  disconnect: () => void
+  sendStr: (opts: { message: string }) => void
+  onReceive: (cb: (res: { code?: number; data?: string; msg?: string }) => void) => void
+  onDisconnect: (cb: (res: unknown) => void) => void
+}
+
+function getTcpPlugin(): MoeTcpPlugin | null {
+  // #ifdef APP-PLUS
+  try {
+    const u = uni as any
+    return u?.requireNativePlugin ? (u.requireNativePlugin('moe-tcp-client') as MoeTcpPlugin) : null
+  } catch {
+    return null
+  }
+  // #endif
+  // #ifndef APP-PLUS
+  return null
+  // #endif
+}
+
+function readScaleSettings(): { ip: string; port: number } {
+  let ip = DEFAULT_IP
+  let port = DEFAULT_PORT
+  try {
+    const storedIp = uni.getStorageSync(STORAGE_IP)
+    const storedPort = uni.getStorageSync(STORAGE_PORT)
+    if (storedIp) ip = String(storedIp).trim() || ip
+    const p = Number(storedPort)
+    if (Number.isFinite(p) && p > 0) port = p
+  } catch {
+    /* ignore */
+  }
+  return { ip, port }
+}
+
+function parseWeightFromMessage(msg: string): string | null {
+  const text = String(msg ?? '').replace(/,/g, '.')
+  const matches = text.match(/-?\d+(?:\.\d+)?/g)
+  if (!matches?.length) return null
+  const last = matches[matches.length - 1]
+  const n = Number(last)
+  if (!Number.isFinite(n)) return null
+  return String(n)
+}
+
+function connectTcp(plugin: MoeTcpPlugin, ip: string, port: number): Promise<void> {
+  return new Promise((resolve, reject) => {
+    plugin.connect({ ip, port }, (res) => {
+      if (res?.code === 1) resolve()
+      else reject(new Error(res?.msg || 'Could not connect to smart scale.'))
+    })
+  })
+}
+
+/** Read weight from smart scale (TCP). `tared` sends tare then reads net; `gross` reads gross. */
+export async function readWeightFromSmartScale(kind: SmartScaleReadKind): Promise<string> {
+  const plugin = getTcpPlugin()
+  if (!plugin) {
+    throw new Error('Smart scale is only available in the mobile app.')
+  }
+
+  const { ip, port } = readScaleSettings()
+  let latest: string | null = null
+  let settled = false
+
+  return new Promise<string>((resolve, reject) => {
+    const finish = (err?: Error) => {
+      if (settled) return
+      settled = true
+      try {
+        plugin.onReceive(() => {})
+        plugin.onDisconnect(() => {})
+        plugin.disconnect()
+      } catch {
+        /* ignore */
+      }
+      if (err) reject(err)
+      else if (latest) resolve(latest)
+      else reject(new Error('No weight reading received from scale.'))
+    }
+
+    const timer = setTimeout(() => finish(new Error('Smart scale read timed out.')), READ_TIMEOUT_MS)
+
+    plugin.onReceive((res) => {
+      if (res?.code !== 1) return
+      const parsed = parseWeightFromMessage(String(res.data ?? ''))
+      if (parsed) latest = parsed
+    })
+
+    plugin.onDisconnect(() => {
+      if (!settled && latest) {
+        clearTimeout(timer)
+        finish()
+      }
+    })
+
+    connectTcp(plugin, ip, port)
+      .then(() => {
+        if (kind === 'tared') {
+          try {
+            plugin.sendStr({ message: 'T\r\n' })
+          } catch {
+            /* ignore */
+          }
+          setTimeout(() => {
+            try {
+              plugin.sendStr({ message: 'W\r\n' })
+            } catch {
+              /* ignore */
+            }
+          }, 600)
+        } else {
+          try {
+            plugin.sendStr({ message: 'W\r\n' })
+          } catch {
+            /* ignore */
+          }
+        }
+      })
+      .catch((e) => {
+        clearTimeout(timer)
+        finish(e instanceof Error ? e : new Error(String(e)))
+      })
+
+    const poll = setInterval(() => {
+      if (latest && !settled) {
+        clearInterval(poll)
+        clearTimeout(timer)
+        finish()
+      }
+    }, 200)
+  })
+}
@@ -207,6 +207,28 @@ export async function hasOfflineCache(module: string, name: string): Promise&lt;boo
   return rows.length > 0
 }
  
+/** 离线读缓存：匹配以 prefix 开头的 cache_name（兼容旧版 preview 键带 baseTime 后缀） */
+async function findOfflineCacheKeyByPrefix(module: string, namePrefix: string): Promise<string | null> {
+  if (!namePrefix) return null
+  if (!isAppSqliteAvailable()) {
+    const map = getStorageMap<{ module: string; name: string }>(FALLBACK_CACHE_KEY)
+    for (const row of Object.values(map)) {
+      const m = String((row as { module?: string }).module || '')
+      const n = String((row as { name?: string }).name || '')
+      if (m === module && n.startsWith(namePrefix)) return n
+    }
+    return null
+  }
+  await initOfflineSqlite()
+  const rows = await sqliteSelect(
+    `SELECT cache_name FROM ${CACHE_TABLE}
+     WHERE module_name='${esc(module)}' AND cache_name LIKE '${esc(namePrefix)}%'
+     ORDER BY updated_at DESC LIMIT 1`
+  )
+  const hit = rows?.[0]?.cache_name
+  return hit != null && String(hit).trim() ? String(hit) : null
+}
+
 export async function getOfflineCache<T = unknown>(module: string, name: string): Promise<T | null> {
   const key = cachePk(module, name)
   if (!isAppSqliteAvailable()) {
@@ -399,6 +421,14 @@ export async function fetchWithOfflineCache&lt;T&gt;(
   if (await hasOfflineCache(module, name)) {
     return (await getOfflineCache<T>(module, name)) as T
   }
+  /** 兼容旧版 preview 缓存键（含 baseTime 分钟桶） */
+  if (name.startsWith('preview:')) {
+    const legacyPrefix = `${name}:`
+    const legacyHit = await findOfflineCacheKeyByPrefix(module, legacyPrefix)
+    if (legacyHit) {
+      return (await getOfflineCache<T>(module, legacyHit)) as T
+    }
+  }
   throw new Error('No offline cache available')
 }
  
+/** 文本控件在元素框内的垂直对齐（config.verticalAlign） */
+export type TextVerticalAlign = 'top' | 'center' | 'bottom'
+
+export function readVerticalAlign(
+  config: Record<string, unknown> | undefined | null,
+): TextVerticalAlign {
+  const raw = config?.verticalAlign ?? config?.VerticalAlign
+  const v = String(raw ?? 'top').trim().toLowerCase()
+  if (v === 'center' || v === 'middle') return 'center'
+  if (v === 'bottom') return 'bottom'
+  return 'top'
+}
+
+export function computeVerticalTextBlockOffset(
+  innerHeight: number,
+  blockHeight: number,
+  verticalAlign: TextVerticalAlign,
+): number {
+  const extra = Math.max(0, innerHeight - blockHeight)
+  if (verticalAlign === 'center') return Math.floor(extra / 2)
+  if (verticalAlign === 'bottom') return extra
+  return 0
+}
+
+export function readFontWeight(
+  config: Record<string, unknown> | undefined | null,
+): 'normal' | 'bold' {
+  const raw = config?.fontWeight ?? config?.FontWeight
+  const v = String(raw ?? 'normal').trim().toLowerCase()
+  return v === 'bold' || v === '700' || v === 'bolder' ? 'bold' : 'normal'
+}
+
+export function readFontStyle(
+  config: Record<string, unknown> | undefined | null,
+): 'normal' | 'italic' {
+  const raw = config?.fontStyle ?? config?.FontStyle
+  const v = String(raw ?? 'normal').trim().toLowerCase()
+  return v === 'italic' || v === 'oblique' ? 'italic' : 'normal'
+}
+
+export function readTextDecoration(
+  config: Record<string, unknown> | undefined | null,
+): 'none' | 'underline' {
+  const raw = config?.textDecoration ?? config?.TextDecoration
+  const v = String(raw ?? 'none').trim().toLowerCase()
+  return v.includes('underline') ? 'underline' : 'none'
+}
+
+export function readElementBorder(
+  el: {
+    border?: string | null
+    Border?: string | null
+    BorderType?: string | null
+    borderType?: string | null
+  },
+): string {
+  const raw = el.border ?? el.Border ?? el.BorderType ?? el.borderType ?? 'none'
+  return String(raw).trim().toLowerCase() || 'none'
+}
+
+/** 元素 rotation（兼容大小写） */
+export function readElementRotation(
+  el: { rotation?: string | null; Rotation?: string | null },
+): 'horizontal' | 'vertical' | 'right' | 'rotate180' {
+  const v = String(el.rotation ?? el.Rotation ?? 'horizontal').trim().toLowerCase()
+  if (v === 'vertical' || v === 'left' || v === 'rotate-left' || v === 'left90') return 'vertical'
+  if (v === 'right' || v === 'rotate-right' || v === 'right90') return 'right'
+  if (v === 'rotate180' || v === '180' || v === 'down' || v === 'inverted') return 'rotate180'
+  return 'horizontal'
+}
+
+export function elementRotationDegrees(
+  el: { rotation?: string | null; Rotation?: string | null },
+): 0 | -90 | 90 | 180 {
+  const rotation = readElementRotation(el)
+  if (rotation === 'vertical') return -90
+  if (rotation === 'right') return 90
+  if (rotation === 'rotate180') return 180
+  return 0
+}
+
+/** 与 renderLabelPreviewCanvas lineHeightForTextElement 一致 */
+export function textElementLineHeightPx(fontSize: number, isDateTimeType = false): number {
+  return isDateTimeType
+    ? Math.max(fontSize + 2, Math.round(fontSize * 1.2))
+    : Math.max(fontSize + 2, Math.round(fontSize * 1.25))
+}
+
+/** 矮框内固定文案：强制单行，避免折行后仅显示第一行 */
+export function isShortSingleLineTextBox(
+  boxHeightPx: number,
+  fontSize: number,
+  text: string,
+  opts?: { breakAll?: boolean },
+): boolean {
+  if (opts?.breakAll) return false
+  if (String(text ?? '').includes('\n')) return false
+  const lineH = textElementLineHeightPx(fontSize, false)
+  const descentPad = Math.max(2, Math.round(fontSize * 0.14))
+  const maxLines = Math.max(
+    1,
+    Math.floor((Math.max(0, boxHeightPx) + descentPad) / lineH),
+  )
+  return maxLines <= 1
+}
+export type WeightInputMode = 'net' | 'tare'
+
+export function readWeightInputMode(cfg: Record<string, unknown> | undefined | null): WeightInputMode {
+  const v = String(cfg?.weightInputMode ?? cfg?.WeightInputMode ?? 'net')
+    .trim()
+    .toLowerCase()
+  return v === 'tare' ? 'tare' : 'net'
+}
+
+export function formatWeightDisplay(rawValue: string, unit: string): string {
+  const raw = String(rawValue ?? '').trim()
+  const u = String(unit ?? '').trim()
+  if (!raw) return ''
+  if (u && !raw.endsWith(u)) return `${raw}${u}`
+  return raw
+}
+
+export function weightInputPlaceholder(mode: WeightInputMode): string {
+  return mode === 'tare' ? 'Tare weight' : 'Net weight'
+}
 import { defineConfig } from "vite";
 import uni from "@dcloudio/vite-plugin-uni";
  
-/** 与 src/utils/apiBase.ts 中 US_BACKEND_ORIGIN_FALLBACK 保持一致 */
-const US_DEV_BACKEND = "http://flus-test.3ffoodsafety.com";
-
 // 仅 App：相对路径，避免打包后 www/_uniappview.html 无法打开
+// API 直连后端，见 .env.development / .env.production 中的 VITE_US_API_BASE
 // https://vitejs.dev/config/
 export default defineConfig({
   base: "./",
   plugins: [uni()],
   server: {
     open: "/",
-    proxy: {
-      "/api": {
-        target: US_DEV_BACKEND,
-        changeOrigin: true,
-      },
-      /** 若某处仍使用相对路径 /picture（未走 getStaticMediaOrigin），可经代理访问后端静态资源 */
-      "/picture": {
-        target: US_DEV_BACKEND,
-        changeOrigin: true,
-      },
-    },
   },
 });
 <script lang="ts" setup>
-import type { LabelTemplateDto, LabelTypeDto, ProductDto } from '#/api/food-labeling/types';
+import type { LabelCategoryDto, LabelTemplateDto, LabelTypeDto, ProductDto } from '#/api/food-labeling/types';
+import type { AccountLocationDto, GroupListItemDto, PartnerDto } from '#/api/food-labeling/account-types';
+import type { ProductCategoryDto } from '#/api/food-labeling/product-types';
  
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -8,11 +10,17 @@ import { Page } from &#39;@vben/common-ui&#39;;
 import { $t } from '@vben/locales';
  
 import { ArrowLeftOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
-import { Input, InputNumber, message, Select, Table } from 'ant-design-vue';
+import { Input, InputNumber, message, Select, Switch, Table } from 'ant-design-vue';
  
+import { labelAdd } from '#/api/food-labeling/label';
+import { labelCategoryList } from '#/api/food-labeling/label-category';
 import { labelTemplateInfo, labelTemplateUpdate } from '#/api/food-labeling/label-template';
 import { labelTypeList } from '#/api/food-labeling/label-type';
+import { groupList } from '#/api/food-labeling/group';
+import { locationCrudList } from '#/api/food-labeling/location';
+import { partnerList } from '#/api/food-labeling/partner';
 import { productList } from '#/api/food-labeling/product';
+import { productCategoryList } from '#/api/food-labeling/product-category';
  
 import {
   appliedLocationToEditor,
@@ -50,8 +58,15 @@ import NutritionManualFieldControl from &#39;./nutrition-manual-field-control.vue&#39;;
  
 type TemplateDataEntryRow = {
   id: string;
+  partnerId: string;
+  regionIds: string[];
+  productCategoryId: string;
   productId: string;
+  labelName: string;
+  locationId: string;
+  labelCategoryId: string;
   labelTypeId: string;
+  state: boolean;
   fieldValues: Record<string, string>;
 };
  
@@ -69,7 +84,12 @@ const loading = ref(true);
 const saving = ref(false);
 const templateTitle = ref('');
 const templateDto = ref<LabelTemplateDto | null>(null);
+const partners = ref<PartnerDto[]>([]);
+const groups = ref<GroupListItemDto[]>([]);
+const locations = ref<AccountLocationDto[]>([]);
+const productCategories = ref<ProductCategoryDto[]>([]);
 const products = ref<ProductDto[]>([]);
+const labelCategories = ref<LabelCategoryDto[]>([]);
 const labelTypes = ref<LabelTypeDto[]>([]);
 const rows = ref<TemplateDataEntryRow[]>([]);
  
@@ -77,6 +97,22 @@ function newRowId(): string {
   return `row-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
 }
  
+function createEmptyRow(): TemplateDataEntryRow {
+  return {
+    id: newRowId(),
+    partnerId: '',
+    regionIds: [],
+    productCategoryId: '',
+    productId: '',
+    labelName: '',
+    locationId: '',
+    labelCategoryId: '',
+    labelTypeId: '',
+    state: true,
+    fieldValues: {},
+  };
+}
+
 const sortedTemplateElements = computed(() =>
   sortTemplateElementsForDisplay((templateDto.value?.elements ?? []) as EditorLabelElement[]),
 );
@@ -94,6 +130,36 @@ const dataColumns = computed((): DataColumn[] =&gt; {
   return cols;
 });
  
+const partnerOptions = computed(() =>
+  partners.value.map((p) => ({
+    value: p.id,
+    label: (p.partnerName ?? p.id ?? '').trim() || p.id,
+  })),
+);
+
+function groupOptionsForRow(row: Partial<TemplateDataEntryRow>) {
+  return groups.value
+    .filter((g) => !row.partnerId || g.partnerId === row.partnerId)
+    .map((g) => ({
+      value: g.id,
+      label: (g.groupName ?? g.id ?? '').trim() || g.id,
+    }));
+}
+
+function categoryOptionsForRow(row: Partial<TemplateDataEntryRow>) {
+  const regionSet = new Set(row.regionIds ?? []);
+  return productCategories.value
+    .filter((c) => {
+      const gids = c.groupIds ?? c.regionIds ?? [];
+      if (regionSet.size === 0) return true;
+      return gids.length === 0 || gids.some((id) => regionSet.has(id));
+    })
+    .map((c) => ({
+      value: c.id,
+      label: (c.categoryName ?? c.categoryCode ?? c.id ?? '').trim() || c.id,
+    }));
+}
+
 const productOptions = computed(() =>
   products.value.map((p) => ({
     value: p.id,
@@ -101,6 +167,48 @@ const productOptions = computed(() =&gt;
   })),
 );
  
+function productOptionsForRow(row: Partial<TemplateDataEntryRow>) {
+  const regionSet = new Set(row.regionIds ?? []);
+  return products.value
+    .filter((p) => {
+      if (row.productCategoryId && p.categoryId !== row.productCategoryId) return false;
+      if (row.partnerId) {
+        const pids = p.partnerIds ?? (p.partnerId ? [p.partnerId] : []);
+        if (pids.length && !pids.includes(row.partnerId)) return false;
+      }
+      const gids = p.groupIds ?? [];
+      if (regionSet.size > 0 && gids.length && !gids.some((id) => regionSet.has(id))) return false;
+      return true;
+    })
+    .map((p) => ({
+      value: p.id,
+      label: [p.productName, p.productCode].filter(Boolean).join(' · ') || p.id,
+    }));
+}
+
+function locationOptionsForRow(row: Partial<TemplateDataEntryRow>) {
+  const selectedGroups = groups.value.filter((g) => (row.regionIds ?? []).includes(g.id));
+  const groupNames = new Set(selectedGroups.map((g) => String(g.groupName ?? '').trim()).filter(Boolean));
+  const partnerName = partners.value.find((p) => p.id === row.partnerId)?.partnerName;
+  return locations.value
+    .filter((l) => {
+      if (partnerName && l.partner && l.partner !== partnerName) return false;
+      if (groupNames.size && l.groupName && !groupNames.has(l.groupName)) return false;
+      return true;
+    })
+    .map((l) => ({
+      value: l.id,
+      label: [l.locationName, l.locationCode].filter(Boolean).join(' · ') || l.id,
+    }));
+}
+
+const labelCategoryOptions = computed(() =>
+  labelCategories.value.map((c) => ({
+    value: c.id,
+    label: (c.categoryName ?? c.categoryCode ?? c.id ?? '').trim() || c.id,
+  })),
+);
+
 const labelTypeOptions = computed(() =>
   labelTypes.value.map((t) => ({
     value: t.id,
@@ -108,6 +216,36 @@ const labelTypeOptions = computed(() =&gt;
   })),
 );
  
+const tableColumns = computed(() => {
+  const cols: Array<Record<string, unknown>> = [];
+  if (fromLabelsBulk.value) {
+    cols.push(
+      { title: 'Company *', key: 'partner', width: 190, fixed: 'left' },
+      { title: 'Applicable Region *', key: 'region', width: 220, fixed: 'left' },
+      { title: 'Product category *', key: 'productCategory', width: 200 },
+    );
+  }
+  cols.push({ title: 'Product *', key: 'product', width: 200, ...(fromLabelsBulk.value ? {} : { fixed: 'left' }) });
+  if (fromLabelsBulk.value) {
+    cols.push(
+      { title: 'Label Name *', key: 'labelName', width: 220 },
+      { title: 'Location *', key: 'location', width: 220 },
+      { title: 'Label Category *', key: 'labelCategory', width: 200 },
+    );
+  }
+  cols.push({ title: 'Label type *', key: 'labelType', width: 180, ...(fromLabelsBulk.value ? {} : { fixed: 'left' }) });
+  cols.push(
+    ...dataColumns.value.map((col) => ({
+      title: columnTitle(col),
+      key: columnKey(col),
+      width: col.kind === 'element' && dataEntryUsesImageUpload(col.el) ? 120 : 140,
+    })),
+  );
+  if (fromLabelsBulk.value) cols.push({ title: 'Enabled', key: 'state', width: 110, fixed: 'right' });
+  cols.push({ title: '', key: 'action', width: 72, fixed: 'right' });
+  return cols;
+});
+
 function columnKey(col: DataColumn): string {
   return col.kind === 'element'
     ? col.el.id
@@ -157,17 +295,27 @@ async function loadData() {
     if (FOOD_LABELING_STATIC_ONLY) {
       message.info($t('foodLabeling.common.staticDemoBanner'));
       templateTitle.value = templateCode.value;
-      rows.value = [{ id: newRowId(), productId: '', labelTypeId: '', fieldValues: {} }];
+      rows.value = [createEmptyRow()];
       return;
     }
-    const [tpl, prodRes, typeRes] = await Promise.all([
+    const [tpl, partnerRes, groupRes, locRes, prodCatRes, prodRes, labelCatRes, typeRes] = await Promise.all([
       labelTemplateInfo(templateCode.value),
+      partnerList({ SkipCount: 1, MaxResultCount: 500, State: true }),
+      groupList({ SkipCount: 1, MaxResultCount: 500, State: true }),
+      locationCrudList({ SkipCount: 1, MaxResultCount: 1000, State: true }),
+      productCategoryList({ SkipCount: 1, MaxResultCount: 500, State: true }),
       productList({ SkipCount: 1, MaxResultCount: 500 }),
+      labelCategoryList({ SkipCount: 1, MaxResultCount: 500, State: true }),
       labelTypeList({ SkipCount: 1, MaxResultCount: 500 }),
     ]);
     templateTitle.value =
       (tpl.templateName ?? tpl.name ?? tpl.templateCode ?? tpl.id ?? '').trim() || templateCode.value;
+    partners.value = partnerRes?.items ?? [];
+    groups.value = groupRes?.items ?? [];
+    locations.value = locRes?.items ?? [];
+    productCategories.value = prodCatRes?.items ?? [];
     products.value = prodRes?.items ?? [];
+    labelCategories.value = labelCatRes?.items ?? [];
     labelTypes.value = typeRes?.items ?? [];
     templateDto.value = tpl;
  
@@ -175,7 +323,7 @@ async function loadData() {
     const fromApi = defaults.length > 0 ? [...defaults].sort((a, b) => (a.orderNum ?? 0) - (b.orderNum ?? 0)) : [];
     if (fromApi.length > 0) {
       rows.value = fromApi.map((d) => ({
-        id: newRowId(),
+        ...createEmptyRow(),
         productId: d.productId,
         labelTypeId: d.labelTypeId,
         fieldValues: hydrateRowFieldValuesWithNutritionColumns(
@@ -184,7 +332,7 @@ async function loadData() {
         ),
       }));
     } else {
-      rows.value = [{ id: newRowId(), productId: '', labelTypeId: '', fieldValues: {} }];
+      rows.value = [createEmptyRow()];
     }
   } catch {
     message.error('Failed to load template or options.');
@@ -200,7 +348,7 @@ onMounted(() =&gt; {
 });
  
 function addRow() {
-  rows.value = [...rows.value, { id: newRowId(), productId: '', labelTypeId: '', fieldValues: {} }];
+  rows.value = [...rows.value, createEmptyRow()];
 }
  
 function removeRow(id: string) {
@@ -214,6 +362,36 @@ function setFieldValue(rowId: string, fieldKey: string, value: string) {
   );
 }
  
+function updateRow(rowId: string, patch: Partial<TemplateDataEntryRow>) {
+  rows.value = rows.value.map((r) => (r.id === rowId ? { ...r, ...patch } : r));
+}
+
+function applyPartnerToRow(rowId: string, partnerId: string) {
+  updateRow(rowId, {
+    partnerId,
+    regionIds: [],
+    productCategoryId: '',
+    productId: '',
+    locationId: '',
+  });
+}
+
+function applyRegionsToRow(rowId: string, regionIds: string[]) {
+  updateRow(rowId, {
+    regionIds,
+    productCategoryId: '',
+    productId: '',
+    locationId: '',
+  });
+}
+
+function applyProductCategoryToRow(rowId: string, productCategoryId: string) {
+  updateRow(rowId, {
+    productCategoryId,
+    productId: '',
+  });
+}
+
 function applyProductToRow(rowId: string, productId: string) {
   const pid = productId.trim();
   const product = products.value.find((p) => p.id === pid);
@@ -247,6 +425,10 @@ async function handleSave() {
     message.success($t('foodLabeling.common.staticDemoAction'));
     return;
   }
+  if (fromLabelsBulk.value) {
+    await handleBulkLabelSave();
+    return;
+  }
   const touched = rows.value.filter((r) => r.productId.trim() || r.labelTypeId.trim());
   const incomplete = touched.some((r) => !r.productId.trim() || !r.labelTypeId.trim());
   if (incomplete) {
@@ -277,6 +459,7 @@ async function handleSave() {
     Object.assign(
       defaultValues,
       buildTemplateLabelBindingDefaults(fullElements, {
+        labelName: r.labelName,
         labelTypeName: labelType?.typeName ?? labelType?.typeCode,
       }),
     );
@@ -319,6 +502,138 @@ async function handleSave() {
   }
 }
  
+async function handleBulkLabelSave() {
+  if (!templateDto.value) {
+    message.error('Template not loaded');
+    return;
+  }
+  const validRows = rows.value.filter((r) =>
+    r.partnerId.trim() ||
+    r.regionIds.length ||
+    r.productCategoryId.trim() ||
+    r.productId.trim() ||
+    r.labelName.trim() ||
+    r.locationId.trim() ||
+    r.labelCategoryId.trim() ||
+    r.labelTypeId.trim(),
+  );
+  if (validRows.length === 0) {
+    message.error('Add at least one row.');
+    return;
+  }
+  for (const [i, row] of validRows.entries()) {
+    if (
+      !row.partnerId.trim() ||
+      row.regionIds.length === 0 ||
+      !row.productCategoryId.trim() ||
+      !row.productId.trim() ||
+      !row.labelName.trim() ||
+      !row.locationId.trim() ||
+      !row.labelCategoryId.trim() ||
+      !row.labelTypeId.trim()
+    ) {
+      message.error(`Row ${i + 1}: fill all required label fields.`);
+      return;
+    }
+  }
+
+  saving.value = true;
+  try {
+    for (const row of validRows) {
+      await labelAdd({
+        labelName: row.labelName.trim(),
+        templateCode: templateCode.value,
+        locationId: row.locationId.trim(),
+        labelCategoryId: row.labelCategoryId.trim(),
+        labelTypeId: row.labelTypeId.trim(),
+        productIds: [row.productId.trim()],
+        labelInfoJson: null,
+        state: row.state !== false,
+      });
+    }
+    await saveTemplateDefaultsForRows(validRows);
+    message.success(`${validRows.length} label(s) created.`);
+    goBack();
+  } catch {
+    message.error('Save failed.');
+  } finally {
+    saving.value = false;
+  }
+}
+
+async function saveTemplateDefaultsForRows(validRows: TemplateDataEntryRow[]) {
+  if (!templateDto.value) return;
+  const fullElements = sortedTemplateElements.value;
+  const defaultsMap = new Map<string, {
+    productId: string;
+    labelTypeId: string;
+    defaultValues: Record<string, string>;
+    orderNum: number;
+  }>();
+  for (const row of templateDto.value.templateProductDefaults ?? []) {
+    defaultsMap.set(`${row.productId}::${row.labelTypeId}`, {
+      productId: row.productId,
+      labelTypeId: row.labelTypeId,
+      defaultValues: { ...row.defaultValues },
+      orderNum: row.orderNum ?? defaultsMap.size + 1,
+    });
+  }
+  for (const r of validRows) {
+    const folded = foldNutritionCompositeKeysIntoDefaults(r.fieldValues, fullElements);
+    const defaultValues: Record<string, string> = {};
+    for (const col of dataColumns.value) {
+      if (col.kind === 'element') {
+        defaultValues[col.el.id] = normalizeDateTimeFieldForSave(col.el, folded[col.el.id] ?? '');
+      }
+    }
+    for (const el of fullElements) {
+      if (canonicalElementType(el.type) === 'NUTRITION') {
+        const j = folded[el.id];
+        if (j) defaultValues[el.id] = j;
+      }
+    }
+    const product = products.value.find((p) => p.id === r.productId.trim());
+    const labelType = labelTypes.value.find((t) => t.id === r.labelTypeId.trim());
+    Object.assign(defaultValues, buildTemplateBarcodeQrDefaultsFromCodeValue(fullElements, product?.codeValue));
+    Object.assign(
+      defaultValues,
+      buildTemplateLabelBindingDefaults(fullElements, {
+        labelTypeName: labelType?.typeName ?? labelType?.typeCode,
+      }),
+    );
+    defaultsMap.set(`${r.productId.trim()}::${r.labelTypeId.trim()}`, {
+      productId: r.productId.trim(),
+      labelTypeId: r.labelTypeId.trim(),
+      defaultValues,
+      orderNum: defaultsMap.size + 1,
+    });
+  }
+  const tpl = templateDto.value;
+  const loc = appliedLocationToEditor(tpl);
+  const mergedDefaults = Array.from(defaultsMap.values()).map((row, idx) => ({
+    ...row,
+    orderNum: idx + 1,
+  }));
+  await labelTemplateUpdate(templateCode.value, {
+    id: tpl.id,
+    name: (tpl.name ?? tpl.templateName ?? '').trim() || templateCode.value,
+    labelType: tpl.labelType ?? 'PRICE',
+    unit: tpl.unit ?? 'cm',
+    width: Number(tpl.width ?? 6),
+    height: Number(tpl.height ?? 4),
+    appliedLocation: loc,
+    appliedLocationIds: loc === 'ALL' ? [] : (tpl.appliedLocationIds ?? []),
+    showRuler: tpl.showRuler ?? true,
+    showGrid: tpl.showGrid ?? true,
+    border: tpl.border ?? 'none',
+    printOrientation: tpl.printOrientation ?? 'vertical',
+    state: tpl.state ?? true,
+    elements: labelElementsToApiPayload(fullElements),
+    contents: buildTemplateContentsFromElements(fullElements),
+    templateProductDefaults: mergedDefaults,
+  });
+}
+
 function goBack() {
   if (fromLabelsBulk.value) {
     void router.push('/labels');
@@ -336,7 +651,9 @@ function goBack() {
         Back
       </a-button>
       <div class="min-w-[200px] flex-1">
-        <div class="text-xs font-medium uppercase tracking-wide text-gray-500">Label template</div>
+        <div class="text-xs font-medium uppercase tracking-wide text-gray-500">
+          {{ fromLabelsBulk ? 'Bulk Add Labels' : 'Label template' }}
+        </div>
         <h2 class="truncate text-lg font-semibold text-gray-900">{{ templateTitle }}</h2>
       </div>
       <div class="flex items-center gap-2">
@@ -351,7 +668,12 @@ function goBack() {
     <p v-if="contextHint" class="mb-3 shrink-0 text-sm font-medium text-green-700">
       {{ contextHint }}
     </p>
-    <p class="mb-3 shrink-0 text-sm text-gray-600">
+    <p v-if="fromLabelsBulk" class="mb-3 shrink-0 text-sm text-gray-600">
+      Fill label base fields per row, then complete the template input columns. Labels are created with the selected
+      template, and template input values are saved as
+      <span class="font-medium">templateProductDefaults</span>.
+    </p>
+    <p v-else class="mb-3 shrink-0 text-sm text-gray-600">
       Bind product and label type per row. Values are saved as
       <span class="font-medium">templateProductDefaults</span>. Nutrition columns fold into JSON under the nutrition element id.
     </p>
@@ -362,17 +684,7 @@ function goBack() {
  
     <div v-else class="min-h-0 flex-1 overflow-auto rounded-md border bg-white shadow-sm">
       <Table
-        :columns="[
-          { title: 'Product', key: 'product', width: 200, fixed: 'left' },
-          { title: 'Label type', key: 'labelType', width: 180, fixed: 'left' },
-          ...dataColumns.map((col) => ({
-            title: columnTitle(col),
-            key: columnKey(col),
-            width:
-              col.kind === 'element' && dataEntryUsesImageUpload(col.el) ? 120 : 140,
-          })),
-          { title: '', key: 'action', width: 72, fixed: 'right' },
-        ]"
+        :columns="tableColumns"
         :data-source="rows"
         :pagination="false"
         :row-key="(r: TemplateDataEntryRow) => r.id"
@@ -380,17 +692,85 @@ function goBack() {
         size="small"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'product'">
+          <template v-if="column.key === 'partner'">
             <Select
               show-search
               class="w-full min-w-[160px]"
-              :options="productOptions"
+              :options="partnerOptions"
+              :value="record.partnerId || undefined"
+              placeholder="Select company"
+              option-filter-prop="label"
+              @update:value="(v) => applyPartnerToRow(record.id, String(v ?? ''))"
+            />
+          </template>
+          <template v-else-if="column.key === 'region'">
+            <Select
+              mode="multiple"
+              show-search
+              class="w-full min-w-[180px]"
+              :disabled="!record.partnerId"
+              :options="groupOptionsForRow(record)"
+              :value="record.regionIds"
+              placeholder="Select region(s)"
+              option-filter-prop="label"
+              @update:value="(v) => applyRegionsToRow(record.id, Array.isArray(v) ? v.map(String) : [])"
+            />
+          </template>
+          <template v-else-if="column.key === 'productCategory'">
+            <Select
+              show-search
+              class="w-full min-w-[160px]"
+              :disabled="fromLabelsBulk && (!record.partnerId || record.regionIds.length === 0)"
+              :options="categoryOptionsForRow(record)"
+              :value="record.productCategoryId || undefined"
+              placeholder="Select category"
+              option-filter-prop="label"
+              @update:value="(v) => applyProductCategoryToRow(record.id, String(v ?? ''))"
+            />
+          </template>
+          <template v-else-if="column.key === 'product'">
+            <Select
+              show-search
+              class="w-full min-w-[160px]"
+              :disabled="fromLabelsBulk && !record.productCategoryId"
+              :options="fromLabelsBulk ? productOptionsForRow(record) : productOptions"
               :value="record.productId || undefined"
               placeholder="Select product"
               option-filter-prop="label"
               @update:value="(v) => applyProductToRow(record.id, String(v ?? ''))"
             />
           </template>
+          <template v-else-if="column.key === 'labelName'">
+            <Input
+              class="min-w-[180px]"
+              :value="record.labelName"
+              placeholder="e.g. Breakfast label"
+              @update:value="(v) => updateRow(record.id, { labelName: String(v ?? '') })"
+            />
+          </template>
+          <template v-else-if="column.key === 'location'">
+            <Select
+              show-search
+              class="w-full min-w-[180px]"
+              :disabled="!record.partnerId || record.regionIds.length === 0"
+              :options="locationOptionsForRow(record)"
+              :value="record.locationId || undefined"
+              placeholder="Select location"
+              option-filter-prop="label"
+              @update:value="(v) => updateRow(record.id, { locationId: String(v ?? '') })"
+            />
+          </template>
+          <template v-else-if="column.key === 'labelCategory'">
+            <Select
+              show-search
+              class="w-full min-w-[160px]"
+              :options="labelCategoryOptions"
+              :value="record.labelCategoryId || undefined"
+              placeholder="Select category"
+              option-filter-prop="label"
+              @update:value="(v) => updateRow(record.id, { labelCategoryId: String(v ?? '') })"
+            />
+          </template>
           <template v-else-if="column.key === 'labelType'">
             <Select
               show-search
@@ -402,6 +782,12 @@ function goBack() {
               @update:value="(v) => applyLabelTypeToRow(record.id, String(v ?? ''))"
             />
           </template>
+          <template v-else-if="column.key === 'state'">
+            <Switch
+              :checked="record.state !== false"
+              @update:checked="(v) => updateRow(record.id, { state: Boolean(v) })"
+            />
+          </template>
           <template v-else-if="column.key === 'action'">
             <a-button type="text" danger :disabled="rows.length <= 1" @click="removeRow(record.id)">
               <DeleteOutlined />
@@ -142,7 +142,8 @@ export function elementResizeHandlesForBox(
   h: number,
   rotation?: string | null,
 ) {
-  const isVertical = readElementRotation({ rotation }) === 'vertical';
+  const rot = readElementRotation({ rotation });
+  const isVertical = rot === 'vertical' || rot === 'right';
   return ELEMENT_RESIZE_HANDLES.filter((handle) => {
     if (isVertical && (handle.id === 'w' || handle.id === 'e')) {
       return false;
@@ -13,6 +13,7 @@ import {
   isPrintInputElement,
   readLabelEditorFontFamilyChoice,
 } from '../../../shared/label-template/label-template-model';
+import { elementRotationDegrees } from '../../../shared/text-element-layout';
 import NutritionFactsPanel from './nutrition-facts-panel.vue';
 import {
   normalizeBarcodeType,
@@ -35,7 +36,8 @@ const qrDataUrl = ref(&#39;&#39;);
  
 const cfg = computed(() => (props.element.config ?? {}) as Record<string, unknown>);
 const type = computed(() => canonicalElementType(props.element.type));
-const isVertical = computed(() => props.element.rotation === 'vertical');
+const rotationDegrees = computed(() => elementRotationDegrees(props.element));
+const isVertical = computed(() => rotationDegrees.value === -90 || rotationDegrees.value === 90);
  
 const commonStyle = computed((): CSSProperties => ({
   fontSize: `${(cfg.value.fontSize as number) ?? 14}px`,
@@ -50,15 +52,20 @@ const textRotationStyle = computed((): CSSProperties =&gt; {
     type.value === 'TEXT_STATIC' ||
     type.value === 'TEXT_PRODUCT' ||
     type.value === 'TEXT_PRICE';
-  if (isVertical.value && textLike) {
-    return { writingMode: 'vertical-rl', textOrientation: 'mixed' };
+  if (rotationDegrees.value !== 0 && textLike) {
+    return {
+      display: 'inline-block',
+      transform: `rotate(${rotationDegrees.value}deg)`,
+      transformOrigin: 'center center',
+      whiteSpace: 'nowrap',
+    };
   }
   return {};
 });
  
 const rotateBoxStyle = computed((): CSSProperties =>
-  isVertical.value
-    ? { transform: 'rotate(-90deg)', transformOrigin: 'center center' }
+  rotationDegrees.value !== 0
+    ? { transform: `rotate(${rotationDegrees.value}deg)`, transformOrigin: 'center center' }
     : {},
 );
  
@@ -92,10 +99,16 @@ function formatDateByPreset(format: string, date: Date): string {
   const dd = String(date.getDate()).padStart(2, '0');
   const hh = String(date.getHours()).padStart(2, '0');
   const min = String(date.getMinutes()).padStart(2, '0');
+  const hour12 = date.getHours() % 12 || 12;
+  const meridiem = date.getHours() >= 12 ? 'pm' : 'am';
   const monthLong = date.toLocaleString('en-US', { month: 'long' }).toUpperCase();
   const dayLong = date.toLocaleString('en-US', { weekday: 'long' }).toUpperCase();
   const dayShort = date.toLocaleString('en-US', { weekday: 'short' }).toUpperCase();
   switch (format) {
+    case '12 hr':
+      return `${hour12}:${min}${meridiem}`;
+    case '24 hr':
+      return `${hh}:${min}`;
     case 'DD/MM/YYYY':
       return `${dd}/${mm}/${yyyy}`;
     case 'MM/DD/YYYY':
@@ -245,6 +258,12 @@ const durationExample = computed(() =&gt; {
   return `${durationValue} ${rawFormat}`;
 });
  
+const timeExample = computed(() => {
+  const timeFormatRaw = String(cfg.value.format ?? cfg.value.Format ?? '24 hr').trim();
+  const timeFormat = timeFormatRaw === '12 hr' ? '12 hr' : '24 hr';
+  return formatDateByPreset(timeFormat, new Date());
+});
+
 const weightDisplay = computed(() => {
   const rawV = cfg.value.value ?? cfg.value.Value;
   const numVal =
@@ -395,7 +414,7 @@ const nutritionFontFamily = computed(() =&gt; readLabelEditorFontFamilyChoice(cfg.v
   <!-- TIME -->
   <div v-else-if="type === 'TIME'" class="flex h-full w-full items-center justify-center overflow-hidden">
     <div class="overflow-hidden whitespace-nowrap px-1" :style="{ ...commonStyle, ...rotateBoxStyle }">
-      {{ typeof cfg.__previewFormatted === 'string' ? String(cfg.__previewFormatted).trim() || '—' : '12:30' }}
+      {{ typeof cfg.__previewFormatted === 'string' ? String(cfg.__previewFormatted).trim() || '—' : timeExample }}
     </div>
   </div>
  
@@ -12,6 +12,7 @@ import { computed, onMounted, ref, watch } from &#39;vue&#39;;
 import { $t } from '@vben/locales';
  
 import { Checkbox, Input, Radio, Select, Switch } from 'ant-design-vue';
+import { RotateLeftOutlined, RotateRightOutlined } from '@ant-design/icons-vue';
  
 import { ImageUpload } from '#/components/upload';
  
@@ -41,10 +42,13 @@ import {
 import { readImageScaleMode } from '../../../shared/image-scale-mode';
 import { readInvertColors, isTextLikeElementForInvertColors } from '../../../shared/invert-colors';
 import {
+  elementRotationDegrees,
   readFontStyle,
   readFontWeight,
   readTextDecoration,
   readVerticalAlign,
+  rotateElementLeftValue,
+  rotateElementRightValue,
 } from '../../../shared/text-element-layout';
 import {
   displayLengthToElementPx,
@@ -386,20 +390,26 @@ function onImageUploadChange(ossId: string | string[]) {
  
         <template v-if="!isBlank">
           <div>
-            <label class="text-xs text-gray-600">{{ $t('foodLabeling.labelTemplates.rotation') }}</label>
-            <Radio.Group
-              class="fl-prop-radio-group mt-1"
-              button-style="solid"
-              :value="selectedElement.rotation"
-              @update:value="(v: Rotation) => patchElement(selectedElement!.id, { rotation: v })"
-            >
-              <Radio.Button value="horizontal">
-                {{ $t('foodLabeling.labelTemplates.horizontal') }}
-              </Radio.Button>
-              <Radio.Button value="vertical">
-                {{ $t('foodLabeling.labelTemplates.vertical') }}
-              </Radio.Button>
-            </Radio.Group>
+            <label class="text-xs text-gray-600">Rotate</label>
+            <div class="mt-1 flex items-center gap-2">
+              <a-button
+                size="small"
+                :disabled="positionLocked"
+                @click="patchElement(selectedElement!.id, { rotation: rotateElementLeftValue(selectedElement!) as Rotation })"
+              >
+                <template #icon><RotateLeftOutlined /></template>
+                Left
+              </a-button>
+              <a-button
+                size="small"
+                :disabled="positionLocked"
+                @click="patchElement(selectedElement!.id, { rotation: rotateElementRightValue(selectedElement!) as Rotation })"
+              >
+                <template #icon><RotateRightOutlined /></template>
+                Right
+              </a-button>
+              <span class="text-xs text-gray-500">{{ elementRotationDegrees(selectedElement) }}&deg;</span>
+            </div>
           </div>
  
           <div>
@@ -744,6 +754,25 @@ function onImageUploadChange(ossId: string | string[]) {
           </div>
         </template>
  
+        <template v-else-if="canonicalElementType(selectedElement.type) === 'TIME'">
+          <div>
+            <label class="text-xs text-gray-600">Time Format</label>
+            <Select
+              size="small"
+              class="mt-1 w-full"
+              :value="
+                cfgPickStr(selectedElement!.config as Record<string, unknown>, ['format', 'Format'], '24 hr') === '12 hr'
+                  ? '12 hr'
+                  : '24 hr'
+              "
+              @update:value="(v) => patchConfig(selectedElement!.id, selectedElement!, { format: v })"
+            >
+              <Select.Option value="12 hr">12 hr - 2:00pm</Select.Option>
+              <Select.Option value="24 hr">24 hr - 14:00</Select.Option>
+            </Select>
+          </div>
+        </template>
+
         <template v-else-if="canonicalElementType(selectedElement.type) === 'DURATION'">
           <div>
             <label class="text-xs text-gray-600">Format</label>
@@ -50,10 +50,16 @@ export function formatDateByPreset(format: string, date: Date): string {
   const dd = String(date.getDate()).padStart(2, '0');
   const hh = String(date.getHours()).padStart(2, '0');
   const min = String(date.getMinutes()).padStart(2, '0');
+  const hour12 = date.getHours() % 12 || 12;
+  const meridiem = date.getHours() >= 12 ? 'pm' : 'am';
   const monthLong = date.toLocaleString('en-US', { month: 'long' }).toUpperCase();
   const dayLong = date.toLocaleString('en-US', { weekday: 'long' }).toUpperCase();
   const dayShort = date.toLocaleString('en-US', { weekday: 'short' }).toUpperCase();
   switch (format) {
+    case '12 hr':
+      return `${hour12}:${min}${meridiem}`;
+    case '24 hr':
+      return `${hh}:${min}`;
     case 'DD/MM/YYYY':
       return `${dd}/${mm}/${yyyy}`;
     case 'MM/DD/YYYY':
@@ -113,7 +119,10 @@ function applyElementPrefix(cfg: Record&lt;string, unknown&gt;, body: string): string 
  
 function dateFormatPatternForElement(el: LabelElement, cfg: Record<string, unknown>): string {
   const type = canonicalElementType(el.type);
-  if (type === 'TIME') return 'HH:mm';
+  if (type === 'TIME') {
+    const raw = String(cfg.format ?? cfg.Format ?? '24 hr').trim();
+    return raw === '12 hr' ? '12 hr' : '24 hr';
+  }
   const it = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase();
   const raw =
     (typeof cfg.format === 'string' && cfg.format.trim()
@@ -172,7 +181,7 @@ function resolveFromOffsetAmount(
     return applyElementPrefix(cfg, formatDateByPreset(dateFormatPatternForElement(el, cfg), d));
   }
   if (type === 'TIME') {
-    return applyElementPrefix(cfg, formatDateByPreset('HH:mm', d));
+    return applyElementPrefix(cfg, formatDateByPreset(dateFormatPatternForElement(el, cfg), d));
   }
   return applyElementPrefix(cfg, `${amount} ${unit}`.trim());
 }
@@ -7,7 +7,7 @@ export type Unit = &#39;cm&#39; | &#39;inch&#39;;
 /** 与接口文档一致：ALL=全部门店，SPECIFIED=指定门店（需 appliedLocationIds） */
 export type AppliedLocation = 'ALL' | 'SPECIFIED';
 export type AppliedScopeType = 'ALL' | 'SPECIFIED';
-export type Rotation = 'horizontal' | 'vertical';
+export type Rotation = 'horizontal' | 'vertical' | 'left' | 'right' | 'rotate180';
 export type PrintOrientation = 'horizontal' | 'vertical';
 export type Border = 'none' | 'line' | 'dotted';
  
@@ -399,7 +399,7 @@ export function createDefaultElement(type: ElementType, x = 20, y = 20): LabelEl
       height: 24,
       config: { format: 'DD/MM/YYYY', offsetDays: 0, fontSize: 14, textAlign: 'left' },
     },
-    TIME: { width: 100, height: 24, config: { format: 'HH:mm', offsetDays: 0 } },
+    TIME: { width: 100, height: 24, config: { format: '24 hr', offsetDays: 0, fontSize: 14, textAlign: 'left' } },
     DURATION: {
       width: 120,
       height: 24,
@@ -38,25 +38,61 @@ export function readTextDecoration(
 /** 读取元素 rotation（兼容大小写 / 旧数据） */
 export function readElementRotation(
   el: { rotation?: string | null },
-): 'horizontal' | 'vertical' {
+): 'horizontal' | 'vertical' | 'right' | 'rotate180' {
   const v = String(el.rotation ?? 'horizontal').trim().toLowerCase();
-  return v === 'vertical' ? 'vertical' : 'horizontal';
+  if (v === 'vertical' || v === 'left' || v === 'rotate-left' || v === 'left90') return 'vertical';
+  if (v === 'right' || v === 'rotate-right' || v === 'right90') return 'right';
+  if (v === 'rotate180' || v === '180' || v === 'down' || v === 'inverted') return 'rotate180';
+  return 'horizontal';
+}
+
+export function elementRotationDegrees(
+  el: { rotation?: string | null },
+): 0 | -90 | 90 | 180 {
+  const rot = readElementRotation(el);
+  if (rot === 'vertical') return -90;
+  if (rot === 'right') return 90;
+  if (rot === 'rotate180') return 180;
+  return 0;
+}
+
+export function rotateElementLeftValue(
+  el: { rotation?: string | null },
+): 'horizontal' | 'vertical' | 'right' | 'rotate180' {
+  const current = elementRotationDegrees(el);
+  const next = (((current - 90) % 360) + 360) % 360;
+  if (next === 270) return 'vertical';
+  if (next === 180) return 'rotate180';
+  if (next === 90) return 'right';
+  return 'horizontal';
+}
+
+export function rotateElementRightValue(
+  el: { rotation?: string | null },
+): 'horizontal' | 'vertical' | 'right' | 'rotate180' {
+  const current = elementRotationDegrees(el);
+  const next = (((current + 90) % 360) + 360) % 360;
+  if (next === 270) return 'vertical';
+  if (next === 180) return 'rotate180';
+  if (next === 90) return 'right';
+  return 'horizontal';
 }
  
 /** 切换 horizontal / vertical 时交换宽高并保持中心点不变 */
 export function patchElementRotationWithLayout(
   el: { x: number; y: number; width: number; height: number; rotation?: string | null },
-  nextRotation: 'horizontal' | 'vertical',
+  nextRotation: 'horizontal' | 'vertical' | 'right' | 'rotate180',
 ): {
-  rotation: 'horizontal' | 'vertical';
+  rotation: 'horizontal' | 'vertical' | 'right' | 'rotate180';
   x: number;
   y: number;
   width: number;
   height: number;
 } {
   const prev = readElementRotation(el);
+  const shouldSwapBox = (rotation: string) => rotation === 'vertical' || rotation === 'right';
   if (prev === nextRotation) {
-    if (nextRotation === 'vertical' && el.width > el.height) {
+    if (shouldSwapBox(nextRotation) && el.width > el.height) {
       const w = Math.max(1, el.width);
       const h = Math.max(1, el.height);
       const cx = el.x + w / 2;
@@ -79,6 +115,15 @@ export function patchElementRotationWithLayout(
       height: el.height,
     };
   }
+  if (!shouldSwapBox(prev) && !shouldSwapBox(nextRotation)) {
+    return {
+      rotation: nextRotation,
+      x: el.x,
+      y: el.y,
+      width: el.width,
+      height: el.height,
+    };
+  }
   const w = Math.max(1, el.width);
   const h = Math.max(1, el.height);
   const cx = el.x + w / 2;
@@ -105,11 +150,12 @@ export function canonicalElementGeometry&lt;
 export function normalizeElementRotationBox<
   T extends { rotation?: string | null; width: number; height: number; x: number; y: number },
 >(el: T): T {
-  if (readElementRotation(el) !== 'vertical') return el;
+  const rotation = readElementRotation(el);
+  if (rotation !== 'vertical' && rotation !== 'right') return el;
   if (el.width <= el.height) return el;
+  const patch = patchElementRotationWithLayout({ ...el, rotation: 'horizontal' }, rotation);
   return {
     ...el,
-    rotation: 'vertical',
-    ...patchElementRotationWithLayout({ ...el, rotation: 'horizontal' }, 'vertical'),
+    ...patch,
   };
 }
 # H5 / App 开发：直连本地后端（按本机 IP 与端口修改）
-VITE_US_API_BASE=http://192.168.31.88:19001
+VITE_US_API_BASE=http://192.168.31.89:19001
 # 复制为 .env.development（开发）或 .env.production（打包），按环境填写后端根地址（不含末尾 /）
-VITE_US_API_BASE=http://192.168.31.88:19001
+VITE_US_API_BASE=http://192.168.31.89:19001
@@ -757,7 +757,6 @@ const handleScan = async () =&gt; {
     if (hasPreferredClassicDeviceInList()) {
       isScanning.value = false
       debugInfo.value.lastBleEvent = 'skipped (paired classic device found)'
-      uni.showToast({ title: 'Using paired classic Bluetooth devices', icon: 'none' })
       return
     }
  
@@ -804,6 +803,7 @@ const handleConnect = async (dev: BtDevice) =&gt; {
     uni.showToast({ title: 'Connected!', icon: 'success' })
   } catch (e: any) {
     await refreshNativeDebug()
+    refreshCurrentPrinter()
     errorMsg.value = (e && e.message) ? e.message : 'Connection failed'
     connectingId.value = ''
   }
@@ -449,6 +449,7 @@ const connectBt = async (device: any) =&gt; {
     uni.hideLoading()
     uni.showToast({ title: t('printers.connectSuccess') })
   } catch (e) {
+    refreshStatus()
     uni.hideLoading()
     uni.showToast({ title: t('printers.connectFail'), icon: 'none' })
   } finally {
@@ -3,7 +3,7 @@
  * 调试本地时请与 .env.development 保持一致；仅作 fallback，优先使用环境变量。
  */
 // export const US_BACKEND_ORIGIN_FALLBACK = 'http://flus-test.3ffoodsafety.com'
-export const US_BACKEND_ORIGIN_FALLBACK = 'http://192.168.31.88:19001'
+export const US_BACKEND_ORIGIN_FALLBACK = 'http://192.168.31.89:19001'
  
 /**
  * 解析美国版后端根地址（不含末尾 /）。
@@ -80,6 +80,24 @@ function isConnectionStateConnected (state) {
   return String(state || '').trim().toLowerCase() === 'connected'
 }
  
+function getClassicBondState (device) {
+  // #ifdef APP-PLUS
+  try {
+    const state = invoke(device, 'getBondState')
+    return typeof state === 'number' ? state : Number(state)
+  } catch (_) {
+    return null
+  }
+  // #endif
+  return null
+}
+
+function isClassicBonded (device) {
+  const state = getClassicBondState(device)
+  if (state == null || Number.isNaN(state)) return true
+  return state === 12
+}
+
 function runOnUiThread (fn) {
   // #ifdef APP-PLUS
   try {
@@ -380,8 +398,9 @@ var blueToothTool = {
       callback && callback(false)
       return false
     }
+    let device = null
     try {
-      let device = invoke(btAdapter, 'getRemoteDevice', address)
+      device = invoke(btAdapter, 'getRemoteDevice', address)
       const candidates = createSocketCandidates(device)
       let socket = null
       let lastError = null
@@ -415,6 +434,9 @@ var blueToothTool = {
  
     try {
       invoke(btSocket, 'connect')
+      if (!isClassicBonded(device)) {
+        throw new Error('Bluetooth PIN or pairing key is incorrect')
+      }
       const streamReady = this.readData()
       if (!streamReady) {
         throw new Error(this.state.lastError || 'Bluetooth output stream not ready')
@@ -99,14 +99,6 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
         }
         classicBluetooth.connDevice(device.deviceId, (ok: boolean) => {
           if (ok) {
-            setBluetoothConnection({
-              deviceId: device.deviceId,
-              deviceName: device.name || 'Bluetooth Printer',
-              deviceType: 'classic',
-              transportMode: 'generic',
-              driverKey: driver.key,
-              mtu: driver.preferredBleMtu || 20,
-            })
             /**
              * connDevice 回调 ok 可能早于 socket/outputStream 就绪；
              * 若立刻测试打印，会出现 state=idle、outputReady=false。
@@ -118,10 +110,19 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
                 : null
               const ready = !!st?.outputReady && (!!st?.socketConnected || String(st?.connectionState || '').toLowerCase() === 'connected')
               if (ready) {
+                setBluetoothConnection({
+                  deviceId: device.deviceId,
+                  deviceName: device.name || 'Bluetooth Printer',
+                  deviceType: 'classic',
+                  transportMode: 'generic',
+                  driverKey: driver.key,
+                  mtu: driver.preferredBleMtu || 20,
+                })
                 resolve()
                 return
               }
               if (Date.now() - start > 2500) {
+                clearPrinter()
                 reject(new Error('Classic Bluetooth connection is not ready'))
                 return
               }
@@ -133,9 +134,11 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
           const message = typeof classicBluetooth.getLastError === 'function'
             ? classicBluetooth.getLastError()
             : ''
+          clearPrinter()
           reject(new Error(message || 'Classic Bluetooth connection failed.'))
         })
       } catch (error: any) {
+        clearPrinter()
         reject(error instanceof Error ? error : new Error(String(error || 'Classic Bluetooth connection failed.')))
       }
     }
@@ -244,21 +247,26 @@ function connectBlePrinter (device: PrinterCandidate, driver: PrinterDriver): Pr
  
 export async function connectBluetoothPrinter (device: PrinterCandidate): Promise<PrinterDriver> {
   const driver = resolvePrinterDriver(device)
-  if (driver.key === 'gp-d320fx') {
-    try {
-      await connectBlePrinter(device, driver)
-    } catch (_) {
+  try {
+    if (driver.key === 'gp-d320fx') {
+      try {
+        await connectBlePrinter(device, driver)
+      } catch (_) {
+        await connectClassicBluetooth(device, driver)
+      }
+      return driver
+    }
+    const resolvedType = driver.resolveConnectionType(device)
+    if (resolvedType === 'classic') {
       await connectClassicBluetooth(device, driver)
+    } else {
+      await connectBlePrinter(device, driver)
     }
     return driver
+  } catch (error) {
+    clearPrinter()
+    throw error
   }
-  const resolvedType = driver.resolveConnectionType(device)
-  if (resolvedType === 'classic') {
-    await connectClassicBluetooth(device, driver)
-  } else {
-    await connectBlePrinter(device, driver)
-  }
-  return driver
 }
  
 export function useBuiltinPrinter (driverKey = 'generic-tsc') {
- VITE_API_BASE_URL=http://192.168.31.88:19001
+ VITE_API_BASE_URL=http://192.168.31.89:19001
 # VITE_API_BASE_URL=http://flus-test.3ffoodsafety.com
@@ -5,7 +5,7 @@
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <title>Food Labeling Management Platform</title>
-      <script type="module" crossorigin src="/assets/index-9j82-SgZ.js"></script>
+      <script type="module" crossorigin src="/assets/index-CCZCnrrc.js"></script>
       <link rel="stylesheet" crossorigin href="/assets/index-C6CSIunP.css">
     </head>