@worm-vue3-print/core 1.3.6 → 1.3.8

package/dist/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * @worm-vue3-print/core v1.3.6
+ * @worm-vue3-print/core v1.3.8
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
@@ -858,55 +858,55 @@ function formatDate(value, fmt) {
   const pad3 = (n) => String(n).padStart(2, "0");
   return fmt.replace("YYYY", String(date.getFullYear())).replace("MM", pad3(date.getMonth() + 1)).replace("DD", pad3(date.getDate())).replace("HH", pad3(date.getHours())).replace("mm", pad3(date.getMinutes())).replace("ss", pad3(date.getSeconds()));
 }
+var CN_DIGITS = ["\u96F6", "\u58F9", "\u8D30", "\u53C1", "\u8086", "\u4F0D", "\u9646", "\u67D2", "\u634C", "\u7396"];
+var CN_UNITS = ["", "\u62FE", "\u4F70", "\u4EDF"];
+var CN_GROUP_UNITS = ["", "\u4E07", "\u4EBF", "\u4E07\u4EBF", "\u4EBF\u4EBF"];
+function fourDigitToCapital(n) {
+  let out = "";
+  let zeroPending = false;
+  for (let pos = 3; pos >= 0; pos--) {
+    const d = Math.floor(n / 10 ** pos) % 10;
+    if (d === 0) {
+      if (out) zeroPending = true;
+      continue;
+    }
+    if (zeroPending) {
+      out += "\u96F6";
+      zeroPending = false;
+    }
+    out += CN_DIGITS[d] + CN_UNITS[pos];
+  }
+  return out;
+}
 function toUpperCaseAmount(value) {
   const num = Number(value);
   if (isNaN(num)) return String(value);
   if (num === 0) return "\u96F6\u5143\u6574";
-  const digits = ["\u96F6", "\u58F9", "\u8D30", "\u53C1", "\u8086", "\u4F0D", "\u9646", "\u67D2", "\u634C", "\u7396"];
-  const units = ["", "\u62FE", "\u4F70", "\u4EDF"];
-  const bigUnits = ["", "\u4E07", "\u4EBF"];
   const sign = num < 0 ? "\u8D1F" : "";
-  const abs = Math.abs(num);
-  const [intStr, decStr] = abs.toFixed(2).split(".");
-  const intNum = parseInt(intStr, 10);
+  const [intStr, decStr] = Math.abs(num).toFixed(2).split(".");
+  const groupCount = Math.ceil(intStr.length / 4);
   let result = "";
-  if (intNum > 0) {
-    const intChars = intStr.split("").reverse();
-    let groupIdx = 0;
-    let lastDigit = 0;
-    let needZero = false;
-    for (let i = 0; i < intChars.length; i++) {
-      const d = parseInt(intChars[i], 10);
-      const unit = units[groupIdx % 4];
-      const bigUnit = bigUnits[Math.floor(groupIdx / 4)];
-      if (d === 0) {
-        if (lastDigit !== 0) needZero = true;
-      } else {
-        if (needZero) {
-          result = "\u96F6" + result;
-          needZero = false;
-        }
-        result = digits[d] + unit + result;
-        lastDigit = d;
-      }
-      if (groupIdx % 4 === 3 && groupIdx > 0) {
-        result = bigUnit + result;
-      }
-      groupIdx++;
+  let zeroPending = false;
+  for (let groupIdx = groupCount - 1; groupIdx >= 0; groupIdx--) {
+    const end = intStr.length - groupIdx * 4;
+    const group = parseInt(intStr.slice(Math.max(0, end - 4), end), 10);
+    if (group === 0) {
+      if (result) zeroPending = true;
+      continue;
     }
-    result += "\u5143";
+    if (result && (zeroPending || group < 1e3)) result += "\u96F6";
+    zeroPending = false;
+    result += fourDigitToCapital(group) + (CN_GROUP_UNITS[groupIdx] ?? "");
   }
+  result = `${result || "\u96F6"}\u5143`;
   const jiao = parseInt(decStr[0], 10);
   const fen = parseInt(decStr[1], 10);
   if (jiao === 0 && fen === 0) {
     result += "\u6574";
   } else {
-    if (jiao > 0) {
-      result += digits[jiao] + "\u89D2";
-    }
-    if (fen > 0) {
-      result += digits[fen] + "\u5206";
-    }
+    if (jiao === 0) result += "\u96F6";
+    else result += CN_DIGITS[jiao] + "\u89D2";
+    if (fen > 0) result += CN_DIGITS[fen] + "\u5206";
   }
   return sign + result;
 }
@@ -1189,9 +1189,12 @@ function makeRenderRow(row, resolve, keepRaw = false) {
       cellType: cell.cellType,
       barcodeType: cell.barcodeType,
       qrCodeLevel: cell.qrCodeLevel,
+      qrQuietZone: cell.qrQuietZone,
       showBarcodeText: cell.showBarcodeText,
       printerDpi: cell.printerDpi,
       fit: cell.fit,
+      objectPosition: cell.objectPosition,
+      fitScale: cell.fitScale,
       maxWidth: cell.maxWidth,
       maxHeight: cell.maxHeight,
       rowspan: cell.rowspan ?? 1,
@@ -1700,6 +1703,9 @@ function parseCellFitKey(key) {
   if (!Number.isFinite(rowIndex) || !Number.isFinite(colIndex)) return void 0;
   return { elementId: key.slice(0, first), kind, rowIndex, colIndex };
 }
+function cellImageBoxMm(fit, capMm) {
+  return (fit || "contain") === "cover" ? capMm : void 0;
+}
 function cellFitWidthMm(colWidths, colIndex, cell, defaultPadding = 1) {
   const span = Math.max(cell?.colspan ?? 1, 1);
   let width = 0;
@@ -1751,6 +1757,35 @@ function resolveElementBorder(type, opts) {
   return { all, edges };
 }
 
+// src/render/crop-style.ts
+var OBJECT_POSITION_UNSAFE = /[;"'<>\\(){}\[\]@!#]/;
+var OBJECT_POSITION_MAX_LEN = 64;
+var CROP_SCALE_MIN = 100;
+var CROP_SCALE_MAX = 400;
+function sanitizeObjectPosition(value) {
+  const v = (value ?? "").trim();
+  if (!v || v.length > OBJECT_POSITION_MAX_LEN || OBJECT_POSITION_UNSAFE.test(v)) return "";
+  return v;
+}
+function cropScalePct(fit, scale) {
+  if ((fit || "contain") !== "cover") return void 0;
+  if (typeof scale !== "number" || !Number.isFinite(scale)) return void 0;
+  const pct = Math.round(scale);
+  if (pct <= CROP_SCALE_MIN) return void 0;
+  return Math.min(pct, CROP_SCALE_MAX);
+}
+function cropStyleDeclarations(fit, scale, objectPosition) {
+  const pos = sanitizeObjectPosition(objectPosition);
+  const out = {};
+  if (pos) out.objectPosition = pos;
+  const pct = cropScalePct(fit, scale);
+  if (pct !== void 0) {
+    out.transform = `scale(${Number((pct / 100).toFixed(2))})`;
+    out.transformOrigin = pos || "50% 50%";
+  }
+  return out;
+}
+
 // src/render/watermark.ts
 var PX_PER_MM = 96 / 25.4;
 var MM_PER_PX = 25.4 / 96;
@@ -1952,6 +1987,17 @@ function followGroupHeight(el, members, template, _measuredElements) {
 function effectiveHeight(el, measured) {
   return Math.max(el.options?.height ?? 0, measured.get(el.id)?.measuredHeight ?? 0);
 }
+function xRange(el) {
+  const o = el.options ?? {};
+  const x0 = o.left ?? 0;
+  return [x0, x0 + (o.width ?? 100)];
+}
+function xIntersects(a, b) {
+  return a[0] < b[1] && b[0] < a[1];
+}
+function xUnion(a, b) {
+  return [Math.min(a[0], b[0]), Math.max(a[1], b[1])];
+}
 function buildPaginationUnits(sorted, measured, groupMap) {
   const unitOf = /* @__PURE__ */ new Map();
   for (const members of groupMap.values()) {
@@ -1959,7 +2005,8 @@ function buildPaginationUnits(sorted, measured, groupMap) {
     const unit = {
       anchorId: members[0].id,
       ids: members.map((m) => m.id),
-      forceFirstPage: members.some((m) => paginationOf(m)?.pageable === false)
+      forceFirstPage: members.some((m) => paginationOf(m)?.pageable === false),
+      band: members.map(xRange).reduce(xUnion)
     };
     for (const m of members) unitOf.set(m.id, unit);
   }
@@ -1991,11 +2038,13 @@ function buildPaginationUnits(sorted, measured, groupMap) {
       if (active[i].bottom <= top) active.splice(i, 1);
     }
     const bottom = top + effectiveHeight(el, measured);
+    const x = xRange(el);
     for (const a of active) {
-      if (a.bottom > top) union(el.id, a.id);
+      if (a.bottom > top && xIntersects(a.x, x)) union(el.id, a.id);
     }
-    active.push({ id: el.id, top, bottom });
+    active.push({ id: el.id, top, bottom, x });
   }
+  const eligibleById = new Map(eligible.map((e) => [e.id, e]));
   const clusters = /* @__PURE__ */ new Map();
   for (const el of eligible) {
     const root = find(el.id);
@@ -2005,7 +2054,12 @@ function buildPaginationUnits(sorted, measured, groupMap) {
   }
   for (const ids of clusters.values()) {
     if (ids.length < 2) continue;
-    const unit = { anchorId: ids[0], ids, forceFirstPage: false };
+    const unit = {
+      anchorId: ids[0],
+      ids,
+      forceFirstPage: false,
+      band: ids.map((id) => xRange(eligibleById.get(id))).reduce(xUnion)
+    };
     for (const id of ids) unitOf.set(id, unit);
   }
   return unitOf;
@@ -2054,17 +2108,30 @@ function paginate(template, measuredElements) {
   const unitOf = buildPaginationUnits(sorted, measuredElements, groupMap);
   const pages = [];
   let currentPage = [];
-  let remaining = contentHeight - SAFETY_MARGIN;
+  let occupied = [];
   let pageBroken = false;
-  function sectionTop(el) {
-    return pageBroken ? pageCursorTop() : el.options?.top ?? 0;
-  }
-  function pageCursorTop() {
-    return Math.max(0, fullPageHeight() - remaining);
-  }
   function fullPageHeight() {
     return contentHeight - SAFETY_MARGIN;
   }
+  function depthIn(x) {
+    let used = 0;
+    for (const r of occupied) {
+      if (xIntersects(x, [r.x0, r.x1])) used += r.height;
+    }
+    return Math.max(0, used);
+  }
+  function remainingIn(x) {
+    return fullPageHeight() - depthIn(x);
+  }
+  function occupy(x, height) {
+    occupied.push({ x0: x[0], x1: x[1], height });
+  }
+  function sectionTop(el, x = xRange(el)) {
+    return pageBroken ? pageCursorTop(x) : el.options?.top ?? 0;
+  }
+  function pageCursorTop(x) {
+    return Math.max(0, fullPageHeight() - remainingIn(x));
+  }
   let overflowOnCurrent = false;
   function pushPage() {
     pages.push(
@@ -2081,7 +2148,7 @@ function paginate(template, measuredElements) {
     }
     pushPage();
     currentPage = [];
-    remaining = contentHeight - SAFETY_MARGIN;
+    occupied = [];
     pageBroken = true;
     overflowOnCurrent = false;
   }
@@ -2125,31 +2192,32 @@ function paginate(template, measuredElements) {
   return pages;
   function paginateNonTable(el, measured, sortedList, idx) {
     const elHeight = measured.get(el.id)?.measuredHeight ?? el.options?.height ?? 0;
-    if (elHeight <= remaining) {
-      const top2 = pageBroken ? pageCursorTop() : el.options?.top ?? 0;
-      noteOverflow(top2 + elHeight);
-      currentPage.push({ elementId: el.id, type: "element", renderTop: sectionTop(el) });
-      remaining -= elHeight;
+    const x = xRange(el);
+    const place = () => {
+      const top = sectionTop(el, x);
+      noteOverflow(top + elHeight);
+      currentPage.push({ elementId: el.id, type: "element", renderTop: top });
+      occupy(x, elHeight);
+    };
+    if (elHeight <= remainingIn(x)) {
+      place();
       if (paginationOf(el)?.keepWithNext && idx + 1 < sortedList.length) {
         const nextEl = sortedList[idx + 1];
         const nextHeight = measured.get(nextEl.id)?.measuredHeight ?? nextEl.options?.height ?? 0;
         if (elHeight + nextHeight > fullPageHeight()) {
           return idx + 1;
         }
-        if (nextHeight > remaining) {
+        if (nextHeight > remainingIn(x)) {
           currentPage.pop();
+          occupied.pop();
           finishPage();
-          currentPage.push({ elementId: el.id, type: "element", renderTop: sectionTop(el) });
-          remaining -= elHeight;
+          place();
         }
       }
       return idx + 1;
     }
     finishPage();
-    const top = pageBroken ? pageCursorTop() : el.options?.top ?? 0;
-    if (top + elHeight > contentHeight) overflowOnCurrent = true;
-    currentPage.push({ elementId: el.id, type: "element", renderTop: sectionTop(el) });
-    remaining -= elHeight;
+    place();
     return idx + 1;
   }
   function paginateUnit(unit, idx) {
@@ -2162,8 +2230,9 @@ function paginate(template, measuredElements) {
       maxBottom = Math.max(maxBottom, top2 + effectiveHeight(m, measuredElements));
     }
     const unitHeight = Math.max(maxBottom - minTop, 0);
+    const band = unit.band;
     const place = () => {
-      const offset = pageBroken ? pageCursorTop() - minTop : 0;
+      const offset = pageBroken ? pageCursorTop(band) - minTop : 0;
       noteOverflow(minTop + offset + unitHeight);
       for (const m of members) {
         currentPage.push({
@@ -2172,9 +2241,9 @@ function paginate(template, measuredElements) {
           renderTop: (m.options?.top ?? 0) + offset
         });
       }
-      remaining -= unitHeight;
+      occupy(band, unitHeight);
     };
-    if (unitHeight <= remaining) {
+    if (unitHeight <= remainingIn(band)) {
       place();
       return idx + 1;
     }
@@ -2198,7 +2267,8 @@ function paginate(template, measuredElements) {
     const rowCount = Math.min(bodyRows.length, bodyHeights.length);
     const repeatCount = opts._repeatHeaderCount ?? 0;
     const repeatH = measured.get(el.id)?.repeatHeaderHeight ?? rowHeights.slice(0, repeatCount).reduce((s, h) => s + h, 0);
-    const freshAvail = contentHeight - SAFETY_MARGIN;
+    const freshAvail = fullPageHeight();
+    const tb = xRange(el);
     if (repeatH > freshAvail) {
       throw new Error(
         `\u8868\u683C ${el.id} \u7684\u91CD\u590D\u8868\u5934\u9AD8\u5EA6 (${repeatH.toFixed(1)}mm) \u8D85\u8FC7\u9875\u9762\u53EF\u7528\u9AD8\u5EA6 (${freshAvail.toFixed(1)}mm)\uFF0C\u8BF7\u51CF\u5C11\u91CD\u590D\u8868\u5934\u884C`
@@ -2211,16 +2281,16 @@ function paginate(template, measuredElements) {
         startRow: 0,
         endRow: 0,
         summary: summaryH > 0,
-        renderTop: sectionTop(el)
+        renderTop: sectionTop(el, tb)
       });
-      remaining -= summaryH;
-      applyFollowGroup(el, measured);
+      occupy(tb, summaryH);
+      applyFollowGroup(el, measured, tb);
       return idx + 1;
     }
     const totalH = bodyHeights.slice(0, rowCount).reduce((s, h) => s + h, 0);
     const totalNeed = totalH + subtotalH + summaryH;
     if (tablePaginationOf(el)?.enabled === false) {
-      if (totalNeed > remaining && currentPage.length > 0) finishPage();
+      if (totalNeed > remainingIn(tb) && currentPage.length > 0) finishPage();
       currentPage.push({
         elementId: el.id,
         type: "table-slice",
@@ -2228,78 +2298,78 @@ function paginate(template, measuredElements) {
         endRow: rowCount,
         subtotal: subtotalH > 0,
         summary: summaryH > 0,
-        renderTop: sectionTop(el)
+        renderTop: sectionTop(el, tb)
       });
-      remaining -= totalNeed;
-      applyFollowGroup(el, measured);
+      occupy(tb, totalNeed);
+      applyFollowGroup(el, measured, tb);
       return idx + 1;
     }
     const groups = buildRowGroups(bodyRows, rowCount);
     let sliceStart = 0;
     let firstSlice = true;
-    let sliceTop = sectionTop(el);
+    let sliceTop = sectionTop(el, tb);
+    let sliceUsed = 0;
+    const avail = () => remainingIn(tb) - sliceUsed;
+    const pushSlice = (endRow, repeatHeader) => {
+      currentPage.push({
+        elementId: el.id,
+        type: "table-slice",
+        startRow: sliceStart,
+        endRow,
+        subtotal: subtotalH > 0,
+        ...!firstSlice && repeatHeader ? { repeatHeader: true } : {},
+        renderTop: sliceTop
+      });
+      occupy(tb, sliceUsed);
+      sliceUsed = 0;
+    };
     for (const g of groups) {
       const gh = bodyHeights.slice(g.start, g.end).reduce((s, h) => s + h, 0);
-      if (gh + subtotalH <= remaining) {
-        remaining -= gh;
+      if (gh + subtotalH <= avail()) {
+        sliceUsed += gh;
         continue;
       }
       if (g.start > sliceStart) {
-        currentPage.push({
-          elementId: el.id,
-          type: "table-slice",
-          startRow: sliceStart,
-          endRow: g.start,
-          subtotal: subtotalH > 0,
-          ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-          renderTop: sliceTop
-        });
+        pushSlice(g.start, repeatCount > 0);
         firstSlice = false;
         sliceStart = g.start;
       }
       finishPage();
-      sliceTop = sectionTop(el);
-      if (!firstSlice) remaining -= repeatH;
-      remaining -= gh;
+      sliceTop = sectionTop(el, tb);
+      sliceUsed = 0;
+      if (!firstSlice) sliceUsed += repeatH;
+      sliceUsed += gh;
     }
     if (sliceStart < rowCount) {
-      currentPage.push({
-        elementId: el.id,
-        type: "table-slice",
-        startRow: sliceStart,
-        endRow: rowCount,
-        subtotal: subtotalH > 0,
-        ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-        renderTop: sliceTop
-      });
+      pushSlice(rowCount, repeatCount > 0);
     }
     if (summaryH > 0) {
-      if (summaryH <= remaining) {
+      if (summaryH <= avail()) {
         const lastIdx = currentPage.length - 1;
         const last = currentPage[lastIdx];
         if (last && last.type === "table-slice" && last.elementId === el.id) {
           currentPage[lastIdx] = { ...last, summary: true };
-          remaining -= summaryH;
+          occupy(tb, summaryH);
         } else {
           finishPage();
           currentPage.push({ elementId: el.id, type: "table-slice", startRow: rowCount, endRow: rowCount, summary: true, renderTop: 0 });
-          remaining -= summaryH;
+          occupy(tb, summaryH);
         }
       } else {
         finishPage();
         currentPage.push({ elementId: el.id, type: "table-slice", startRow: rowCount, endRow: rowCount, summary: true, renderTop: 0 });
-        remaining -= summaryH;
+        occupy(tb, summaryH);
       }
     }
-    applyFollowGroup(el, measured);
+    applyFollowGroup(el, measured, tb);
     return idx + 1;
   }
-  function applyFollowGroup(el, measured) {
+  function applyFollowGroup(el, measured, band) {
     const members = followMap.get(el.id) ?? [];
     if (members.length === 0) return;
     const followH = followGroupHeight(el, members, template, measured);
     const opts = el.options ?? {};
-    if (followH <= remaining) {
+    if (followH <= remainingIn(band)) {
       const lastIdx = currentPage.length - 1;
       const last = currentPage[lastIdx];
       if (last && last.type === "table-slice" && last.elementId === el.id) {
@@ -2310,7 +2380,7 @@ function paginate(template, measuredElements) {
           // 沿用该切片在本页的定位 top（续片已 stamp 为 0）
           groupTop: last.renderTop ?? opts.top ?? 0
         };
-        remaining -= followH;
+        occupy(band, followH);
         return;
       }
     }
@@ -2323,7 +2393,7 @@ function paginate(template, measuredElements) {
       followElementIds: members,
       groupTop: 0
     });
-    remaining -= followH;
+    occupy(band, followH);
   }
 }
 function buildRowGroups(renderRows, rowCount) {
@@ -2537,12 +2607,23 @@ function textStyle(opts) {
   if (opts.lineHeight) parts.push(`line-height:${opts.lineHeight}pt`);
   if (opts.letterSpacing) parts.push(`letter-spacing:${opts.letterSpacing}pt`);
   if (opts.verticalAlign) {
-    parts.push(`display:flex;align-items:${V_ALIGN_FLEX[opts.verticalAlign] ?? "flex-start"}`);
-    parts.push(`justify-content:${H_ALIGN_FLEX[opts.textAlign ?? "left"] ?? "flex-start"}`);
+    if (opts.textAlign === "justify") {
+      parts.push(`display:flex;flex-direction:column;justify-content:${V_ALIGN_FLEX[opts.verticalAlign] ?? "flex-start"}`);
+    } else {
+      parts.push(`display:flex;align-items:${V_ALIGN_FLEX[opts.verticalAlign] ?? "flex-start"}`);
+      parts.push(`justify-content:${H_ALIGN_FLEX[opts.textAlign ?? "left"] ?? "flex-start"}`);
+    }
   }
   if (opts.textAlign) parts.push(`text-align:${opts.textAlign}`);
+  if (opts.textAlign === "justify") parts.push("text-align-last:justify");
   return parts.length ? parts.join(";") + ";" : "";
 }
+function indentStyle(opts) {
+  return opts.longTextIndent ? `text-indent:${opts.longTextIndent}em;` : "";
+}
+function cropStyle(fit, fitScale, objectPosition) {
+  return Object.entries(cropStyleDeclarations(fit, fitScale, objectPosition)).map(([key, value]) => `${key.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`)}:${escapeInlineStyleValue(value)};`).join("");
+}
 function elementFitStyle(fit, opts) {
   if (fit === "autoHeight") return "overflow:visible;";
   if (opts.wordWrap === false) return "white-space:nowrap;text-overflow:ellipsis;";
@@ -2581,7 +2662,7 @@ function renderElement(el, isMeasure, containerStyle, overrideTop, ctx) {
       return renderTableElement(el, isMeasure, measureAttr, ctx);
     case "image":
       return `<div class="print-element" style="${style}"${measureAttr}>
-  <img src="${esc(opts.src ?? "")}" style="width:100%;height:100%;object-fit:contain;" />
+  <img src="${esc(opts.src ?? "")}" style="width:100%;height:100%;object-fit:${opts.fit || "contain"};${cropStyle(opts.fit, opts.fitScale, opts.objectPosition)}" />
 </div>`;
     case "barcode":
     case "qrcode": {
@@ -2608,7 +2689,7 @@ function renderElement(el, isMeasure, containerStyle, overrideTop, ctx) {
     case "oval":
       return `<div class="print-element" style="${style};border:${opts.borderWidth || 1}pt ${opts.borderStyle || "solid"} ${opts.borderColor || "#333"};border-radius:50%;"${measureAttr}></div>`;
     case "longText":
-      return `<div class="print-element" style="${style}${textStyle(opts)}${elementFitStyle(fit, opts)}"${measureAttr}${fitAttr}>${esc(opts.formatter ?? opts.testData ?? "")}</div>`;
+      return `<div class="print-element" style="${style}${textStyle(opts)}${indentStyle(opts)}${elementFitStyle(fit, opts)}"${measureAttr}${fitAttr}>${esc(opts.formatter ?? opts.testData ?? "")}</div>`;
     case "html":
       return `<div class="print-element" style="${style}"${measureAttr}>${opts.testData ?? opts.title ?? ""}</div>`;
     default:
@@ -2623,6 +2704,8 @@ function codeImgHtml(value, cellType, opts, io) {
     const svg = codeRenderer.render(value, cellType, {
       barcodeType: opts.barcodeType,
       qrCodeLevel: opts.qrCodeLevel != null ? String(opts.qrCodeLevel) : void 0,
+      // 0 是合法档（无白边），必须用 typeof 判定而非 or/?? 之类假值判断
+      qrQuietZone: typeof opts.qrQuietZone === "number" ? opts.qrQuietZone : void 0,
       showText: opts.hideTitle !== void 0 ? !opts.hideTitle : opts.showBarcodeText,
       barWidth: typeof opts.barWidth === "number" ? opts.barWidth : void 0,
       fontSize: typeof opts.fontSize === "number" ? opts.fontSize : void 0,
@@ -2633,10 +2716,8 @@ function codeImgHtml(value, cellType, opts, io) {
     if (isBarcode && /^<svg[\s>]/i.test(svg)) return inlineCodeSvgHtml(svg);
     const src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
     const styleParts = [];
-    styleParts.push("max-width:100%", "max-height:100%", "display:block", "margin:auto");
-    if (fit) {
-      styleParts.push(`object-fit:${fit}`);
-    }
+    styleParts.push("width:100%", "height:100%", "max-width:100%", "max-height:100%", "display:block", "margin:auto");
+    styleParts.push(`object-fit:${fit || "contain"}`);
     if (maxWidth) {
       styleParts.push(`max-width:${maxWidth}mm`);
     }
@@ -2664,6 +2745,7 @@ function matrixCellStyle(cell, opts) {
   if (color) parts.push(`color:${color}`);
   if (cell.backgroundColor) parts.push(`background-color:${cell.backgroundColor}`);
   parts.push(`text-align:${cell.align ?? "left"}`);
+  if (cell.align === "justify") parts.push("text-align-last:justify");
   parts.push(`vertical-align:${cell.valign ?? "middle"}`);
   parts.push(`padding:${padding}mm`);
   parts.push(cell.wordWrap === false ? "white-space:nowrap;overflow:hidden" : "word-break:break-all");
@@ -2703,7 +2785,10 @@ function renderMatrixRows(renderRows, start, end, opts, withRowIndex, ctx, fitOw
         const fit = cell.fit || "contain";
         const maxWidth = cell.maxWidth ? `max-width:${cell.maxWidth}mm;` : "max-width:100%;";
         const maxHeight = cell.maxHeight ? `max-height:${cell.maxHeight}mm;` : "max-height:100%;";
-        inner = `<div style="width:100%;height:100%;display:flex;align-items:center;justify-content:center;overflow:hidden;"><img src="${esc(resolveCellContent(cell, ctx))}" style="object-fit:${fit};${maxWidth}${maxHeight}display:block;" /></div>`;
+        const boxMm = cellImageBoxMm(fit, cellFitCapMm(renderRows, r, cell, defaultPadding));
+        const boxHeight = boxMm === void 0 ? "height:100%" : `height:${boxMm}mm`;
+        const imgBox = boxMm === void 0 ? "" : "width:100%;height:100%;";
+        inner = `<div style="width:100%;${boxHeight};display:flex;align-items:center;justify-content:center;overflow:hidden;"><img src="${esc(resolveCellContent(cell, ctx))}" style="${imgBox}object-fit:${fit};${cropStyle(fit, cell.fitScale, cell.objectPosition)}${maxWidth}${maxHeight}display:block;" /></div>`;
       } else {
         inner = renderTextCellInner(renderRows, r, colIndex, cell, opts, fitOwner, defaultPadding, ctx);
       }
@@ -3046,7 +3131,8 @@ function codeSpecKey(value, cellType, opts = {}) {
     opts.qrCodeLevel ?? null,
     opts.showText ?? null,
     opts.barWidth ?? null,
-    opts.fontSize ?? null
+    opts.fontSize ?? null,
+    opts.qrQuietZone ?? null
   ]);
 }
 function createMapCodeRenderer(map) {

package/dist/index.d.cts

@@ -1,13 +1,13 @@
 /*!
- * @worm-vue3-print/core v1.3.6
+ * @worm-vue3-print/core v1.3.8
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
  */
-import { T as TemplateData, C as CodeRenderer, P as PageLayout, J as MeasuredElement, K as TemplateElement, W as WatermarkOptions, L as PaperMm, N as ViewportPx, O as HeightSource, Q as MarginsMm, S as PdfTargetSpec, R as RawMeasurement, a as CodeSpec, X as CodeRenderOptions, D as DriverFactory, Y as ExecutorBundle, Z as TileLayout, _ as PrintJob, $ as PreparedDocument, a0 as RenderPdfResult, M as MultiPageTemplateData, a1 as PrintFontDeclaration } from './driver-CFm0C_yX.cjs';
-export { a2 as ContinuousPaperSize, a3 as EXECUTOR_TARGETS, a4 as ExecutorMethod, a5 as ExecutorTargetKind, a6 as FALLBACK_FONT_STACK, a7 as MAX_BATCH_COPIES, a8 as NormalizedPrintData, a9 as PAPER_DIMENSIONS, aa as PageDriver, ab as PageSection, ac as PaperSize, ad as PrintDataInput, ae as PrintFontFile, af as RenderCell, ag as RenderRequest, ah as RenderRow, ai as SheetPaperSize, aj as TILE_DEFAULTS, H as TextFit, ak as TilingError, al as TilingIssue, am as TilingIssueCode, an as TilingOptions, ao as TilingResolveOptions, ap as TilingTemplateInput, aq as buildFontFaceCss, ar as computeMaxColumns, as as computeTileLayout, at as escapeInlineStyleValue, au as getPaperDimensions, av as isContinuousPaper, aw as isContinuousPaperSize, ax as normalizePrintData, ay as normalizeTilingOptions, az as resolveSheetMm, aA as roundMm, aB as tilePosition, aC as toFontFamilyStack, aD as validateTiling } from './driver-CFm0C_yX.cjs';
-import { F as FitFontSize, P as PrintRuntime } from './ports-BXYcHExa.cjs';
-export { C as CellFitRowKind, h as DEFAULT_READINESS_MS, D as DEFAULT_SHRINK_MIN_FONT_SIZE_PT, i as DEFAULT_TIMEOUT_MS, M as MIN_SHRINK_FONT_SIZE_PT, j as MeasureResult, k as PrintSession, S as SessionBudget, c as cellFitCapMm, a as cellFitKey, f as floorFontSize, p as parseCellFitKey, r as resolveCellTextFit, d as resolveElementTextFit, e as resolveShrinkMinFontSize, g as roundFontSize } from './ports-BXYcHExa.cjs';
+import { T as TemplateData, C as CodeRenderer, P as PageLayout, J as MeasuredElement, K as TemplateElement, W as WatermarkOptions, L as PaperMm, N as ViewportPx, O as HeightSource, Q as MarginsMm, S as PdfTargetSpec, R as RawMeasurement, a as CodeSpec, X as CodeRenderOptions, D as DriverFactory, Y as ExecutorBundle, Z as TileLayout, _ as PrintJob, $ as PreparedDocument, a0 as RenderPdfResult, M as MultiPageTemplateData, a1 as PrintFontDeclaration } from './driver-hJxBl2_n.cjs';
+export { a2 as ContinuousPaperSize, a3 as EXECUTOR_TARGETS, a4 as ExecutorMethod, a5 as ExecutorTargetKind, a6 as FALLBACK_FONT_STACK, a7 as MAX_BATCH_COPIES, a8 as NormalizedPrintData, a9 as PAPER_DIMENSIONS, aa as PageDriver, ab as PageSection, ac as PaperSize, ad as PrintDataInput, ae as PrintFontFile, af as RenderCell, ag as RenderRequest, ah as RenderRow, ai as SheetPaperSize, aj as TILE_DEFAULTS, H as TextFit, ak as TilingError, al as TilingIssue, am as TilingIssueCode, an as TilingOptions, ao as TilingResolveOptions, ap as TilingTemplateInput, aq as buildFontFaceCss, ar as computeMaxColumns, as as computeTileLayout, at as escapeInlineStyleValue, au as getPaperDimensions, av as isContinuousPaper, aw as isContinuousPaperSize, ax as normalizePrintData, ay as normalizeTilingOptions, az as resolveSheetMm, aA as roundMm, aB as tilePosition, aC as toFontFamilyStack, aD as validateTiling } from './driver-hJxBl2_n.cjs';
+import { F as FitFontSize, P as PrintRuntime } from './ports-B-Jb2XwT.cjs';
+export { C as CellFitRowKind, i as DEFAULT_READINESS_MS, D as DEFAULT_SHRINK_MIN_FONT_SIZE_PT, j as DEFAULT_TIMEOUT_MS, M as MIN_SHRINK_FONT_SIZE_PT, k as MeasureResult, l as PrintSession, S as SessionBudget, c as cellFitCapMm, a as cellFitKey, f as floorFontSize, p as parseCellFitKey, r as resolveCellTextFit, e as resolveElementTextFit, g as resolveShrinkMinFontSize, h as roundFontSize } from './ports-B-Jb2XwT.cjs';
 
 type TokenType = 'num' | 'str' | 'bool' | 'ident' | 'punc';
 interface Token {
@@ -113,9 +113,7 @@ declare function formatMoney(value: any): string;
  * 支持: YYYY, MM, DD, HH, mm, ss
  */
 declare function formatDate(value: any, fmt: string): string;
-/**
- * 数字转大写金额
- */
+/** 数字转大写金额（人民币票据规范：四位一节，万/亿 节单位不可缺） */
 declare function toUpperCaseAmount(value: any): string;
 /**
  * 条件判断函数

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 /*!
- * @worm-vue3-print/core v1.3.6
+ * @worm-vue3-print/core v1.3.8
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
  */
-import { T as TemplateData, C as CodeRenderer, P as PageLayout, J as MeasuredElement, K as TemplateElement, W as WatermarkOptions, L as PaperMm, N as ViewportPx, O as HeightSource, Q as MarginsMm, S as PdfTargetSpec, R as RawMeasurement, a as CodeSpec, X as CodeRenderOptions, D as DriverFactory, Y as ExecutorBundle, Z as TileLayout, _ as PrintJob, $ as PreparedDocument, a0 as RenderPdfResult, M as MultiPageTemplateData, a1 as PrintFontDeclaration } from './driver-CFm0C_yX.js';
-export { a2 as ContinuousPaperSize, a3 as EXECUTOR_TARGETS, a4 as ExecutorMethod, a5 as ExecutorTargetKind, a6 as FALLBACK_FONT_STACK, a7 as MAX_BATCH_COPIES, a8 as NormalizedPrintData, a9 as PAPER_DIMENSIONS, aa as PageDriver, ab as PageSection, ac as PaperSize, ad as PrintDataInput, ae as PrintFontFile, af as RenderCell, ag as RenderRequest, ah as RenderRow, ai as SheetPaperSize, aj as TILE_DEFAULTS, H as TextFit, ak as TilingError, al as TilingIssue, am as TilingIssueCode, an as TilingOptions, ao as TilingResolveOptions, ap as TilingTemplateInput, aq as buildFontFaceCss, ar as computeMaxColumns, as as computeTileLayout, at as escapeInlineStyleValue, au as getPaperDimensions, av as isContinuousPaper, aw as isContinuousPaperSize, ax as normalizePrintData, ay as normalizeTilingOptions, az as resolveSheetMm, aA as roundMm, aB as tilePosition, aC as toFontFamilyStack, aD as validateTiling } from './driver-CFm0C_yX.js';
-import { F as FitFontSize, P as PrintRuntime } from './ports-Bdst9MWJ.js';
-export { C as CellFitRowKind, h as DEFAULT_READINESS_MS, D as DEFAULT_SHRINK_MIN_FONT_SIZE_PT, i as DEFAULT_TIMEOUT_MS, M as MIN_SHRINK_FONT_SIZE_PT, j as MeasureResult, k as PrintSession, S as SessionBudget, c as cellFitCapMm, a as cellFitKey, f as floorFontSize, p as parseCellFitKey, r as resolveCellTextFit, d as resolveElementTextFit, e as resolveShrinkMinFontSize, g as roundFontSize } from './ports-Bdst9MWJ.js';
+import { T as TemplateData, C as CodeRenderer, P as PageLayout, J as MeasuredElement, K as TemplateElement, W as WatermarkOptions, L as PaperMm, N as ViewportPx, O as HeightSource, Q as MarginsMm, S as PdfTargetSpec, R as RawMeasurement, a as CodeSpec, X as CodeRenderOptions, D as DriverFactory, Y as ExecutorBundle, Z as TileLayout, _ as PrintJob, $ as PreparedDocument, a0 as RenderPdfResult, M as MultiPageTemplateData, a1 as PrintFontDeclaration } from './driver-hJxBl2_n.js';
+export { a2 as ContinuousPaperSize, a3 as EXECUTOR_TARGETS, a4 as ExecutorMethod, a5 as ExecutorTargetKind, a6 as FALLBACK_FONT_STACK, a7 as MAX_BATCH_COPIES, a8 as NormalizedPrintData, a9 as PAPER_DIMENSIONS, aa as PageDriver, ab as PageSection, ac as PaperSize, ad as PrintDataInput, ae as PrintFontFile, af as RenderCell, ag as RenderRequest, ah as RenderRow, ai as SheetPaperSize, aj as TILE_DEFAULTS, H as TextFit, ak as TilingError, al as TilingIssue, am as TilingIssueCode, an as TilingOptions, ao as TilingResolveOptions, ap as TilingTemplateInput, aq as buildFontFaceCss, ar as computeMaxColumns, as as computeTileLayout, at as escapeInlineStyleValue, au as getPaperDimensions, av as isContinuousPaper, aw as isContinuousPaperSize, ax as normalizePrintData, ay as normalizeTilingOptions, az as resolveSheetMm, aA as roundMm, aB as tilePosition, aC as toFontFamilyStack, aD as validateTiling } from './driver-hJxBl2_n.js';
+import { F as FitFontSize, P as PrintRuntime } from './ports-CJ0SUYFt.js';
+export { C as CellFitRowKind, i as DEFAULT_READINESS_MS, D as DEFAULT_SHRINK_MIN_FONT_SIZE_PT, j as DEFAULT_TIMEOUT_MS, M as MIN_SHRINK_FONT_SIZE_PT, k as MeasureResult, l as PrintSession, S as SessionBudget, c as cellFitCapMm, a as cellFitKey, f as floorFontSize, p as parseCellFitKey, r as resolveCellTextFit, e as resolveElementTextFit, g as resolveShrinkMinFontSize, h as roundFontSize } from './ports-CJ0SUYFt.js';
 
 type TokenType = 'num' | 'str' | 'bool' | 'ident' | 'punc';
 interface Token {
@@ -113,9 +113,7 @@ declare function formatMoney(value: any): string;
  * 支持: YYYY, MM, DD, HH, mm, ss
  */
 declare function formatDate(value: any, fmt: string): string;
-/**
- * 数字转大写金额
- */
+/** 数字转大写金额（人民币票据规范：四位一节，万/亿 节单位不可缺） */
 declare function toUpperCaseAmount(value: any): string;
 /**
  * 条件判断函数