@worm-vue3-print/core 1.3.8 → 1.3.10

package/dist/browser/index.cjs

@@ -1,5 +1,5 @@
 /*!
- * @worm-vue3-print/core v1.3.8
+ * @worm-vue3-print/core v1.3.10
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
@@ -200,9 +200,13 @@ var import_qrcode = __toESM(require("qrcode"), 1);
 // src/render/barcode-dot.ts
 var MM_PER_INCH = 25.4;
 var BARCODE_QUIET_ZONE_MODULES = 10;
+function barcodeQuietZoneModules(value) {
+  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : BARCODE_QUIET_ZONE_MODULES;
+}
 var BARCODE_BAR_HEIGHT_MODULES = 30;
 var BARCODE_TEXT_FONT_SIZE_MODULES = 10;
 var BARCODE_MARGIN_BOTTOM_MODULES = 2;
+var QR_DEFAULT_QUIET_MODULES = 0;
 var BARCODE_MODULE_WIDTH_MM = 0.25;
 function barcodeUnitsPerModule(barWidth) {
   const raw = typeof barWidth === "number" && Number.isFinite(barWidth) ? barWidth : 2;
@@ -211,6 +215,36 @@ function barcodeUnitsPerModule(barWidth) {
 function barcodePreferredModuleWidthMm(barWidth) {
   return barcodeUnitsPerModule(barWidth) * BARCODE_MODULE_WIDTH_MM;
 }
+function barcodeBarHeightModules(input) {
+  const { barHeightMm, moduleWidthMm, boxHeightMm, textModules } = input;
+  const hasHeight = typeof barHeightMm === "number" && Number.isFinite(barHeightMm) && barHeightMm > 0;
+  const hasGranularity = typeof moduleWidthMm === "number" && Number.isFinite(moduleWidthMm) && moduleWidthMm > 0;
+  if (!hasHeight || !hasGranularity) return BARCODE_BAR_HEIGHT_MODULES;
+  const wanted = Math.max(1, Math.round(barHeightMm / moduleWidthMm));
+  const hasBox = typeof boxHeightMm === "number" && Number.isFinite(boxHeightMm) && boxHeightMm > 0;
+  if (!hasBox) return wanted;
+  const text = typeof textModules === "number" && Number.isFinite(textModules) && textModules > 0 ? textModules : 0;
+  const cap = Math.floor((boxHeightMm - text * moduleWidthMm) / moduleWidthMm);
+  return Math.max(1, Math.min(wanted, cap));
+}
+function dotAlignedModuleWidth(preferredMm, maxModuleMm, dotsPerMm) {
+  const preferredDots = Math.max(1, Math.round(preferredMm * dotsPerMm));
+  const maxDots = Math.floor(maxModuleMm * dotsPerMm);
+  if (maxDots < 1) return null;
+  const dotsPerModule = Math.min(preferredDots, maxDots);
+  return { dotsPerModule, preferredDots, moduleWidthMm: dotsPerModule / dotsPerMm };
+}
+function barcodeWidthBoundModuleWidthMm(input) {
+  const preferredMm = barcodePreferredModuleWidthMm(input.barWidth);
+  const unitWidth = Math.max(1, Math.ceil(input.unitWidth));
+  const maxModuleMm = input.boxWidthMm > 0 ? input.boxWidthMm / unitWidth : Number.POSITIVE_INFINITY;
+  const dpi = input.dpi;
+  if (typeof dpi === "number" && Number.isFinite(dpi) && dpi > 0) {
+    const aligned = dotAlignedModuleWidth(preferredMm, maxModuleMm, dpi / MM_PER_INCH);
+    if (aligned) return aligned.moduleWidthMm;
+  }
+  return Math.min(preferredMm, maxModuleMm);
+}
 function barcodeAvailableBoxMm(boxMm, maxMm) {
   const box = typeof boxMm === "number" && boxMm > 0 ? boxMm : Number.POSITIVE_INFINITY;
   const limit = typeof maxMm === "number" && maxMm > 0 ? Math.min(box, maxMm) : box;
@@ -226,18 +260,14 @@ function resolveBarcodeSize(input) {
   );
   const dpi = input.dpi;
   if (typeof dpi === "number" && Number.isFinite(dpi) && dpi > 0) {
-    const dotsPerMm = dpi / MM_PER_INCH;
-    const preferredDots = Math.max(1, Math.round(preferredModuleMm * dotsPerMm));
-    const maxDots = Math.floor(maxModuleMm * dotsPerMm);
-    if (maxDots >= 1) {
-      const dotsPerModule = Math.min(preferredDots, maxDots);
-      const moduleWidthMm2 = dotsPerModule / dotsPerMm;
+    const aligned = dotAlignedModuleWidth(preferredModuleMm, maxModuleMm, dpi / MM_PER_INCH);
+    if (aligned) {
       return {
-        moduleWidthMm: moduleWidthMm2,
-        widthMm: unitWidth * moduleWidthMm2,
-        heightMm: unitHeight * moduleWidthMm2,
-        dotsPerModule,
-        scaledDown: dotsPerModule < preferredDots
+        moduleWidthMm: aligned.moduleWidthMm,
+        widthMm: unitWidth * aligned.moduleWidthMm,
+        heightMm: unitHeight * aligned.moduleWidthMm,
+        dotsPerModule: aligned.dotsPerModule,
+        scaledDown: aligned.dotsPerModule < aligned.preferredDots
       };
     }
   }
@@ -250,6 +280,39 @@ function resolveBarcodeSize(input) {
     scaledDown: moduleWidthMm < preferredModuleMm
   };
 }
+function layoutBarcodeSize(input) {
+  const upm = barcodeUnitsPerModule(input.barWidth);
+  const settle = (units) => resolveBarcodeSize({
+    unitWidth: units.widthUnits / upm,
+    unitHeight: units.heightUnits / upm,
+    boxWidthMm: input.boxWidthMm,
+    boxHeightMm: input.boxHeightMm,
+    dpi: input.dpi,
+    barWidth: input.barWidth
+  });
+  const first = input.measure(BARCODE_BAR_HEIGHT_MODULES);
+  if (!first) return { barHeightModules: BARCODE_BAR_HEIGHT_MODULES, size: null };
+  const hasHeight = typeof input.barHeightMm === "number" && Number.isFinite(input.barHeightMm) && input.barHeightMm > 0;
+  if (!hasHeight) return { barHeightModules: BARCODE_BAR_HEIGHT_MODULES, size: settle(first) };
+  const textModules = Math.max(0, first.heightUnits / upm - BARCODE_BAR_HEIGHT_MODULES);
+  const barHeightModules = barcodeBarHeightModules({
+    barHeightMm: input.barHeightMm,
+    moduleWidthMm: barcodeWidthBoundModuleWidthMm({
+      unitWidth: first.widthUnits / upm,
+      boxWidthMm: input.boxWidthMm,
+      dpi: input.dpi,
+      barWidth: input.barWidth
+    }),
+    boxHeightMm: input.boxHeightMm,
+    textModules
+  });
+  if (barHeightModules === BARCODE_BAR_HEIGHT_MODULES) {
+    return { barHeightModules, size: settle(first) };
+  }
+  const second = input.measure(barHeightModules);
+  if (!second) return { barHeightModules: BARCODE_BAR_HEIGHT_MODULES, size: null };
+  return { barHeightModules, size: settle(second) };
+}
 
 // src/browser/browser-code-renderer.ts
 var SVG_NS = "http://www.w3.org/2000/svg";
@@ -263,36 +326,39 @@ function readViewBox(svg) {
 function renderBarcodeSvg(value, opts) {
   const svg = document.createElementNS(SVG_NS, "svg");
   const unitPerModule = barcodeUnitsPerModule(opts.barWidth);
-  (0, import_jsbarcode.default)(svg, value, {
-    format: opts.barcodeType || "CODE128",
-    width: unitPerModule,
-    height: BARCODE_BAR_HEIGHT_MODULES * unitPerModule,
-    displayValue: opts.showText !== false,
-    fontSize: (opts.fontSize ?? BARCODE_TEXT_FONT_SIZE_MODULES) * unitPerModule,
-    // 静区只留左右：上下留白会白白吃掉元素高度（jsbarcode 的 margin 是四边通配）
-    margin: 0,
-    marginLeft: BARCODE_QUIET_ZONE_MODULES * unitPerModule,
-    marginRight: BARCODE_QUIET_ZONE_MODULES * unitPerModule,
-    marginTop: 0,
-    marginBottom: BARCODE_MARGIN_BOTTOM_MODULES * unitPerModule
-  });
-  const viewBox = readViewBox(svg);
-  if (viewBox) {
-    const size = resolveBarcodeSize({
-      unitWidth: viewBox.width / unitPerModule,
-      unitHeight: viewBox.height / unitPerModule,
-      boxWidthMm: opts.targetWidthMm ?? 0,
-      boxHeightMm: opts.targetHeightMm ?? 0,
-      dpi: opts.printerDpi,
-      barWidth: opts.barWidth
+  const quietModules = barcodeQuietZoneModules(opts.barQuietZone);
+  const measure = (barHeightModules) => {
+    (0, import_jsbarcode.default)(svg, value, {
+      format: opts.barcodeType || "CODE128",
+      width: unitPerModule,
+      height: barHeightModules * unitPerModule,
+      displayValue: opts.showText !== false,
+      fontSize: (opts.fontSize ?? BARCODE_TEXT_FONT_SIZE_MODULES) * unitPerModule,
+      // 静区只留左右：上下留白会白白吃掉元素高度（jsbarcode 的 margin 是四边通配）
+      margin: 0,
+      marginLeft: quietModules * unitPerModule,
+      marginRight: quietModules * unitPerModule,
+      marginTop: 0,
+      marginBottom: BARCODE_MARGIN_BOTTOM_MODULES * unitPerModule
     });
-    svg.setAttribute("width", `${size.widthMm}mm`);
-    svg.setAttribute("height", `${size.heightMm}mm`);
+    const viewBox = readViewBox(svg);
+    return viewBox ? { widthUnits: viewBox.width, heightUnits: viewBox.height } : null;
+  };
+  const layout = layoutBarcodeSize({
+    barHeightMm: opts.barHeightMm,
+    boxWidthMm: opts.targetWidthMm ?? 0,
+    boxHeightMm: opts.targetHeightMm ?? 0,
+    dpi: opts.printerDpi,
+    barWidth: opts.barWidth,
+    measure
+  });
+  if (layout.size) {
+    svg.setAttribute("width", `${layout.size.widthMm}mm`);
+    svg.setAttribute("height", `${layout.size.heightMm}mm`);
   }
   svg.setAttribute("shape-rendering", "crispEdges");
   return svg.outerHTML;
 }
-var QR_DEFAULT_QUIET_MODULES = 0;
 function qrQuietModules(value) {
   return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : QR_DEFAULT_QUIET_MODULES;
 }
@@ -343,7 +409,9 @@ function normalizeFit(value) {
 }
 var ELEMENT_DEFAULT_FIT = {
   text: "clip",
-  longText: "autoHeight"
+  longText: "autoHeight",
+  // 流式列表一框一页：超出元素框高的单元按截断处理，不自动撑破纸面（specs 第八节第 8 项）
+  flowList: "clip"
 };
 function resolveElementTextFit(type, opts) {
   return normalizeFit(opts?.textFit) ?? ELEMENT_DEFAULT_FIT[type] ?? "clip";
@@ -1503,6 +1571,123 @@ function evaluateTemplate(text, ctx) {
   }
 }
 
+// src/render/flow-list.ts
+var FLOW_MIN_COLUMNS = 1;
+var FLOW_MAX_COLUMNS = 12;
+var FLOW_MIN_ROW_HEIGHT_MM = 3;
+var FLOW_MAX_ROW_HEIGHT_MM = 100;
+var FLOW_MIN_GAP_X_MM = 0;
+var FLOW_MAX_GAP_X_MM = 50;
+var PT_TO_MM = 25.4 / 72;
+function clampInt(value, min2, max2, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
+  return Math.min(max2, Math.max(min2, Math.round(value)));
+}
+function resolveFlowColumns(value) {
+  return clampInt(value, FLOW_MIN_COLUMNS, FLOW_MAX_COLUMNS, 4);
+}
+function resolveFlowGapX(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return 4;
+  return Math.min(FLOW_MAX_GAP_X_MM, Math.max(FLOW_MIN_GAP_X_MM, value));
+}
+function resolveFlowRowHeight(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return 8;
+  return Math.min(FLOW_MAX_ROW_HEIGHT_MM, Math.max(FLOW_MIN_ROW_HEIGHT_MM, value));
+}
+function resolveFlowMaxSpan(value, columns) {
+  const cols = resolveFlowColumns(columns);
+  const fallback = Math.min(2, cols);
+  if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
+  return Math.min(cols, Math.max(1, Math.round(value)));
+}
+function flowColumnWidthMm(width, columns, gapX) {
+  const cols = resolveFlowColumns(columns);
+  const gap = resolveFlowGapX(gapX);
+  const avail = width - gap * (cols - 1);
+  if (avail <= 0) return 0;
+  return avail / cols;
+}
+function flowSpanWidthMm(colUnitMm, gapX, span) {
+  const k = Math.max(1, Math.floor(span));
+  return colUnitMm * k + gapX * (k - 1);
+}
+function estimateTextWidthMm(text, fontSizePt) {
+  if (!text) return 0;
+  const em = typeof fontSizePt === "number" && Number.isFinite(fontSizePt) && fontSizePt > 0 ? fontSizePt * PT_TO_MM : 12 * PT_TO_MM;
+  let units = 0;
+  for (const ch of text) {
+    if (ch === " ") {
+      units += 0.28;
+      continue;
+    }
+    const c = ch.codePointAt(0) ?? 0;
+    if (c >= 12288 && c <= 12351 || c >= 13312 && c <= 19903 || c >= 19968 && c <= 40959 || c >= 63744 && c <= 64255 || c >= 65280 && c <= 65376 || c >= 65504 && c <= 65510 || c >= 131072) units += 1;
+    else if (/^[0-9A-Z]$/.test(ch)) units += 0.6;
+    else if (/^[a-z]$/.test(ch)) units += 0.5;
+    else if (/^[\u0020-\u007f]$/.test(ch)) units += 0.4;
+    else units += 0.75;
+  }
+  return units * em;
+}
+function spanForText(text, cfg) {
+  if (!cfg.autoSpan) return 1;
+  const ceiling = resolveFlowMaxSpan(cfg.maxSpan, cfg.columns);
+  if (ceiling <= 1 || cfg.colUnitMm <= 0) return 1;
+  const need = estimateTextWidthMm(text, cfg.fontSizePt);
+  for (let k = 1; k <= ceiling; k++) {
+    if (need <= flowSpanWidthMm(cfg.colUnitMm, cfg.gapX, k)) return k;
+  }
+  return ceiling;
+}
+function layoutFlowList(items, cfg) {
+  const columns = resolveFlowColumns(cfg.columns);
+  const gapX = resolveFlowGapX(cfg.gapX);
+  const colUnitMm = flowColumnWidthMm(cfg.width, columns, gapX);
+  const maxSpan = resolveFlowMaxSpan(cfg.maxSpan, columns);
+  const rows = [];
+  let current = [];
+  let used = 0;
+  for (const raw of items) {
+    const text = String(raw ?? "");
+    const span = spanForText(text, { ...cfg, columns, gapX, maxSpan, colUnitMm });
+    if (current.length > 0 && used + span > columns) {
+      rows.push({ cells: current });
+      current = [];
+      used = 0;
+    }
+    current.push({ text, span });
+    used += span;
+  }
+  if (current.length > 0) rows.push({ cells: current });
+  return rows;
+}
+function detectFlowListKey(expr, data) {
+  if (typeof expr !== "string" || !expr.includes("{") || !data) return void 0;
+  const roots = /* @__PURE__ */ new Set();
+  for (const token of expr.matchAll(/\{([^{}]*)\}/g)) {
+    for (const piece of (token[1] ?? "").split(/[^A-Za-z0-9_\u4e00-\u9fa5.]/)) {
+      const root = piece.split(".")[0];
+      if (root && !/^\d/.test(root)) roots.add(root);
+    }
+  }
+  for (const root of roots) {
+    if (Array.isArray(data[root])) return root;
+  }
+  return void 0;
+}
+var mmNum = (v) => `${Math.round(v * 1e3) / 1e3}mm`;
+function flowGridStyle(cfg) {
+  const columns = resolveFlowColumns(cfg.columns);
+  const gapX = resolveFlowGapX(cfg.gapX);
+  const rowHeight = resolveFlowRowHeight(cfg.rowHeight);
+  return [
+    `display:grid`,
+    `grid-template-columns:repeat(${columns},minmax(0,1fr))`,
+    `column-gap:${mmNum(gapX)}`,
+    `grid-auto-rows:minmax(${mmNum(rowHeight)},auto)`
+  ].join(";");
+}
+
 // src/render/data-binder.ts
 function bindData(template, printData, baseUrl, fontBaseUrl) {
   const data = { ...resolveSystemVariables(), ...printData ?? {} };
@@ -1530,7 +1715,8 @@ function bindData(template, printData, baseUrl, fontBaseUrl) {
 }
 function bindElement(el, data, baseUrl) {
   const cloned = { ...el, options: { ...el.options } };
-  if (typeof cloned.options.formatter === "string") {
+  const isFlowList = cloned.type === "flowList" || cloned.printElementType?.type === "flowList";
+  if (!isFlowList && typeof cloned.options.formatter === "string") {
     const raw = cloned.options.formatter;
     if (referencesPageNumbers(raw)) {
       cloned.options.rawFormatter = raw;
@@ -1552,8 +1738,23 @@ function bindElement(el, data, baseUrl) {
   if (cloned.type === "table" || cloned.printElementType?.type === "table") {
     bindTableData(cloned, data);
   }
+  if (cloned.type === "flowList" || cloned.printElementType?.type === "flowList") {
+    bindFlowListData(cloned, data);
+  }
   return cloned;
 }
+function bindFlowListData(el, data) {
+  const template = typeof el.options.formatter === "string" ? el.options.formatter : "";
+  const source = { ...el.options, dataSource: el.options.dataSource ?? detectFlowListKey(template, data) };
+  const { list, key } = resolveListSource(source, data);
+  const itemCtx = (item) => key ? { ...data, ...item, [key]: item } : { ...data, ...item };
+  const items = list.map((item) => {
+    if (!template) return String(item ?? "");
+    return referencesPageNumbers(template) ? template : evaluateTemplate(template, itemCtx(item));
+  });
+  el.options._flowItems = items;
+  el.options._flowRawFormatter = referencesPageNumbers(template) ? template : void 0;
+}
 function resolveListSource(opts, data) {
   const explicitKey = opts.dataSource ?? opts.fields?.[0]?.dataSource ?? opts.fields?.[0]?.field;
   if (explicitKey && Array.isArray(data[explicitKey])) {
@@ -1629,6 +1830,12 @@ function makeRenderRow(row, resolve, keepRaw = false) {
       barcodeType: cell.barcodeType,
       qrCodeLevel: cell.qrCodeLevel,
       qrQuietZone: cell.qrQuietZone,
+      barQuietZone: cell.barQuietZone,
+      // 条高同样必须进白名单：漏一个，属性台填的 mm 就只在设计器生效、出纸静默按缺省 30 模块
+      barHeight: cell.barHeight,
+      // 条宽与条码文本字号也必须在白名单里：漏一个，属性台填的倍率就只在设计器生效、出纸静默按缺省
+      barWidth: cell.barWidth,
+      barFontSize: cell.barFontSize,
       showBarcodeText: cell.showBarcodeText,
       printerDpi: cell.printerDpi,
       fit: cell.fit,
@@ -1879,7 +2086,8 @@ function elementBlock() {
 .print-table td {
   border: 1px solid #ccc;
   padding: 2mm 3mm;
-  word-break: break-all;
+  word-break: normal;
+  overflow-wrap: break-word;
   overflow: hidden;
 }
 .print-table thead th {
@@ -2103,6 +2311,7 @@ var SELF_BORDER_TYPES = /* @__PURE__ */ new Set(["rect", "oval", "hline", "vline
 var VALID_STYLES = /* @__PURE__ */ new Set(["solid", "dashed", "dotted", "double"]);
 function parseBorder(width, style, color) {
   if (typeof width !== "number" || !Number.isFinite(width) || width <= 0) return null;
+  if (style === "none") return null;
   return {
     borderWidth: `${width}pt`,
     borderStyle: typeof style === "string" && VALID_STYLES.has(style) ? style : "solid",
@@ -3047,6 +3256,27 @@ function renderElement(el, isMeasure, containerStyle, overrideTop, ctx) {
       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)}${indentStyle(opts)}${elementFitStyle(fit, opts)}"${measureAttr}${fitAttr}>${esc(opts.formatter ?? opts.testData ?? "")}</div>`;
+    case "flowList": {
+      const columns = resolveFlowColumns(opts.flowColumns);
+      const gapX = resolveFlowGapX(opts.flowGapX);
+      const rowHeight = resolveFlowRowHeight(opts.flowRowHeight);
+      const maxSpan = resolveFlowMaxSpan(opts.flowMaxSpan, columns);
+      const boundItems = Array.isArray(opts._flowItems) ? opts._flowItems : void 0;
+      const items = boundItems && boundItems.length > 0 ? boundItems : String(opts.testData ?? "").split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+      const cfg = {
+        width,
+        columns,
+        gapX,
+        rowHeight,
+        maxSpan,
+        fontSizePt: opts.fontSize ?? 12,
+        autoSpan: opts.flowAutoSpan === true
+      };
+      const cells = layoutFlowList(items, cfg).flatMap((row) => row.cells).map((c) => `<div class="print-flow-cell"${c.span > 1 ? ` style="grid-column:span ${c.span};"` : ""}>${esc(c.text)}</div>`).join("\n  ");
+      return `<div class="print-element" style="${style}${textStyle(opts)}overflow:hidden;${flowGridStyle(cfg)};"${measureAttr}${fitAttr}>
+  ${cells}
+</div>`;
+    }
     case "html":
       return `<div class="print-element" style="${style}"${measureAttr}>${opts.testData ?? opts.title ?? ""}</div>`;
     default:
@@ -3063,9 +3293,13 @@ function codeImgHtml(value, cellType, opts, io) {
       qrCodeLevel: opts.qrCodeLevel != null ? String(opts.qrCodeLevel) : void 0,
       // 0 是合法档（无白边），必须用 typeof 判定而非 or/?? 之类假值判断
       qrQuietZone: typeof opts.qrQuietZone === "number" ? opts.qrQuietZone : void 0,
+      barQuietZone: typeof opts.barQuietZone === "number" ? opts.barQuietZone : void 0,
+      // 条高（mm）：元素台与单元格台都写 barHeight，非法/未填交由布局函数回退缺省档
+      barHeightMm: typeof opts.barHeight === "number" ? opts.barHeight : 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,
+      // 元素台的条码文本字号是 fontSize；单元格台的文本字号是 barFontSize（单元格的 fontSize 是正文字号，不该拿来决定条码）
+      fontSize: typeof (opts.barFontSize ?? opts.fontSize) === "number" ? opts.barFontSize ?? opts.fontSize : void 0,
       printerDpi: isBarcode ? io.printerDpi : void 0,
       targetWidthMm: isBarcode ? barcodeAvailableBoxMm(io.targetWidthMm, maxWidth) : void 0,
       targetHeightMm: isBarcode ? barcodeAvailableBoxMm(io.targetHeightMm, maxHeight) : void 0
@@ -3096,8 +3330,9 @@ function matrixCellStyle(cell, opts) {
   const fontSize = cell.fittedFontSize ?? cell.fontSize ?? opts.tableDefaultFontSize;
   const color = cell.color ?? opts.tableDefaultColor;
   const padding = cell.padding ?? opts.tableDefaultPadding ?? 1;
+  const fontFamily = cell.fontFamily ?? opts.tableDefaultFontFamily;
   if (fontSize) parts.push(`font-size:${fontSize}pt`);
-  if (cell.fontFamily) parts.push(`font-family:${escapeInlineStyleValue(toFontFamilyStack(cell.fontFamily))}`);
+  if (fontFamily) parts.push(`font-family:${escapeInlineStyleValue(toFontFamilyStack(fontFamily))}`);
   if (cell.fontWeight) parts.push(`font-weight:${cell.fontWeight}`);
   if (color) parts.push(`color:${color}`);
   if (cell.backgroundColor) parts.push(`background-color:${cell.backgroundColor}`);
@@ -3105,7 +3340,7 @@ function matrixCellStyle(cell, opts) {
   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");
+  parts.push(cell.wordWrap === false ? "white-space:nowrap;overflow:hidden" : "white-space:pre-wrap;word-break:normal;overflow-wrap:break-word");
   const b = cell.borders ?? {};
   for (const side of ["top", "right", "bottom", "left"]) {
     const border = b[side];
@@ -3335,7 +3570,9 @@ function codeSpecKey(value, cellType, opts = {}) {
     opts.showText ?? null,
     opts.barWidth ?? null,
     opts.fontSize ?? null,
-    opts.qrQuietZone ?? null
+    opts.qrQuietZone ?? null,
+    opts.barQuietZone ?? null,
+    opts.barHeightMm ?? null
   ]);
 }
 function createMapCodeRenderer(map) {

package/dist/browser/index.d.cts

@@ -1,11 +1,11 @@
 /*!
- * @worm-vue3-print/core v1.3.8
+ * @worm-vue3-print/core v1.3.10
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
  */
-import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-hJxBl2_n.cjs';
-import { P as PrintRuntime, F as FitFontSize } from '../ports-B-Jb2XwT.cjs';
+import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-DW3mxuRF.cjs';
+import { P as PrintRuntime, F as FitFontSize } from '../ports-DJ7_blE7.cjs';
 
 interface BrowserRenderResult {
     /** 最终多页 HTML 字符串 */

package/dist/browser/index.d.ts

@@ -1,11 +1,11 @@
 /*!
- * @worm-vue3-print/core v1.3.8
+ * @worm-vue3-print/core v1.3.10
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
  */
-import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-hJxBl2_n.js';
-import { P as PrintRuntime, F as FitFontSize } from '../ports-CJ0SUYFt.js';
+import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-DW3mxuRF.js';
+import { P as PrintRuntime, F as FitFontSize } from '../ports-Brn5xcLD.js';
 
 interface BrowserRenderResult {
     /** 最终多页 HTML 字符串 */

package/dist/browser/index.js

@@ -1,23 +1,23 @@
 /*!
- * @worm-vue3-print/core v1.3.8
+ * @worm-vue3-print/core v1.3.10
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
  */
 import {
-  BARCODE_BAR_HEIGHT_MODULES,
   BARCODE_MARGIN_BOTTOM_MODULES,
-  BARCODE_QUIET_ZONE_MODULES,
   BARCODE_TEXT_FONT_SIZE_MODULES,
   EXECUTOR_TARGETS,
+  QR_DEFAULT_QUIET_MODULES,
+  barcodeQuietZoneModules,
   barcodeUnitsPerModule,
   createDomHostRuntime,
   floorFontSize,
+  layoutBarcodeSize,
   mmToPx,
   prepareDocument,
-  resolveBarcodeSize,
   resolveShrinkMinFontSize
-} from "../chunk-TQJGFV2V.js";
+} from "../chunk-7FXIWNYK.js";
 
 // src/browser/browser-code-renderer.ts
 import JsBarcode from "jsbarcode";
@@ -33,36 +33,39 @@ function readViewBox(svg) {
 function renderBarcodeSvg(value, opts) {
   const svg = document.createElementNS(SVG_NS, "svg");
   const unitPerModule = barcodeUnitsPerModule(opts.barWidth);
-  JsBarcode(svg, value, {
-    format: opts.barcodeType || "CODE128",
-    width: unitPerModule,
-    height: BARCODE_BAR_HEIGHT_MODULES * unitPerModule,
-    displayValue: opts.showText !== false,
-    fontSize: (opts.fontSize ?? BARCODE_TEXT_FONT_SIZE_MODULES) * unitPerModule,
-    // 静区只留左右：上下留白会白白吃掉元素高度（jsbarcode 的 margin 是四边通配）
-    margin: 0,
-    marginLeft: BARCODE_QUIET_ZONE_MODULES * unitPerModule,
-    marginRight: BARCODE_QUIET_ZONE_MODULES * unitPerModule,
-    marginTop: 0,
-    marginBottom: BARCODE_MARGIN_BOTTOM_MODULES * unitPerModule
-  });
-  const viewBox = readViewBox(svg);
-  if (viewBox) {
-    const size = resolveBarcodeSize({
-      unitWidth: viewBox.width / unitPerModule,
-      unitHeight: viewBox.height / unitPerModule,
-      boxWidthMm: opts.targetWidthMm ?? 0,
-      boxHeightMm: opts.targetHeightMm ?? 0,
-      dpi: opts.printerDpi,
-      barWidth: opts.barWidth
+  const quietModules = barcodeQuietZoneModules(opts.barQuietZone);
+  const measure = (barHeightModules) => {
+    JsBarcode(svg, value, {
+      format: opts.barcodeType || "CODE128",
+      width: unitPerModule,
+      height: barHeightModules * unitPerModule,
+      displayValue: opts.showText !== false,
+      fontSize: (opts.fontSize ?? BARCODE_TEXT_FONT_SIZE_MODULES) * unitPerModule,
+      // 静区只留左右：上下留白会白白吃掉元素高度（jsbarcode 的 margin 是四边通配）
+      margin: 0,
+      marginLeft: quietModules * unitPerModule,
+      marginRight: quietModules * unitPerModule,
+      marginTop: 0,
+      marginBottom: BARCODE_MARGIN_BOTTOM_MODULES * unitPerModule
     });
-    svg.setAttribute("width", `${size.widthMm}mm`);
-    svg.setAttribute("height", `${size.heightMm}mm`);
+    const viewBox = readViewBox(svg);
+    return viewBox ? { widthUnits: viewBox.width, heightUnits: viewBox.height } : null;
+  };
+  const layout = layoutBarcodeSize({
+    barHeightMm: opts.barHeightMm,
+    boxWidthMm: opts.targetWidthMm ?? 0,
+    boxHeightMm: opts.targetHeightMm ?? 0,
+    dpi: opts.printerDpi,
+    barWidth: opts.barWidth,
+    measure
+  });
+  if (layout.size) {
+    svg.setAttribute("width", `${layout.size.widthMm}mm`);
+    svg.setAttribute("height", `${layout.size.heightMm}mm`);
   }
   svg.setAttribute("shape-rendering", "crispEdges");
   return svg.outerHTML;
 }
-var QR_DEFAULT_QUIET_MODULES = 0;
 function qrQuietModules(value) {
   return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : QR_DEFAULT_QUIET_MODULES;
 }

package/dist/{chunk-ZKHVOCU5.js → chunk-4ZEP2HSH.js}

@@ -1,5 +1,5 @@
 /*!
- * @worm-vue3-print/core v1.3.8
+ * @worm-vue3-print/core v1.3.10
  * Copyright (c) 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-FileCopyrightText: 2026 worm <liu_long_qqcom@qq.com>
  * SPDX-License-Identifier: MIT
@@ -9,7 +9,7 @@ import {
   evaluate,
   parse,
   tokenize
-} from "./chunk-TQJGFV2V.js";
+} from "./chunk-7FXIWNYK.js";
 
 // src/index.ts
 var TemplateEngine = class {