打印日志重新打印

杨鑫
1 parent 7af95447
Showing 14 changed files with 462 additions and 308 deletions
美国版/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/services/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/types/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/utils/labelPreview/normalizePreviewTemplate.ts
美国版/Food Labeling Management App UniApp/src/utils/print/hydrateTemplateImagesForPrint.ts
美国版/Food Labeling Management App UniApp/src/utils/print/manager/printerManager.ts
美国版/Food Labeling Management App UniApp/src/utils/print/systemTemplateAdapter.ts
美国版/Food Labeling Management App UniApp/src/utils/printFromPrintDataList.ts
美国版/Food Labeling Management App UniApp/src/utils/printSnapshotStorage.ts
美国版/Food Labeling Management App UniApp/src/utils/reprintFromMergedTemplate.ts
美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/PropertiesPanel.tsx
美国版/Food Labeling Management Platform/src/components/labels/LabelTemplateEditor/index.tsx
美国版/Food Labeling Management Platform/src/components/ui/image-url-upload.tsx
@@ -215,7 +215,6 @@ import {
   postUsAppLabelPrint,
   US_APP_LABEL_PRINT_PATH,
 } from '../../services/usAppLabeling'
-import { savePrintTemplateSnapshotForTask } from '../../utils/printSnapshotStorage'
 import {
   applyTemplateProductDefaultValuesToTemplate,
   extractTemplateProductDefaultValuesFromPreviewPayload,
@@ -671,38 +670,28 @@ const handlePrint = async () =&gt; {
     try {
       const bt = getBluetoothConnection()
       /**
-       * 接口 9 落库必须与本次出纸使用的合并模板完全一致（与 labelPrintJobPayload.template 同源），
-       * 避免另起 buildPrintPersistTemplateSnapshot(base) 与 computeMergedPreviewTemplate() 细微偏差，
-       * 导致库内缺用户输入的价签/过敏原/数字/日期，重打与预览不一致。
+       * 接口 9 的 `printInputJson`：整份合并模板快照（与出纸 labelPrintJobPayload.template 同源）+
+       * buildPrintInputJson 的键值（PRINT_INPUT / 多选等），后端应原样落库并在接口 10 `renderTemplateJson` 返回供重打。
        */
       const persistTemplateDoc = JSON.parse(
         JSON.stringify(labelPrintJobPayload.template)
       ) as Record<string, unknown>
+      const printInputSnapshotForApi: Record<string, unknown> = {
+        ...printInputJson,
+        ...persistTemplateDoc,
+      }
       printLogRequestBody = buildUsAppLabelPrintRequestBody({
         locationId: getCurrentStoreId(),
         labelCode: labelCode.value,
         productId: productId.value || undefined,
         printQuantity: printQty.value,
-        mergedTemplate: persistTemplateDoc,
+        mergedTemplate: printInputSnapshotForApi,
         clientRequestId: createPrintClientRequestId(),
         printerMac: bt?.deviceId || undefined,
       })
       if (printLogRequestBody) {
-        const printRes = await postUsAppLabelPrint(printLogRequestBody)
-        /** 本机快照：列表接口 renderTemplateJson 常为设计器占位，重打需与当次出纸合并模板一致 */
-        try {
-          const tid = String(
-            (printRes as { taskId?: string })?.taskId
-            ?? (printRes as { TaskId?: string })?.TaskId
-            ?? '',
-          ).trim()
-          if (tid) {
-            savePrintTemplateSnapshotForTask(tid, JSON.stringify(persistTemplateDoc))
-          }
-        } catch {
-          /* 忽略快照写入失败 */
-        }
+        await postUsAppLabelPrint(printLogRequestBody)
       }
     } catch (syncErr: unknown) {
       if (!isUsAppSessionExpiredError(syncErr)) {
@@ -125,11 +125,21 @@
     </scroll-view>
     <SideMenu v-model="isMenuOpen" />
+
+    <!-- 重打整页光栅与预览页一致：须绑定 width/height 像素，否则 canvasToTempFilePath 易空白 -->
+    <canvas
+      canvas-id="reprintLabelCanvas"
+      id="reprintLabelCanvas"
+      class="hidden-canvas"
+      :style="{ width: reprintCanvasW + 'px', height: reprintCanvasH + 'px' }"
+      :width="reprintCanvasW"
+      :height="reprintCanvasH"
+    />
   </view>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import AppIcon from '../../components/AppIcon.vue'
 import SideMenu from '../../components/SideMenu.vue'
@@ -140,11 +150,8 @@ import {
   fetchUsAppPrintLogList,
   postUsAppLabelReprint,
 } from '../../services/usAppLabeling'
-import {
-  consumeReprintEmittedTemplateJsonForPersist,
-  printFromPrintLogRow,
-} from '../../utils/printFromPrintDataList'
-import { savePrintTemplateSnapshotForTask } from '../../utils/printSnapshotStorage'
+import { printFromPrintLogRow } from '../../utils/printFromPrintDataList'
+import type { SystemTemplatePrintCanvasRasterOptions } from '../../utils/print/manager/printerManager'
 import { getBluetoothConnection, getPrinterType } from '../../utils/print/printerConnection'
 import { isUsAppSessionExpiredError } from '../../utils/usAppApiRequest'
 import type { PrintLogItemDto } from '../../types/usAppLabeling'
@@ -153,6 +160,20 @@ const statusBarHeight = getStatusBarHeight()
 const isMenuOpen = ref(false)
 const viewMode = ref<'card' | 'list'>('card')
+const reprintCanvasW = ref(400)
+const reprintCanvasH = ref(400)
+
+/** 须在 setup 顶层取实例，异步回调里 getCurrentInstance() 为 null */
+const reprintCanvasComponentProxy = getCurrentInstance()?.proxy
+
+const applyReprintCanvasLayout: NonNullable<SystemTemplatePrintCanvasRasterOptions['applyLayout']> = async (
+  layout,
+) => {
+  reprintCanvasW.value = layout.outW
+  reprintCanvasH.value = layout.outH
+  await nextTick()
+}
+
 const items = ref<PrintLogItemDto[]>([])
 const loading = ref(false)
 const loadingMore = ref(false)
@@ -250,9 +271,9 @@ const handleReprint = async (row: PrintLogItemDto) =&gt; {
     uni.showToast({ title: 'Please connect a printer first', icon: 'none' })
     return
   }
-  uni.showLoading({ title: 'Printing…', mask: true })
+  uni.showLoading({ title: 'Rendering…', mask: true })
   try {
-    /** 优先 `renderTemplateJson` 完整模板（与接口 9 一致）；无则回退 printDataList */
+    /** 整页 canvas 光栅：与 Label Preview 页「非 native 快打」同路径，图片/中文/￥ 与屏幕一致 */
     await printFromPrintLogRow(row, {
       printQty: 1,
       onProgress: (pct) => {
@@ -260,30 +281,24 @@ const handleReprint = async (row: PrintLogItemDto) =&gt; {
           uni.showLoading({ title: `Printing ${pct}%`, mask: true })
         }
       },
+      canvasRaster: reprintCanvasComponentProxy
+        ? {
+            canvasId: 'reprintLabelCanvas',
+            componentInstance: reprintCanvasComponentProxy,
+            applyLayout: applyReprintCanvasLayout,
+          }
+        : undefined,
     })
     const bt = getBluetoothConnection()
     uni.showLoading({ title: 'Saving…', mask: true })
     /** 出纸成功后再调接口 11 记重打（与文档「重复打印」落库一致） */
-    const reprintRes = await postUsAppLabelReprint({
+    await postUsAppLabelReprint({
       locationId,
       taskId: row.taskId,
       printQuantity: 1,
       clientRequestId: createClientRequestId(),
       printerMac: bt?.deviceId || undefined,
     })
-    try {
-      const nextTid = String(
-        (reprintRes as { taskId?: string })?.taskId
-        ?? (reprintRes as { TaskId?: string })?.TaskId
-        ?? '',
-      ).trim()
-      const emitted = consumeReprintEmittedTemplateJsonForPersist()
-      if (nextTid && emitted) {
-        savePrintTemplateSnapshotForTask(nextTid, emitted)
-      }
-    } catch {
-      /* 忽略 */
-    }
     uni.showToast({ title: 'Done', icon: 'success' })
   } catch (e: unknown) {
     if (!isUsAppSessionExpiredError(e)) {
@@ -607,4 +622,12 @@ const goBack = () =&gt; {
   font-size: 24rpx;
   color: #6b7280;
 }
+
+.hidden-canvas {
+  position: fixed;
+  left: -9999px;
+  top: 0;
+  opacity: 0;
+  pointer-events: none;
+}
 </style>
@@ -130,7 +130,7 @@ export function buildUsAppLabelPrintRequestBody(input: {
   labelCode?: string | null
   productId?: string | null
   printQuantity: number
-  /** 与 buildLabelPrintJobPayload().template 同构，写入接口 printInputJson 供重打 */
+  /** 写入接口 9 `printInputJson`：合并模板快照（可与 `buildPrintInputJson` 结果浅合并），应对齐列表 `renderTemplateJson` */
   mergedTemplate: Record<string, unknown>
   clientRequestId?: string | null
   printerMac?: string | null
@@ -65,8 +65,8 @@ export interface UsAppLabelPrintInputVo {
   clientRequestId?: string
   baseTime?: string
   /**
-   * 对齐《标签模块接口对接说明(10)》：存**可再次打印**的合并模板（与 label-template-*.json 同构，含 elements[].config）。
-   * 与 `buildLabelPrintJobPayload().template` 一致；服务端写入落库字段并用于重打。
+   * 预览出纸落库：合并后的整份模板快照（id/name/unit/width/height/elements[]…，与 `buildLabelPrintJobPayload().template` 同源），
+   * 并可叠 `buildPrintInputJson` 的 PRINT_INPUT 键值；后端应写入任务表并在列表 `renderTemplateJson` 原样返回供重打。
    */
   printInputJson?: Record<string, unknown>
   printerId?: string
@@ -119,7 +119,11 @@ export interface PrintLogItemDto {
   /** 用于重打：元素列表（接口返回 printDataList） */
   printDataList?: PrintLogDataItemDto[] | null
   /**
-   * 列表接口若返回与接口 9 同构的完整模板 JSON 字符串（或含 `printInputJson` 的保存体），重打应优先用此字段以保留坐标与样式相关 config。
+   * 接口 10：与接口 9 落库一致的打印快照（常为 JSON 字符串，含 elements/config），**重打优先**。
+   */
+  printInputJson?: string | Record<string, unknown> | null
+  /**
+   * 列表备用：渲染模板 JSON 字符串；无 `printInputJson` 时使用。
    */
   renderTemplateJson?: string | null
 }
@@ -24,6 +24,75 @@ function normalizeConfig(raw: unknown): Record&lt;string, unknown&gt; {
   return { ...o }
 }
+/**
+ * 落库/列表返回的 element 可能把 text、src、fontSize 等摊在根上，仅 `config` 为空或不全；
+ * 合并进 config 后打印与预览才能读到样式与图片地址。
+ */
+function mergeFlatElementFieldsIntoConfig(
+  e: Record<string, unknown>,
+  cfg: Record<string, unknown>,
+): Record<string, unknown> {
+  const out = { ...cfg }
+  const keys = [
+    'text',
+    'Text',
+    'prefix',
+    'Prefix',
+    'suffix',
+    'Suffix',
+    'fontSize',
+    'FontSize',
+    'textAlign',
+    'TextAlign',
+    'fontFamily',
+    'fontWeight',
+    'color',
+    'Color',
+    'src',
+    'Src',
+    'url',
+    'Url',
+    'data',
+    'Data',
+    'value',
+    'Value',
+    'unit',
+    'Unit',
+    'format',
+    'Format',
+    'decimal',
+    'Decimal',
+    'inputType',
+    'InputType',
+    'offsetDays',
+    'OffsetDays',
+    'multipleOptionId',
+    'MultipleOptionId',
+    'multipleOptionName',
+    'MultipleOptionName',
+    'selectedOptionValues',
+    'SelectedOptionValues',
+    'errorLevel',
+    'scaleMode',
+    'showText',
+    'placeholder',
+    'Placeholder',
+  ] as const
+  for (const k of keys) {
+    const existing = out[k]
+    const has =
+      existing !== undefined &&
+      existing !== null &&
+      !(typeof existing === 'string' && String(existing).trim() === '')
+    if (has) continue
+    const v = e[k]
+    if (v !== undefined && v !== null && !(typeof v === 'string' && String(v).trim() === '')) {
+      out[k] = v as unknown
+    }
+  }
+  return out
+}
+
 const TEXT_PRODUCT_PLACEHOLDERS = new Set(['', '文本', 'text', 'Text', 'TEXT', 'Label', 'label'])
 /**
@@ -170,19 +239,70 @@ export function applyTemplateProductDefaultValuesToTemplate(
   return { ...template, elements }
 }
+function elementArrayLength (o: Record<string, unknown>): number {
+  const a = o.elements ?? o.Elements
+  return Array.isArray(a) ? a.length : 0
+}
+
+/**
+ * 列表 `renderTemplateJson` / 接口 9 落库可能是：① 根上直接 elements；② 包在 `printInputJson`；③ 包在 `template`（对象或 JSON 字符串）；
+ * ④ 根上既有 `template: {}` 又有 `elements` 时，**不能**误用空 template 丢掉根级 elements（会导致重打无字、无图）。
+ */
+function pickTemplateRootRecord (payload: Record<string, unknown>): Record<string, unknown> {
+  const unwrapTemplateKey = (raw: unknown): Record<string, unknown> | null => {
+    if (raw == null) return null
+    if (typeof raw === 'string') {
+      const s = raw.trim()
+      if (!s) return null
+      try {
+        const p = JSON.parse(s) as unknown
+        if (p != null && typeof p === 'object' && !Array.isArray(p)) return p as Record<string, unknown>
+      } catch {
+        return null
+      }
+      return null
+    }
+    if (typeof raw === 'object' && !Array.isArray(raw)) return raw as Record<string, unknown>
+    return null
+  }
+
+  if (elementArrayLength(payload) > 0) return payload
+
+  const pi = payload.printInputJson ?? payload.PrintInputJson
+  if (pi != null && typeof pi === 'object' && !Array.isArray(pi)) {
+    const p = pi as Record<string, unknown>
+    if (elementArrayLength(p) > 0) return p
+  }
+
+  const nested =
+    unwrapTemplateKey(payload.template ?? payload.Template) ?? asRecord(payload.template ?? payload.Template)
+  if (elementArrayLength(nested) > 0) return nested
+
+  if (pi != null && typeof pi === 'object' && !Array.isArray(pi)) return pi as Record<string, unknown>
+  if (Object.keys(nested).length > 0) return nested
+  return payload
+}
+
 /**
  * 将接口 8.2 返回的 template（或整段 DTO）规范为 SystemLabelTemplate，供打印适配器与预览画布使用。
  */
 export function normalizeLabelTemplateFromPreviewApi(payload: unknown): SystemLabelTemplate | null {
   if (payload == null || typeof payload !== 'object') return null
-  const root = payload as Record<string, unknown>
-  const t = asRecord(root.template ?? root.Template ?? root)
+  let root = payload as Record<string, unknown>
+  const wrapped = root.data ?? root.Data
+  if (wrapped != null && typeof wrapped === 'object' && !Array.isArray(wrapped)) {
+    root = wrapped as Record<string, unknown>
+  }
+  const t = pickTemplateRootRecord(root)
   const elementsRaw = t.elements ?? t.Elements
   if (!Array.isArray(elementsRaw)) return null
   const elements: SystemTemplateElementBase[] = (elementsRaw as unknown[]).map((el, index) => {
     const e = asRecord(el)
-    const cfg = normalizeConfig(e.config ?? e.ConfigJson ?? e.configJson)
+    let cfg = normalizeConfig(
+      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')
     const vst = e.valueSourceType ?? e.ValueSourceType
     const ik = e.inputKey ?? e.InputKey
+/**
+ * TSC/Android 位图打印：`BitmapFactory.decodeFile` 无法直接读 http(s) 或「仅相对路径」；
+ * 打印前把需网络的图片拉到本地临时路径，重打/预览落库里的 /picture/ URL 才能出图。
+ */
+import { resolveMediaUrlForApp, storedValueLooksLikeImagePath } from '../resolveMediaUrl'
+import type { SystemLabelTemplate, SystemTemplateElementBase } from './types/printer'
+
+/** 与 usAppApiRequest 一致：静态图 /picture/ 常需登录态，无头下载会 401 → 解码失败、纸面空白 */
+function downloadAuthHeaders (): Record<string, string> {
+  const h: Record<string, string> = {}
+  try {
+    const token = uni.getStorageSync('access_token')
+    if (token) h.Authorization = `Bearer ${token}`
+  } catch (_) {}
+  return h
+}
+
+function cfgStr(config: Record<string, unknown>, keys: string[]): string {
+  for (const k of keys) {
+    const v = config[k]
+    if (v != null && String(v).trim() !== '') return String(v).trim()
+  }
+  return ''
+}
+
+/** 需先下载再 decodeFile 的地址（非 data:、非已是本地 file） */
+function needsDownloadForDecode (raw: string): boolean {
+  const s = String(raw || '').trim()
+  if (!s) return false
+  if (s.startsWith('data:')) return false
+  if (s.startsWith('file://')) return false
+  if (/^https?:\/\//i.test(s)) return true
+  if (s.startsWith('/picture/') || s.startsWith('/static/')) return true
+  return false
+}
+
+function downloadUrlToTempFile (url: string): Promise<string | null> {
+  return new Promise((resolve) => {
+    if (!url) {
+      resolve(null)
+      return
+    }
+    try {
+      uni.downloadFile({
+        url,
+        header: downloadAuthHeaders(),
+        success: (res) => {
+          if (res.statusCode === 200 && res.tempFilePath) resolve(res.tempFilePath)
+          else resolve(null)
+        },
+        fail: () => resolve(null),
+      })
+    } catch {
+      resolve(null)
+    }
+  })
+}
+
+async function resolveToLocalPathIfNeeded (raw: string): Promise<string | null> {
+  const trimmed = String(raw || '').trim()
+  if (!trimmed) return null
+  if (!needsDownloadForDecode(trimmed)) return null
+  const url = resolveMediaUrlForApp(trimmed)
+  if (!url) return null
+  return downloadUrlToTempFile(url)
+}
+
+async function hydrateElement (el: SystemTemplateElementBase): Promise<SystemTemplateElementBase> {
+  const type = String(el.type || '').toUpperCase()
+  const cfg = { ...(el.config || {}) } as Record<string, unknown>
+
+  if (type === 'IMAGE' || type === 'LOGO') {
+    const raw = cfgStr(cfg, ['src', 'url', 'Src', 'Url'])
+    const local = await resolveToLocalPathIfNeeded(raw)
+    if (!local) return el
+    return {
+      ...el,
+      config: { ...cfg, src: local, url: local, Src: local, Url: local },
+    }
+  }
+
+  if (type === 'QRCODE') {
+    const raw = cfgStr(cfg, ['data', 'Data'])
+    if (!raw || !storedValueLooksLikeImagePath(raw)) return el
+    const local = await resolveToLocalPathIfNeeded(raw)
+    if (!local) return el
+    return {
+      ...el,
+      config: { ...cfg, data: local, Data: local, src: local, url: local },
+    }
+  }
+
+  return el
+}
+
+/**
+ * 返回新模板对象；无元素或无需下载时可能与原引用相同（未改元素时仍返回浅拷贝以统一调用方）。
+ */
+export async function hydrateSystemTemplateImagesForPrint (
+  tmpl: SystemLabelTemplate
+): Promise<SystemLabelTemplate> {
+  const elements = tmpl.elements || []
+  if (elements.length === 0) return tmpl
+
+  const next = await Promise.all(elements.map((el) => hydrateElement(el)))
+  return { ...tmpl, elements: next }
+}
@@ -21,7 +21,12 @@ import {
   printNativeFastFromLabelPrintJob,
   printNativeFastTemplate as printNativeFastTemplatePlugin,
 } from '../nativeFastPrinter'
+import {
+  getLabelPrintRasterLayout,
+  renderLabelPreviewCanvasToTempPathForPrint,
+} from '../../labelPreview/renderLabelPreviewCanvas'
 import { adaptSystemLabelTemplate } from '../systemTemplateAdapter'
+import { hydrateSystemTemplateImagesForPrint } from '../hydrateTemplateImagesForPrint'
 import { TEST_PRINT_SYSTEM_TEMPLATE, TEST_PRINT_TEMPLATE_DATA } from '../templates/testPrintTemplate'
 import { describePrinterCandidate, getPrinterDriverByKey, resolvePrinterDriver } from './driverRegistry'
 import type {
@@ -491,15 +496,61 @@ export async function printTemplateForCurrentPrinter (
   return driver
 }
+/** 与预览页「整页光栅」分支一致：用同一套 canvas 绘制再下发位图（/picture/、中文、￥ 与屏幕一致） */
+export type SystemTemplatePrintCanvasRasterOptions = {
+  canvasId: string
+  componentInstance: any
+  /** 绘制前把隐藏 canvas 的 width/height（像素）设为 layout.outW/outH，并 await nextTick */
+  applyLayout?: (layout: {
+    cw: number
+    ch: number
+    outW: number
+    outH: number
+    scale: number
+  }) => void | Promise<void>
+}
+
 export async function printSystemTemplateForCurrentPrinter (
   template: SystemLabelTemplate,
   data: LabelTemplateData = {},
   options: {
     printQty?: number
+    canvasRaster?: SystemTemplatePrintCanvasRasterOptions
   } = {},
   onProgress?: (percent: number) => void
 ): Promise<PrinterDriver> {
   const driver = getCurrentPrinterDriver()
+  const canvasRaster = options.canvasRaster
+
+  if (canvasRaster) {
+    const maxDots =
+      driver.imageMaxWidthDots || (driver.protocol === 'esc' ? 384 : 576)
+    const layout = getLabelPrintRasterLayout(template, maxDots, driver.imageDpi || 203)
+    if (canvasRaster.applyLayout) {
+      await canvasRaster.applyLayout(layout)
+    }
+    await new Promise<void>((r) => setTimeout(r, 50))
+    const tmpPath = await renderLabelPreviewCanvasToTempPathForPrint(
+      canvasRaster.canvasId,
+      canvasRaster.componentInstance,
+      template,
+      layout,
+    )
+    await printImageForCurrentPrinter(
+      tmpPath,
+      {
+        printQty: options.printQty || 1,
+        clearTopRasterRows: 1,
+        targetWidthDots: layout.outW,
+        targetHeightDots: layout.outH,
+      },
+      onProgress,
+    )
+    return driver
+  }
+
+  const templateReady = await hydrateSystemTemplateImagesForPrint(template)
+
   const connection = getBluetoothConnection()
   if (
     driver.protocol === 'tsc'
@@ -515,7 +566,7 @@ export async function printSystemTemplateForCurrentPrinter (
       await printNativeFastTemplatePlugin({
         deviceId: nativeConnection.deviceId,
         deviceName: nativeConnection.deviceName,
-        template,
+        template: templateReady,
         data,
         dpi: driver.imageDpi || 203,
         printQty: options.printQty || 1,
@@ -525,7 +576,7 @@ export async function printSystemTemplateForCurrentPrinter (
     }
   }
-  const structuredTemplate = adaptSystemLabelTemplate(template, data, {
+  const structuredTemplate = adaptSystemLabelTemplate(templateReady, data, {
     dpi: driver.imageDpi || 203,
     printQty: options.printQty || 1,
     disableBitmapText: driver.key === 'gp-d320fx',
@@ -314,12 +314,11 @@ function resolveTextX (params: {
   return Math.max(0, left + Math.max(0, boxWidth - textWidth))
 }
-/** TSC 内置西文字体无法显示全角￥时易成「?」；位图失败走此回退时替换为可打字符（与预览位图路径一致时可显示原符号） */
+/** 全角人民币符在 TSC 内置字库常成「?」；规范为半角 ¥（U+00A5），与 tscLabelBuilder 单字节编码一致，勿再用字母 Y */
 function sanitizeTextForTscBuiltinFont (text: string): string {
   return String(text || '')
-    .replace(/\uFFE5/g, 'Y')
-    .replace(/\u00A5/g, 'Y')
-    .replace(/￥/g, 'Y')
+    .replace(/\uFFE5/g, '\u00A5')
+    .replace(/￥/g, '\u00A5')
 }
 function buildTscTemplate (
@@ -356,7 +355,15 @@ function buildTscTemplate (
       const scale = resolveTextScale(getConfigNumber(config, ['fontSize'], 14), dpi)
       const align = resolveElementAlign(element, pageWidth)
-      if (!options.disableBitmapText && shouldRasterizeTextElement(text, type)) {
+      /**
+       * gp-d320fx 等机型默认 disableBitmapText（走 TSC 文本）；但内置字库把 ¥(0xA5) 打成字母 Y。
+       * 含货币符号时仍尝试 Android 位图文本，成功则纸面与预览一致。
+       */
+      const currencyGlyph = /[\u00A5\uFFE5€£￥]/.test(text)
+      const tryTextBitmap =
+        shouldRasterizeTextElement(text, type) &&
+        (!options.disableBitmapText || currencyGlyph)
+      if (tryTextBitmap) {
         const bitmapPatch = createTextBitmapPatch({
           element,
           text,
-import { serializeElementForLabelTemplateJson } from './labelPreview/buildLabelPrintPayload'
 import {
   normalizeLabelTemplateFromPreviewApi,
   parseLabelSizeText,
   sortElementsForPreview,
 } from './labelPreview/normalizePreviewTemplate'
-import { printSystemTemplateForCurrentPrinter } from './print/manager/printerManager'
+import {
+  printSystemTemplateForCurrentPrinter,
+  type SystemTemplatePrintCanvasRasterOptions,
+} from './print/manager/printerManager'
 import type {
   LabelTemplateData,
   SystemLabelTemplate,
   SystemTemplateElementBase,
 } from './print/types/printer'
-import { getPrintTemplateSnapshotForTask } from './printSnapshotStorage'
 import type { PrintLogDataItemDto, PrintLogItemDto } from '../types/usAppLabeling'
-/** 本次重打实际送机的模板（焙平后），供接口 11 返回新 taskId 时写入本机快照，支持连续重打 */
-let reprintEmittedTemplateJsonForPersist: string | null = null
-
-export function consumeReprintEmittedTemplateJsonForPersist (): string | null {
-  const s = reprintEmittedTemplateJsonForPersist
-  reprintEmittedTemplateJsonForPersist = null
-  return s
-}
-
-function rememberReprintEmittedTemplate (tmpl: SystemLabelTemplate) {
-  try {
-    reprintEmittedTemplateJsonForPersist = persistableTemplateJsonFromSystem(tmpl)
-  } catch {
-    reprintEmittedTemplateJsonForPersist = null
-  }
-}
-
-/** 与 preview 落库、接口 printInputJson 根结构一致，便于本机存储与解析 */
-function persistableTemplateJsonFromSystem (tmpl: SystemLabelTemplate): string {
-  const doc: Record<string, unknown> = {
-    id: String(tmpl.id ?? ''),
-    name: String(tmpl.name ?? 'Label'),
-    labelType: tmpl.labelType ?? '',
-    unit: String(tmpl.unit ?? 'inch'),
-    width: Number(tmpl.width) || 0,
-    height: Number(tmpl.height) || 0,
-    appliedLocation: tmpl.appliedLocation ?? 'ALL',
-    showRuler: tmpl.showRuler !== false,
-    showGrid: tmpl.showGrid !== false,
-    elements: (tmpl.elements || []).map((el) =>
-      serializeElementForLabelTemplateJson(el as SystemTemplateElementBase),
-    ),
-  }
-  return JSON.stringify(doc)
-}
-
 function nonEmptyDisplay (value: string | null | undefined): string {
   if (value == null || value === '' || value === '无') return ''
   return String(value).trim()
@@ -354,8 +319,15 @@ function overlayReprintResolvedFields (
   return { ...t, elements }
 }
+/** 打印日志重打：可选整页 canvas 光栅，与预览页「非 native 快打」分支一致 */
+export type PrintFromPrintLogOptions = {
+  printQty?: number
+  onProgress?: (percent: number) => void
+  canvasRaster?: SystemTemplatePrintCanvasRasterOptions
+}
+
 /**
- * 使用接口 10 返回的 `printDataList` 组装模板并走当前打印机（与预览同路径）。
+ * 使用接口 10 返回的 `printDataList` 组装模板并走当前打印机。
  */
 function logReprintJson (label: string, data: unknown): void {
   try {
@@ -367,10 +339,7 @@ function logReprintJson (label: string, data: unknown): void {
 export async function printFromPrintDataListRow (
   row: PrintLogItemDto,
-  options: {
-    printQty?: number
-    onProgress?: (percent: number) => void
-  } = {}
+  options: PrintFromPrintLogOptions = {}
 ): Promise<void> {
   const list =
     row.printDataList ??
@@ -413,30 +382,41 @@ export async function printFromPrintDataListRow (
   logReprintJson('bake + sort 后送打印机模板 tmpl', tmpl)
-  rememberReprintEmittedTemplate(tmpl)
   await printSystemTemplateForCurrentPrinter(
     tmpl,
     templateData,
-    { printQty: options.printQty ?? 1 },
+    { printQty: options.printQty ?? 1, canvasRaster: options.canvasRaster },
     options.onProgress
   )
 }
 /**
- * 从列表接口 `renderTemplateJson` 或本地保存的整段请求体中取出与 `printInputJson` 同构的对象 JSON 字符串。
- * 支持：`{ "printInputJson": { "elements": [...] } }` 或直接 `{ "elements": [...] }`。
+ * 从列表快照字符串（`printInputJson` / `renderTemplateJson`）解析出与接口 9 同构、可 `normalize` 的模板 JSON 字符串。
+ *
+ * 若根上同时有嵌套 `printInputJson`（小对象）和根级 `elements`（整模板），优先保留含 `elements` 的那份。
  */
 export function extractPrintTemplateJsonForReprint (raw: string): string | null {
   const s = raw.trim()
   if (!s) return null
   try {
-    const doc = JSON.parse(s) as Record<string, unknown>
-    const pi = doc.printInputJson ?? doc.PrintInputJson
-    if (pi != null && typeof pi === 'object' && !Array.isArray(pi)) {
-      return JSON.stringify(pi)
+    let doc: unknown = JSON.parse(s)
+    if (typeof doc === 'string') {
+      doc = JSON.parse(doc)
     }
-    if (Array.isArray(doc.elements) || Array.isArray(doc.Elements)) {
-      return JSON.stringify(doc)
+    if (doc == null || typeof doc !== 'object' || Array.isArray(doc)) return null
+    const d = doc as Record<string, unknown>
+
+    if (Array.isArray(d.elements) || Array.isArray(d.Elements)) {
+      return JSON.stringify(d)
+    }
+
+    const pi = d.printInputJson ?? d.PrintInputJson
+    if (pi != null && typeof pi === 'object' && !Array.isArray(pi)) {
+      const p = pi as Record<string, unknown>
+      if (Array.isArray(p.elements) || Array.isArray(p.Elements)) {
+        return JSON.stringify(p)
+      }
+      return JSON.stringify(p)
     }
   } catch {
     return null
@@ -444,61 +424,70 @@ export function extractPrintTemplateJsonForReprint (raw: string): string | null 
   return null
 }
+/** 列表项里 JSON 快照字段：可能是 string（含转义）或已解析的 object */
+function snapshotJsonFieldToString (
+  row: PrintLogItemDto,
+  camel: 'printInputJson' | 'renderTemplateJson',
+  pascal: 'PrintInputJson' | 'RenderTemplateJson',
+): string | null {
+  const rec = row as unknown as Record<string, unknown>
+  const r = rec[camel] ?? rec[pascal]
+  if (r == null) return null
+  if (typeof r === 'string') {
+    const t = r.trim()
+    return t || null
+  }
+  try {
+    return JSON.stringify(r)
+  } catch {
+    return null
+  }
+}
+
 /**
- * 打印日志重打入口：
- * 1）本机按 taskId 存的合并快照（预览出纸成功时写入）——与接口 10 的 renderTemplateJson 解耦；
- * 2）否则 `renderTemplateJson`（常为设计器占位，易错）；
- * 3）再否则 `printDataList`。
+ * 打印日志重打入口：**优先 `printInputJson`**（与接口 9 落库快照一致），其次 `renderTemplateJson`，最后 `printDataList`。
  */
 export async function printFromPrintLogRow (
   row: PrintLogItemDto,
-  options: {
-    printQty?: number
-    onProgress?: (percent: number) => void
-  } = {}
+  options: PrintFromPrintLogOptions = {}
 ): Promise<void> {
-  const r =
-    row.renderTemplateJson ??
-    (row as unknown as { RenderTemplateJson?: string | null }).RenderTemplateJson
+  const fromPrintInput = snapshotJsonFieldToString(row, 'printInputJson', 'PrintInputJson')
+  const fromRender = snapshotJsonFieldToString(row, 'renderTemplateJson', 'RenderTemplateJson')
   console.log('[Reprint] ========== 重复打印 JSON 调试 ==========')
   console.log('[Reprint] taskId', row.taskId, 'labelCode', row.labelCode, 'productName', row.productName)
-  logReprintJson('renderTemplateJson（列表字段，可为空）', r ?? '(无)')
+  logReprintJson('printInputJson（优先，接口 10）', fromPrintInput ?? '(无)')
+  logReprintJson('renderTemplateJson（回退）', fromRender ?? '(无)')
+
+  const tryExtract = (raw: string | null): string | null => {
+    if (!raw) return null
+    return extractPrintTemplateJsonForReprint(raw)
+  }
+
+  const extracted = tryExtract(fromPrintInput) ?? tryExtract(fromRender)
-  const localSnap = getPrintTemplateSnapshotForTask(row.taskId)
-  if (localSnap) {
-    console.log('[Reprint] 优先使用本机存储的合并快照（与当次预览出纸一致），taskId=', row.taskId)
-    logReprintJson('本机快照 JSON', localSnap)
-    await printFromMergedTemplateJsonString(localSnap, row, options)
+  if (extracted) {
+    logReprintJson('extract 后用于打印的模板 JSON 字符串', extracted)
+    await printFromMergedTemplateJsonString(extracted, row, options)
     return
   }
-  if (typeof r === 'string' && r.trim()) {
-    const extracted = extractPrintTemplateJsonForReprint(r)
-    if (extracted) {
-      logReprintJson('extract 后用于打印的模板 JSON 字符串', extracted)
-      await printFromMergedTemplateJsonString(extracted, row, options)
-      return
-    }
-    console.warn('[Reprint] renderTemplateJson 存在但 extractPrintTemplateJsonForReprint 失败，回退 printDataList')
+  if (fromPrintInput || fromRender) {
+    console.warn('[Reprint] 有 printInputJson/renderTemplateJson 但 extract 失败，回退 printDataList')
   } else {
-    console.log('[Reprint] 无 renderTemplateJson，使用 printDataList')
+    console.log('[Reprint] 无 printInputJson 与 renderTemplateJson，使用 printDataList')
   }
   await printFromPrintDataListRow(row, options)
 }
 /**
- * 接口 11 返回的 `mergedTemplateJson`（与落库 PrintInputJson/RenderDataJson 同源），用于重打编排。
- * 勿使用列表接口里的 `renderTemplateJson`/仅拆出来的 printDataList 代替完整模板，否则易缺坐标或缺用户输入快照。
+ * 将已解析的快照 JSON 字符串走 normalize → overlay → bake 后送机（列表优先来自 `printInputJson`）。
  */
 export async function printFromMergedTemplateJsonString (
   mergedTemplateJson: string,
   row: PrintLogItemDto,
-  options: {
-    printQty?: number
-    onProgress?: (percent: number) => void
-  } = {}
+  options: PrintFromPrintLogOptions = {}
 ): Promise<void> {
   console.log('[Reprint] 路径: renderTemplateJson / merged 完整模板')
   logReprintJson('mergedTemplateJson 原始字符串', mergedTemplateJson)
@@ -506,6 +495,10 @@ export async function printFromMergedTemplateJsonString (
   let payload: unknown
   try {
     payload = JSON.parse(mergedTemplateJson) as unknown
+    /** 部分网关/序列化会把整段再包一层 JSON 字符串 */
+    if (typeof payload === 'string') {
+      payload = JSON.parse(payload) as unknown
+    }
   } catch {
     throw new Error('Invalid merged template JSON')
   }
@@ -526,11 +519,10 @@ export async function printFromMergedTemplateJsonString (
   logReprintJson('bake + sort 后送打印机模板 tmpl', tmpl)
   logReprintJson('templateData（快照重打为空对象）', templateData)
-  rememberReprintEmittedTemplate(tmpl)
   await printSystemTemplateForCurrentPrinter(
     tmpl,
     templateData,
-    { printQty: options.printQty ?? 1 },
+    { printQty: options.printQty ?? 1, canvasRaster: options.canvasRaster },
     options.onProgress
   )
 }
-/**
- * 接口 10 返回的 renderTemplateJson 常为设计器占位（文本/名称/0.00），与当次出纸合并模板不一致。
- * 本机按 taskId 存「与出纸同源」的合并模板 JSON，重打优先读取（仅前端，不改后端）。
- */
-const STORAGE_KEY = 'us_app_print_template_snapshot_v1'
-const MAX_ENTRIES = 400
-
-type SnapshotStore = {
-  order: string[]
-  map: Record<string, string>
-}
-
-function readStore (): SnapshotStore {
-  try {
-    const raw = uni.getStorageSync(STORAGE_KEY)
-    if (raw == null || raw === '') return { order: [], map: {} }
-    const p = typeof raw === 'string' ? JSON.parse(raw) : raw
-    if (!p || typeof p !== 'object') return { order: [], map: {} }
-    const order = Array.isArray(p.order) ? p.order.map((x: unknown) => String(x)) : []
-    const map = typeof p.map === 'object' && p.map && !Array.isArray(p.map) ? (p.map as Record<string, string>) : {}
-    return { order, map }
-  } catch {
-    return { order: [], map: {} }
-  }
-}
-
-function writeStore (s: SnapshotStore) {
-  try {
-    uni.setStorageSync(STORAGE_KEY, JSON.stringify(s))
-  } catch {
-    /* 存储满或不可用则跳过 */
-  }
-}
-
-function trimStore (s: SnapshotStore): SnapshotStore {
-  let { order, map } = s
-  while (order.length > MAX_ENTRIES) {
-    const k = order.shift()
-    if (k && map[k] != null) delete map[k]
-  }
-  return { order, map }
-}
-
-/** 保存与本次出纸一致的合并模板 JSON（与 preview 落库 printInputJson 同构根对象） */
-export function savePrintTemplateSnapshotForTask (taskId: string, mergedTemplateJson: string): void {
-  const id = String(taskId || '').trim()
-  if (!id || !mergedTemplateJson.trim()) return
-  const s = readStore()
-  const nextMap = { ...s.map, [id]: mergedTemplateJson }
-  let order = s.order.filter((k) => k !== id)
-  order.push(id)
-  writeStore(trimStore({ order, map: nextMap }))
-}
-
-export function getPrintTemplateSnapshotForTask (taskId: string): string | null {
-  const id = String(taskId || '').trim()
-  if (!id) return null
-  const s = readStore()
-  const v = s.map[id]
-  return typeof v === 'string' && v.trim() ? v : null
-}
@@ -2,7 +2,10 @@ import {
   normalizeLabelTemplateFromPreviewApi,
   sortElementsForPreview,
 } from './labelPreview/normalizePreviewTemplate'
-import { printSystemTemplateForCurrentPrinter } from './print/manager/printerManager'
+import {
+  printSystemTemplateForCurrentPrinter,
+  type SystemTemplatePrintCanvasRasterOptions,
+} from './print/manager/printerManager'
 import type { SystemLabelTemplate } from './print/types/printer'
 /**
@@ -13,6 +16,7 @@ export async function printMergedTemplateJsonString (
   options: {
     printQty?: number
     onProgress?: (percent: number) => void
+    canvasRaster?: SystemTemplatePrintCanvasRasterOptions
   } = {}
 ): Promise<void> {
   let raw: unknown
@@ -32,7 +36,7 @@ export async function printMergedTemplateJsonString (
   await printSystemTemplateForCurrentPrinter(
     sorted,
     {},
-    { printQty: options.printQty ?? 1 },
+    { printQty: options.printQty ?? 1, canvasRaster: options.canvasRaster },
     options.onProgress
   )
 }
@@ -14,13 +14,10 @@ import { Switch } from &#39;../../ui/switch&#39;;
 import type {
   LabelTemplate,
   LabelElement,
-  LabelType,
   Unit,
   Rotation,
   Border,
-  AppliedLocation,
 } from '../../../types/labelTemplate';
-import type { LocationDto } from '../../../types/location';
 import type { LabelMultipleOptionDto } from '../../../types/labelMultipleOption';
 import { getLabelMultipleOptions } from '../../../services/labelMultipleOptionService';
 import { Checkbox } from '../../ui/checkbox';
@@ -32,8 +29,6 @@ interface PropertiesPanelProps {
   onTemplateChange: (patch: Partial<LabelTemplate>) => void;
   onElementChange: (id: string, patch: Partial<LabelElement>) => void;
   onDeleteElement?: (id: string) => void;
-  /** 门店列表：appliedLocation=SPECIFIED 时勾选 */
-  locations?: LocationDto[];
   /** 编辑已有模板时禁止修改 Template Code */
   readOnlyTemplateCode?: boolean;
 }
@@ -44,7 +39,6 @@ export function PropertiesPanel({
   onTemplateChange,
   onElementChange,
   onDeleteElement,
-  locations = [],
   readOnlyTemplateCode = false,
 }: PropertiesPanelProps) {
   if (selectedElement) {
@@ -211,75 +205,6 @@ export function PropertiesPanel({
               className="h-8 text-sm mt-1"
             />
           </div>
-          <div>
-            <Label className="text-xs">Label Type</Label>
-            <Select
-              value={template.labelType}
-              onValueChange={(v: LabelType) => onTemplateChange({ labelType: v })}
-            >
-              <SelectTrigger className="h-8 text-sm mt-1">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="PRICE">PRICE</SelectItem>
-                <SelectItem value="NUTRITION">NUTRITION</SelectItem>
-                <SelectItem value="SHIPPING">SHIPPING</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <div>
-            <Label className="text-xs">Applied Location</Label>
-            <Select
-              value={template.appliedLocation}
-              onValueChange={(v: AppliedLocation) => {
-                if (v === "ALL") {
-                  onTemplateChange({ appliedLocation: v, appliedLocationIds: [] });
-                } else {
-                  onTemplateChange({ appliedLocation: v });
-                }
-              }}
-            >
-              <SelectTrigger className="h-8 text-sm mt-1">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="ALL">All locations</SelectItem>
-                <SelectItem value="SPECIFIED">Specified locations</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          {template.appliedLocation === "SPECIFIED" && (
-            <div className="rounded-md border border-gray-200 p-2 max-h-40 overflow-y-auto space-y-2">
-              <Label className="text-xs text-gray-600">Select locations</Label>
-              {locations.length === 0 ? (
-                <p className="text-xs text-gray-500">No locations loaded.</p>
-              ) : (
-                locations.map((loc) => {
-                  const checked = (template.appliedLocationIds ?? []).includes(loc.id);
-                  return (
-                    <label
-                      key={loc.id}
-                      className="flex items-center gap-2 text-xs cursor-pointer"
-                    >
-                      <Checkbox
-                        checked={checked}
-                        onCheckedChange={(v) => {
-                          const on = v === true;
-                          const cur = new Set(template.appliedLocationIds ?? []);
-                          if (on) cur.add(loc.id);
-                          else cur.delete(loc.id);
-                          onTemplateChange({ appliedLocationIds: Array.from(cur) });
-                        }}
-                      />
-                      <span className="truncate">
-                        {(loc.locationName ?? loc.locationCode ?? loc.id).trim() || loc.id}
-                      </span>
-                    </label>
-                  );
-                })
-              )}
-            </div>
-          )}
           <div className="grid grid-cols-2 gap-2">
             <div>
               <Label className="text-xs">Width</Label>
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { Button } from '../../ui/button';
 import { ArrowLeft, Save, Download } from 'lucide-react';
 import {
@@ -18,8 +18,6 @@ import {
   resolvedValueSourceTypeForSave,
   valueSourceTypeForLibraryCategory,
 } from '../../../types/labelTemplate';
-import type { LocationDto } from '../../../types/location';
-import { getLocations } from '../../../services/locationService';
 import { ElementsPanel } from './ElementsPanel';
 import { LabelCanvas, LabelPreviewOnly } from './LabelCanvas';
 import { PropertiesPanel } from './PropertiesPanel';
@@ -52,22 +50,6 @@ export function LabelTemplateEditor({
   const [selectedId, setSelectedId] = useState<string | null>(null);
   const [scale, setScale] = useState(DEFAULT_SCALE);
   const [previewOpen, setPreviewOpen] = useState(false);
-  const [locations, setLocations] = useState<LocationDto[]>([]);
-
-  useEffect(() => {
-    let cancelled = false;
-    (async () => {
-      try {
-        const res = await getLocations({ skipCount: 1, maxResultCount: 500 });
-        if (!cancelled) setLocations(res.items ?? []);
-      } catch {
-        if (!cancelled) setLocations([]);
-      }
-    })();
-    return () => {
-      cancelled = true;
-    };
-  }, []);
   const selectedElement = template.elements.find((el) => el.id === selectedId) ?? null;
@@ -325,7 +307,6 @@ export function LabelTemplateEditor({
           onTemplateChange={handleTemplateChange}
           onElementChange={updateElement}
           onDeleteElement={deleteElement}
-          locations={locations}
           readOnlyTemplateCode={!!templateId}
         />
       </div>
@@ -10,7 +10,7 @@ export type ImageUrlUploadProps = {
   disabled?: boolean;
   /** 辅助说明，显示在方框下方 */
   hint?: string;
-  /** 空状态主文案 */
+  /** 空状态主文案（默认无，仅加号；需要时传入如 "Click to upload"） */
   emptyLabel?: string;
   accept?: string;
   /** 默认 5MB，与平台 picture 上传接口一致 */
@@ -29,7 +29,7 @@ export function ImageUrlUpload({
   onChange,
   disabled,
   hint,
-  emptyLabel = "Click to upload image",
+  emptyLabel = "",
   accept = "image/jpeg,image/png,image/webp,image/gif",
   maxSizeMb = PICTURE_UPLOAD_MAX_BYTES / (1024 * 1024),
   className,
@@ -92,18 +92,30 @@ export function ImageUrlUpload({
           type="button"
           disabled={busy}
           onClick={openPicker}
+          aria-label={emptyLabel || "Upload image"}
           className={cn(
             boxBase,
-            "flex flex-col items-center justify-center gap-3 border-2 border-dashed border-gray-300 bg-gray-50/80 text-gray-400",
+            "flex border-2 border-dashed border-gray-300 bg-gray-50/80 text-gray-400",
+            emptyLabel && !uploading
+              ? "flex-col items-center justify-center gap-2"
+              : "items-center justify-center",
             "hover:border-gray-400 hover:bg-gray-100/90 hover:text-gray-500",
             "disabled:pointer-events-none disabled:opacity-50",
             boxClassName,
           )}
         >
-          <Plus className="h-10 w-10 shrink-0 stroke-[1.25]" aria-hidden />
-          <span className="px-3 text-center text-sm font-normal leading-tight">
-            {uploading ? "Uploading…" : emptyLabel}
-          </span>
+          {uploading ? (
+            <span className="px-3 text-center text-sm font-normal text-gray-500">Uploading…</span>
+          ) : (
+            <>
+              <Plus className="h-10 w-10 shrink-0 stroke-[1.25]" aria-hidden />
+              {emptyLabel ? (
+                <span className="px-3 text-center text-sm font-normal leading-tight text-gray-400">
+                  {emptyLabel}
+                </span>
+              ) : null}
+            </>
+          )}
         </button>
       ) : (
         <div