@worm-vue3-print/core 1.3.0 → 1.3.2

package/dist/browser/index.cjs

@@ -954,6 +954,113 @@ var Parser = class {
   }
 };
 
+// src/numeric.ts
+var MAX_DIGITS = 20;
+var EXTRA_SCALE = 8;
+function toNumber(value, fallback = 0) {
+  if (typeof value === "number") return Number.isFinite(value) ? value : fallback;
+  if (typeof value === "string") {
+    const s = value.trim();
+    if (s === "") return fallback;
+    const n = Number(s);
+    return Number.isFinite(n) ? n : fallback;
+  }
+  if (value == null) return fallback;
+  if (typeof value === "boolean") return value ? 1 : 0;
+  return fallback;
+}
+function isNumericLike(value) {
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value === "string") {
+    const s = value.trim();
+    return s !== "" && Number.isFinite(Number(s));
+  }
+  return false;
+}
+function normalizeFloat(value) {
+  if (!Number.isFinite(value) || Number.isInteger(value)) return value;
+  if (Math.abs(value) >= 1e15) return value;
+  return Number(value.toPrecision(12));
+}
+function decimalsOf(n) {
+  if (!Number.isFinite(n) || Number.isInteger(n)) return 0;
+  const s = String(n);
+  if (s.includes("e") || s.includes("E")) return 0;
+  const i = s.indexOf(".");
+  return i === -1 ? 0 : s.length - i - 1;
+}
+function rescale(value, decimals) {
+  if (!Number.isFinite(value)) return 0;
+  const d = Math.min(Math.max(decimals, 0), 12);
+  if (d === 0) return Math.round(value);
+  const f = 10 ** d;
+  const scaled = value * f;
+  if (!Number.isFinite(scaled) || Math.abs(scaled) >= 1e15) return normalizeFloat(value);
+  return Math.round(scaled) / f;
+}
+function decimalAdd(left, right) {
+  const a = toNumber(left);
+  const b = toNumber(right);
+  const raw = a + b;
+  return rescale(raw, Math.max(decimalsOf(a), decimalsOf(b)));
+}
+function decimalSubtract(left, right) {
+  const a = toNumber(left);
+  const b = toNumber(right);
+  const raw = a - b;
+  return rescale(raw, Math.max(decimalsOf(a), decimalsOf(b)));
+}
+function decimalMultiply(left, right) {
+  const a = toNumber(left);
+  const b = toNumber(right);
+  const raw = a * b;
+  return rescale(raw, decimalsOf(a) + decimalsOf(b));
+}
+function decimalDivide(left, right) {
+  const a = toNumber(left);
+  const b = toNumber(right);
+  if (b === 0) return 0;
+  return normalizeFloat(a / b);
+}
+function decimalModulo(left, right) {
+  const a = toNumber(left);
+  const b = toNumber(right);
+  if (b === 0) return 0;
+  return normalizeFloat(a % b);
+}
+function normalizeDigits(digits) {
+  if (digits === void 0 || digits === null) return 2;
+  const d = Math.trunc(toNumber(digits, 2));
+  if (!Number.isFinite(d)) return 2;
+  return Math.min(Math.max(d, -MAX_DIGITS), MAX_DIGITS);
+}
+function roundTo(value, digits, mode) {
+  const n = toNumber(value, 0);
+  const d = normalizeDigits(digits);
+  if (n === 0) return 0;
+  if (Math.abs(n) >= 1e21) return normalizeFloat(n);
+  const scale = Math.max(d, 0) + EXTRA_SCALE;
+  const fixed = n.toFixed(scale);
+  if (!/^-?\d+(\.\d+)?$/.test(fixed)) return normalizeFloat(n);
+  const negative = fixed.startsWith("-");
+  const digitsStr = fixed.replace("-", "").replace(".", "");
+  let scaled = BigInt(digitsStr || "0");
+  if (negative) scaled = -scaled;
+  const pow10 = 10n ** BigInt(scale - d);
+  const sign = scaled < 0n ? -1n : 1n;
+  const abs = scaled < 0n ? -scaled : scaled;
+  let q = abs / pow10;
+  const r = abs % pow10;
+  const doubled = 2n * r;
+  if (mode === "up") {
+    if (r !== 0n) q += 1n;
+  } else if (mode !== "down" && doubled >= pow10) {
+    if (doubled > pow10 || mode === "half-up" || q % 2n === 1n) q += 1n;
+  }
+  const result = sign * q;
+  return normalizeFloat(d >= 0 ? Number(result) / 10 ** d : Number(result) * 10 ** -d);
+}
+
 // src/evaluator.ts
 var SAFE_GLOBALS = {
   Math,
@@ -1019,16 +1126,17 @@ function evalBinary(node, context, functions) {
   const left = evaluate(node.left, context, functions);
   const right = evaluate(node.right, context, functions);
   switch (node.op) {
+    // 数值运算统一走十进制精确实现：消除 0.1 + 0.2 类浮点噪声、字符串数字按数值处理、除零兜底 0
     case "+":
-      return left + right;
+      return isNumericOperands(left, right) ? decimalAdd(left, right) : concatOperands(left, right);
     case "-":
-      return left - right;
+      return decimalSubtract(left, right);
     case "*":
-      return left * right;
+      return decimalMultiply(left, right);
     case "/":
-      return left / right;
+      return decimalDivide(left, right);
     case "%":
-      return left % right;
+      return decimalModulo(left, right);
     case "<":
       return left < right;
     case ">":
@@ -1057,15 +1165,29 @@ function evalUnary(node, context, functions) {
   const arg = evaluate(node.arg, context, functions);
   switch (node.op) {
     case "-":
-      return -arg;
+      return decimalSubtract(0, arg);
     case "+":
-      return +arg;
+      return toNumber(arg);
     case "!":
       return !arg;
     default:
       throw new Error(`\u672A\u77E5\u4E00\u5143\u8FD0\u7B97\u7B26: ${node.op}`);
   }
 }
+function concatOperands(left, right) {
+  return `${left == null ? "" : String(left)}${right == null ? "" : String(right)}`;
+}
+function isNumericOperands(left, right) {
+  const l = operandKind(left);
+  const r = operandKind(right);
+  if (l === "other" || r === "other") return false;
+  return l === "num" || r === "num";
+}
+function operandKind(value) {
+  if (value == null || value === "") return "neutral";
+  if (isNumericLike(value)) return "num";
+  return "other";
+}
 function evalMember(node, context, functions) {
   const obj = evaluate(node.object, context, functions);
   if (obj == null) {
@@ -1277,6 +1399,34 @@ function max(rows, field) {
   return Math.max(...rows.map((row) => Number(getByPath(row, field)) || 0));
 }
 
+// src/functions/math.ts
+function addNumbers(...values) {
+  return values.reduce((acc, v) => decimalAdd(acc, v), 0);
+}
+function subtractNumbers(...values) {
+  if (values.length === 0) return 0;
+  return values.slice(1).reduce((acc, v) => decimalSubtract(acc, v), decimalAdd(values[0], 0));
+}
+function multiplyNumbers(...values) {
+  if (values.length === 0) return 0;
+  return values.reduce((acc, v) => decimalMultiply(acc, v), 1);
+}
+function divideNumbers(a, b) {
+  return decimalDivide(a, b);
+}
+function round(value, digits) {
+  return roundTo(value, digits, "half-up");
+}
+function roundUp(value, digits) {
+  return roundTo(value, digits, "up");
+}
+function roundDown(value, digits) {
+  return roundTo(value, digits, "down");
+}
+function roundHalfEven(value, digits) {
+  return roundTo(value, digits, "half-even");
+}
+
 // src/render/expression-eval.ts
 var RenderEngine = class {
   constructor() {
@@ -1302,8 +1452,19 @@ var FORMAT_FUNCTIONS = {
   IF: ifFn,
   CONCAT: (...args) => args.filter((v) => v != null).map(String).join(""),
   IFEMPTY: (v, d) => v != null && v !== "" ? String(v) : d,
-  ROUND: (n, d) => Number(Number(n).toFixed(d)),
-  LEN: (s) => String(s).length
+  LEN: (s) => String(s).length,
+  // 四则运算（与 +/-/*// 运算符同一套数值语义，供不方便写运算符的场景使用）
+  ADD: addNumbers,
+  SUB: subtractNumbers,
+  MUL: multiplyNumbers,
+  DIV: divideNumbers,
+  // 数值修约
+  ROUND: round,
+  ROUNDUP: roundUp,
+  CEIL: roundUp,
+  ROUNDDOWN: roundDown,
+  FLOOR: roundDown,
+  ROUNDBANK: roundHalfEven
 };
 for (const [name, fn] of Object.entries(FORMAT_FUNCTIONS)) {
   engine.registerFunction(name, fn);
@@ -1348,7 +1509,7 @@ function evaluateTemplate(text, ctx) {
 
 // src/render/data-binder.ts
 function bindData(template, printData, baseUrl, fontBaseUrl) {
-  const data = printData ?? {};
+  const data = { ...resolveSystemVariables(), ...printData ?? {} };
   const bound = JSON.parse(JSON.stringify(template));
   if (bound.header?.elements) {
     bound.header.elements = bound.header.elements.map((el) => bindElement(el, data, baseUrl));
@@ -1377,7 +1538,12 @@ function bindData(template, printData, baseUrl, fontBaseUrl) {
 function bindElement(el, data, baseUrl) {
   const cloned = { ...el, options: { ...el.options } };
   if (typeof cloned.options.formatter === "string") {
-    cloned.options.formatter = evaluateTemplate(cloned.options.formatter, data);
+    const raw = cloned.options.formatter;
+    if (referencesPageNumbers(raw)) {
+      cloned.options.rawFormatter = raw;
+    } else {
+      cloned.options.formatter = evaluateTemplate(raw, data);
+    }
   }
   const isImage = cloned.type === "image" || cloned.printElementType?.type === "image";
   if (isImage && typeof cloned.options.src === "string") {
@@ -1424,39 +1590,25 @@ function bindTableData(el, data) {
         if (dataStartIdx < 0) dataStartIdx = renderRows.length;
         const ctx = itemCtx(item);
         renderRows.push(makeRenderRow(row, (cell) => {
-          const formatter = cell.formatter;
-          if (!formatter) return "";
-          return evaluateTemplate(formatter, ctx);
+          return resolveCellText(cell, ctx);
         }));
         dataRowCtx.push(ctx);
       }
       continue;
     }
     if (mode === "dynamic" && row.type === "subtotal") {
-      const tpl = makeRenderRow(row, (cell) => {
-        const formatter = cell.formatter;
-        if (!formatter) return "";
-        return evaluateTemplate(formatter, { rows: summaryRows, ...data });
-      }, true);
+      const tpl = makeRenderRow(row, (cell) => resolveCellText(cell, { rows: summaryRows, ...data }), true);
       subtotalTemplates.push(tpl);
       renderRows.push(tpl);
       continue;
     }
     if (mode === "dynamic" && row.type === "summary") {
-      const summaryRow = makeRenderRow(row, (cell) => {
-        const formatter = cell.formatter;
-        if (!formatter) return "";
-        return evaluateTemplate(formatter, { rows: summaryRows, ...data });
-      });
+      const summaryRow = makeRenderRow(row, (cell) => resolveCellText(cell, { rows: summaryRows, ...data }));
       summaryRenderRows.push(summaryRow);
       renderRows.push(summaryRow);
       continue;
     }
-    renderRows.push(makeRenderRow(row, (cell) => {
-      const formatter = cell.formatter;
-      if (!formatter) return "";
-      return evaluateTemplate(formatter, data);
-    }));
+    renderRows.push(makeRenderRow(row, (cell) => resolveCellText(cell, data)));
   }
   opts._renderRows = renderRows;
   opts._repeatHeaderCount = countRepeatHeader(rows);
@@ -1466,13 +1618,20 @@ function bindTableData(el, data) {
   opts._summaryRows = summaryRenderRows;
   opts._mainData = data;
 }
+function resolveCellText(cell, ctx) {
+  const formatter = cell.formatter;
+  if (!formatter) return "";
+  if (referencesPageNumbers(formatter)) return formatter;
+  return evaluateTemplate(formatter, ctx);
+}
 function makeRenderRow(row, resolve, keepRaw = false) {
   return {
     type: row.type,
     height: row.height ?? 8,
     cells: row.cells.map((cell) => ({
       content: cell.merged ? "" : resolve(cell),
-      ...keepRaw ? { rawFormatter: cell.merged ? "" : cell.formatter ?? "" } : {},
+      // 小计行（keepRaw）与引用页码的单元格都保留原始表达式：前者按当页数据行重算，后者按当页页码重算
+      ...(keepRaw || referencesPageNumbers(cell.formatter)) && !cell.merged ? { rawFormatter: cell.formatter ?? "" } : {},
       cellType: cell.cellType,
       barcodeType: cell.barcodeType,
       qrCodeLevel: cell.qrCodeLevel,
@@ -1500,16 +1659,35 @@ function makeRenderRow(row, resolve, keepRaw = false) {
   };
 }
 function countRepeatHeader(rows) {
+  const headerCount = countLeadingHeaderRows(rows);
+  if (headerCount === 0) return 0;
+  const enabled = rows.slice(0, headerCount).some((row) => row.repeatOnPage === true);
+  if (!enabled) return 0;
+  return alignToRowspanBoundary(rows, headerCount);
+}
+function countLeadingHeaderRows(rows) {
   let n = 0;
   for (const row of rows) {
-    if (row.type === "header" && row.repeatOnPage === true) {
-      n++;
-    } else {
-      break;
-    }
+    if (row?.type !== "header") break;
+    n++;
   }
   return n;
 }
+function isRowspanComplete(rows, n) {
+  for (let r = 0; r < n; r++) {
+    for (const cell of rows[r]?.cells ?? []) {
+      if (cell?.merged) continue;
+      if (r + (cell?.rowspan ?? 1) > n) return false;
+    }
+  }
+  return true;
+}
+function alignToRowspanBoundary(rows, max2) {
+  for (let n = max2; n >= 1; n--) {
+    if (isRowspanComplete(rows, n)) return n;
+  }
+  return 1;
+}
 var pad2 = (n) => String(n).padStart(2, "0");
 function resolveSystemVariables(now = /* @__PURE__ */ new Date(), page = {}) {
   return {
@@ -1519,6 +1697,9 @@ function resolveSystemVariables(now = /* @__PURE__ */ new Date(), page = {}) {
     totalPages: page.totalPages ?? 1
   };
 }
+function referencesPageNumbers(expr) {
+  return typeof expr === "string" && /\b(pageIndex|totalPages)\b/.test(expr);
+}
 function injectSystemVariables(html, now = /* @__PURE__ */ new Date()) {
   const { printDate, printTime } = resolveSystemVariables(now);
   return html.replace(/\{printDate\}/g, printDate).replace(/\{printTime\}/g, printTime);
@@ -2087,10 +2268,9 @@ function tableDesignBottom(el) {
   const opts = el.options ?? {};
   const top = opts.top ?? 0;
   const rows = opts.tableRows ?? [];
-  if (rows.length > 0) {
-    return top + rows.reduce((s, r) => s + (r.height ?? 0), 0);
-  }
-  return top + (opts.height ?? 0);
+  const rowSum = rows.reduce((s, r) => s + (r.height ?? 0), 0);
+  const designHeight = Math.max(opts.height ?? 0, rowSum);
+  return top + designHeight;
 }
 function buildFollowMap(sorted, excludedIds) {
   const map = /* @__PURE__ */ new Map();
@@ -2231,7 +2411,10 @@ function paginate(template, measuredElements) {
   let isFirstPage = true;
   let pageBroken = false;
   function sectionTop(el) {
-    return pageBroken ? 0 : el.options?.top ?? 0;
+    return pageBroken ? pageCursorTop() : el.options?.top ?? 0;
+  }
+  function pageCursorTop() {
+    return Math.max(0, fullPageHeight() - remaining);
   }
   function fullPageHeight() {
     return isFirstPage ? contentHeight - overlayH - SAFETY_MARGIN : contentHeight - SAFETY_MARGIN;
@@ -2298,7 +2481,7 @@ function paginate(template, measuredElements) {
   function paginateNonTable(el, measured, sortedList, idx) {
     const elHeight = measured.get(el.id)?.measuredHeight ?? el.options?.height ?? 0;
     if (elHeight <= remaining) {
-      const top2 = pageBroken ? 0 : el.options?.top ?? 0;
+      const top2 = pageBroken ? pageCursorTop() : el.options?.top ?? 0;
       noteOverflow(top2 + elHeight);
       currentPage.push({ elementId: el.id, type: "element", renderTop: sectionTop(el) });
       remaining -= elHeight;
@@ -2317,8 +2500,9 @@ function paginate(template, measuredElements) {
       }
       return idx + 1;
     }
-    const top = pageBroken ? 0 : el.options?.top ?? 0;
-    finishPage(top + elHeight > contentHeight);
+    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;
     return idx + 1;
@@ -2334,7 +2518,7 @@ function paginate(template, measuredElements) {
     }
     const unitHeight = Math.max(maxBottom - minTop, 0);
     const place = () => {
-      const offset = pageBroken ? -minTop : 0;
+      const offset = pageBroken ? pageCursorTop() - minTop : 0;
       noteOverflow(minTop + offset + unitHeight);
       for (const m of members) {
         currentPage.push({
@@ -2408,6 +2592,7 @@ function paginate(template, measuredElements) {
     const groups = buildRowGroups(bodyRows, rowCount);
     let sliceStart = 0;
     let firstSlice = true;
+    let sliceTop = sectionTop(el);
     for (const g of groups) {
       const gh = bodyHeights.slice(g.start, g.end).reduce((s, h) => s + h, 0);
       if (gh + subtotalH <= remaining) {
@@ -2422,12 +2607,13 @@ function paginate(template, measuredElements) {
           endRow: g.start,
           subtotal: subtotalH > 0,
           ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-          renderTop: sectionTop(el)
+          renderTop: sliceTop
         });
         firstSlice = false;
         sliceStart = g.start;
       }
       finishPage();
+      sliceTop = sectionTop(el);
       if (!firstSlice) remaining -= repeatH;
       remaining -= gh;
     }
@@ -2439,7 +2625,7 @@ function paginate(template, measuredElements) {
         endRow: rowCount,
         subtotal: subtotalH > 0,
         ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-        renderTop: sectionTop(el)
+        renderTop: sliceTop
       });
     }
     if (summaryH > 0) {
@@ -2520,6 +2706,13 @@ function specialRowHeight(renderRows, rowHeights, type) {
 }
 
 // src/render/html-generator.ts
+function pageVarsContext(vars) {
+  return { ...vars.data ?? {}, pageIndex: vars.pageIndex, totalPages: vars.totalPages };
+}
+function pageVarsData(printData) {
+  if (Array.isArray(printData)) return printData[0] ?? {};
+  return printData ?? {};
+}
 function generateHtml(template, pageLayouts, printData, options) {
   const css = buildFontFaceCss(template.fonts) + buildPageCss(template, options?.pageHeightMm);
   const isMeasure = options?.isMeasurementPass === true;
@@ -2604,22 +2797,25 @@ function renderPage(template, page, pageNum, totalPages, ctx, printData, pageCla
     height: ctx.pageHeightMm && ctx.pageHeightMm > 0 ? ctx.pageHeightMm : paper.height
   };
   const contentWidth = paper.width - template.margins.left - template.margins.right;
+  const pageVars = { pageIndex: pageNum, totalPages, data: pageVarsData(printData) };
+  const scoped = withPageNumbers(template, pageVars);
+  const pageCtx = { ...ctx, pageVars };
   const headerHtml = renderAreaElements(
-    template.header?.elements ?? [],
+    scoped.header?.elements ?? [],
     contentWidth,
     pageNum,
     totalPages,
-    ctx
+    pageCtx
   );
   const footerHtml = renderAreaElements(
-    template.footer?.elements ?? [],
+    scoped.footer?.elements ?? [],
     contentWidth,
     pageNum,
     totalPages,
-    ctx
+    pageCtx
   );
-  const overlayHtml = page.pageIndex === 0 ? `<div class="first-page-overlay">${renderAreaElements(template.firstPageOverlay?.elements ?? [], contentWidth, void 0, void 0, ctx)}</div>` : "";
-  let contentHtml = page.sections.map((section) => renderSection(section, template, ctx)).join("\n");
+  const overlayHtml = page.pageIndex === 0 ? `<div class="first-page-overlay">${renderAreaElements(scoped.firstPageOverlay?.elements ?? [], contentWidth, pageNum, totalPages, pageCtx)}</div>` : "";
+  let contentHtml = page.sections.map((section) => renderSection(section, scoped, pageCtx)).join("\n");
   contentHtml = contentHtml.replace(/\{pageIndex\}/g, String(pageNum));
   contentHtml = contentHtml.replace(/\{totalPages\}/g, String(totalPages));
   const pageInner = `
@@ -2636,6 +2832,39 @@ function renderPage(template, page, pageNum, totalPages, ctx, printData, pageCla
   ${pageBody}
 </section>`;
 }
+function withPageNumbers(template, vars) {
+  if (!templateReferencesPageNumbers(template)) return template;
+  const context = pageVarsContext(vars);
+  const mapEl = (el) => {
+    const raw = el.options?.rawFormatter;
+    if (typeof raw !== "string") return el;
+    return { ...el, options: { ...el.options, formatter: evaluateTemplate(raw, context) } };
+  };
+  const mapArea = (area) => area ? { ...area, elements: (area.elements ?? []).map(mapEl) } : area;
+  return {
+    ...template,
+    elements: template.elements.map(mapEl),
+    header: mapArea(template.header),
+    footer: mapArea(template.footer),
+    firstPageOverlay: mapArea(template.firstPageOverlay)
+  };
+}
+function templateReferencesPageNumbers(template) {
+  const areas = [
+    template.elements,
+    template.header?.elements,
+    template.footer?.elements,
+    template.firstPageOverlay?.elements
+  ];
+  return areas.some((list) => (list ?? []).some((el) => typeof el.options?.rawFormatter === "string"));
+}
+function resolveCellContent(cell, ctx) {
+  const raw = cell.rawFormatter;
+  if (typeof raw === "string" && raw !== "" && ctx?.pageVars) {
+    return evaluateTemplate(raw, pageVarsContext(ctx.pageVars));
+  }
+  return cell.content;
+}
 function renderSection(section, template, ctx) {
   const el = findElement(template, section.elementId);
   if (!el) {
@@ -2788,7 +3017,7 @@ function matrixCellStyle(cell, opts) {
   }
   return parts.join(";");
 }
-function renderMatrixRows(renderRows, start, end, opts, withRowIndex, ctx, fitOwner = { elementId: "", kind: "b" }) {
+function renderMatrixRows(renderRows, start, end, opts, withRowIndex, ctx, fitOwner = { elementId: "", kind: "b" }, rowLimit) {
   const trs = [];
   const defaultPadding = opts.tableDefaultPadding ?? 1;
   for (let r = start; r < end; r++) {
@@ -2796,12 +3025,14 @@ function renderMatrixRows(renderRows, start, end, opts, withRowIndex, ctx, fitOw
     if (!row) continue;
     const idxAttr = withRowIndex ? ` data-row-index="${r}"` : "";
     const tds = row.cells.map((cell, ci) => ({ cell, ci })).filter(({ cell }) => !cell.merged).map(({ cell, ci }) => {
-      const span = `${cell.rowspan > 1 ? ` rowspan="${cell.rowspan}"` : ""}${cell.colspan > 1 ? ` colspan="${cell.colspan}"` : ""}`;
+      const rowspan = rowLimit === void 0 ? cell.rowspan ?? 1 : Math.max(1, Math.min(cell.rowspan ?? 1, rowLimit - r));
+      const span = `${rowspan > 1 ? ` rowspan="${rowspan}"` : ""}${cell.colspan > 1 ? ` colspan="${cell.colspan}"` : ""}`;
       const colIndex = ci;
       let inner;
       if (cell.cellType === "barcode" || cell.cellType === "qrcode") {
-        inner = `<div style="width:100%;height:100%;display:flex;align-items:center;justify-content:center;overflow:hidden;">${codeImgHtml(cell.content, cell.cellType, cell, {
-          fallback: esc(cell.content),
+        const codeValue = resolveCellContent(cell, ctx);
+        inner = `<div style="width:100%;height:100%;display:flex;align-items:center;justify-content:center;overflow:hidden;">${codeImgHtml(codeValue, cell.cellType, cell, {
+          fallback: esc(codeValue),
           codeRenderer: ctx?.codeRenderer,
           fit: cell.fit,
           maxWidth: cell.maxWidth,
@@ -2815,9 +3046,9 @@ 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(cell.content)}" style="object-fit:${fit};${maxWidth}${maxHeight}display:block;" /></div>`;
+        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>`;
       } else {
-        inner = renderTextCellInner(renderRows, r, colIndex, cell, opts, fitOwner, defaultPadding);
+        inner = renderTextCellInner(renderRows, r, colIndex, cell, opts, fitOwner, defaultPadding, ctx);
       }
       return `<td${span} style="${matrixCellStyle(cell, opts)}">${inner}</td>`;
     }).join("");
@@ -2825,9 +3056,9 @@ function renderMatrixRows(renderRows, start, end, opts, withRowIndex, ctx, fitOw
   }
   return trs.join("\n");
 }
-function renderTextCellInner(renderRows, rowIndex, colIndex, cell, opts, fitOwner, defaultPadding) {
+function renderTextCellInner(renderRows, rowIndex, colIndex, cell, opts, fitOwner, defaultPadding, ctx) {
   const fit = resolveCellTextFit(cell);
-  const text = esc(cell.content);
+  const text = esc(resolveCellContent(cell, ctx));
   if (fit === "autoHeight") return text;
   const capMm = cellFitCapMm(renderRows, rowIndex, cell, defaultPadding);
   const nowrap = cell.wordWrap === false;
@@ -2865,7 +3096,7 @@ function renderTableSlice(el, section, ctx) {
   const startRow = section.startRow ?? 0;
   const endRow = section.endRow ?? renderRows.length;
   const repeatCount = opts._repeatHeaderCount ?? 0;
-  const repeatHtml = section.repeatHeader && repeatCount > 0 ? renderMatrixRows(renderRows, 0, repeatCount, opts, false, ctx, { elementId: el.id, kind: "b" }) : "";
+  const repeatHtml = section.repeatHeader && repeatCount > 0 ? renderMatrixRows(renderRows, 0, repeatCount, opts, false, ctx, { elementId: el.id, kind: "b" }, repeatCount) : "";
   const bodyHtml = renderMatrixRows(renderRows, startRow, endRow, opts, false, ctx, { elementId: el.id, kind: "b" });
   const subtotalHtml = section.subtotal ? renderSubtotalRows(el, section, opts, ctx) : "";
   const summaryHtml = section.summary ? renderSummaryRows(el, opts, ctx) : "";
@@ -2886,9 +3117,15 @@ function renderSubtotalRows(el, section, opts, ctx) {
   const dataStart = Math.max(startRow, dataStartIdx);
   const dataEnd = Math.max(endRow, dataStart);
   const pageCtx = dataEnd > dataStartIdx ? dataRowCtx.slice(Math.max(dataStart - dataStartIdx, 0), dataEnd - dataStartIdx) : [];
+  const pageVars = ctx?.pageVars ? pageVarsContext(ctx.pageVars) : {};
   const rows = templates.map((tpl) => ({
     ...tpl,
-    cells: tpl.cells.map((cell) => cell.rawFormatter ? { ...cell, content: evaluateTemplate(cell.rawFormatter, { rows: pageCtx, ...mainData }) } : cell)
+    cells: tpl.cells.map((cell) => cell.rawFormatter ? {
+      ...cell,
+      content: evaluateTemplate(cell.rawFormatter, { rows: pageCtx, ...mainData, ...pageVars }),
+      // 已按本页上下文求值，清标记避免渲染时再按页码重算一次（会丢掉 rows）
+      rawFormatter: ""
+    } : cell)
   }));
   return renderMatrixRows(rows, 0, rows.length, opts, false, ctx, { elementId: el.id, kind: "st" });
 }
@@ -2911,7 +3148,7 @@ function renderFlowGroup(el, section, template, ctx) {
   if (endRow > startRow || section.subtotal || section.summary) {
     const renderRows = opts._renderRows ?? [];
     const repeatCount = opts._repeatHeaderCount ?? 0;
-    const repeatHtml = section.repeatHeader && repeatCount > 0 ? renderMatrixRows(renderRows, 0, repeatCount, opts, false, ctx, { elementId: el.id, kind: "b" }) : "";
+    const repeatHtml = section.repeatHeader && repeatCount > 0 ? renderMatrixRows(renderRows, 0, repeatCount, opts, false, ctx, { elementId: el.id, kind: "b" }, repeatCount) : "";
     const bodyHtml = renderMatrixRows(renderRows, startRow, endRow, opts, false, ctx, { elementId: el.id, kind: "b" });
     const subtotalHtml = section.subtotal ? renderSubtotalRows(el, section, opts, ctx) : "";
     const summaryHtml = section.summary ? renderSummaryRows(el, opts, ctx) : "";

package/dist/browser/index.d.cts

@@ -1,5 +1,5 @@
-import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-CsWkGK4a.cjs';
-import { P as PrintRuntime, F as FitFontSize } from '../ports-q934kIC7.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-Dn_YAzO5.cjs';
+import { P as PrintRuntime, F as FitFontSize } from '../ports-Cf5sjwls.cjs';
 
 interface BrowserRenderResult {
     /** 最终多页 HTML 字符串 */

package/dist/browser/index.d.ts

@@ -1,5 +1,5 @@
-import { P as PageLayout, T as TemplateData, M as MultiPageTemplateData, C as CodeRenderer, D as DriverFactory, R as RawMeasurement, a as CodeSpec } from '../driver-CsWkGK4a.js';
-import { P as PrintRuntime, F as FitFontSize } from '../ports-B63x7kCX.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-Dn_YAzO5.js';
+import { P as PrintRuntime, F as FitFontSize } from '../ports-BvwlA_km.js';
 
 interface BrowserRenderResult {
     /** 最终多页 HTML 字符串 */

package/dist/browser/index.js

@@ -11,7 +11,7 @@ import {
   prepareDocument,
   resolveBarcodeSize,
   resolveShrinkMinFontSize
-} from "../chunk-VFEURLAZ.js";
+} from "../chunk-BBSFBAWT.js";
 
 // src/browser/browser-code-renderer.ts
 import JsBarcode from "jsbarcode";

package/dist/{chunk-V4A5623C.js → chunk-B2XJSF4V.js}

@@ -3,7 +3,7 @@ import {
   evaluate,
   parse,
   tokenize
-} from "./chunk-VFEURLAZ.js";
+} from "./chunk-BBSFBAWT.js";
 
 // src/index.ts
 var TemplateEngine = class {