@worm-vue3-print/core 1.3.1 → 1.3.2

package/dist/browser/index.cjs

@@ -2268,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();
@@ -2412,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;
@@ -2479,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;
@@ -2498,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;
@@ -2515,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({
@@ -2589,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) {
@@ -2603,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;
     }
@@ -2620,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) {

package/dist/browser/index.js

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

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

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

package/dist/{chunk-KFRPTLFV.js → chunk-BBSFBAWT.js}

@@ -1754,10 +1754,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();
@@ -1898,7 +1897,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;
@@ -1965,7 +1967,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;
@@ -1984,8 +1986,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;
@@ -2001,7 +2004,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({
@@ -2075,6 +2078,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) {
@@ -2089,12 +2093,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;
     }
@@ -2106,7 +2111,7 @@ function paginate(template, measuredElements) {
         endRow: rowCount,
         subtotal: subtotalH > 0,
         ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-        renderTop: sectionTop(el)
+        renderTop: sliceTop
       });
     }
     if (summaryH > 0) {

package/dist/designer/index.js

@@ -1,6 +1,6 @@
 import {
   TemplateEngine
-} from "../chunk-AKWV6SID.js";
+} from "../chunk-B2XJSF4V.js";
 import {
   BARCODE_BAR_HEIGHT_MODULES,
   BARCODE_MARGIN_BOTTOM_MODULES,
@@ -43,7 +43,7 @@ import {
   subtractNumbers,
   sum,
   toUpperCaseAmount
-} from "../chunk-KFRPTLFV.js";
+} from "../chunk-BBSFBAWT.js";
 
 // src/designer/utils/scale.ts
 var MIN_SCALE_PERCENT = 25;

package/dist/index.cjs

@@ -1893,10 +1893,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();
@@ -2037,7 +2036,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;
@@ -2104,7 +2106,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;
@@ -2123,8 +2125,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;
@@ -2140,7 +2143,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({
@@ -2214,6 +2217,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) {
@@ -2228,12 +2232,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;
     }
@@ -2245,7 +2250,7 @@ function paginate(template, measuredElements) {
         endRow: rowCount,
         subtotal: subtotalH > 0,
         ...!firstSlice && repeatCount > 0 ? { repeatHeader: true } : {},
-        renderTop: sectionTop(el)
+        renderTop: sliceTop
       });
     }
     if (summaryH > 0) {

package/dist/index.d.cts

@@ -232,8 +232,11 @@ declare function elementPositionStyle(left: number, top: number, width: number,
 
 /**
  * 表格设计底部（mm）= 设计 top + 设计高度。
- * 设计高度优先取 tableRows 设计行高之和（设计意图，不受渲染数据量影响），
- * 缺失时回退 options.height。
+ * 设计高度取 max(options.height, tableRows 行高之和)：
+ * - options.height 是设计器实测回写的渲染高度（用户在画布上所见并据此对齐下方元素的底部），
+ *   为相对布局偏移的忠实基准；
+ * - tableRows 行高之和是 min-height 语义下表格实际渲染的物理下界，
+ *   当 options.height 缺失或被低估时兜底，避免跟随元素偏移算成负值反向叠压表格。
  */
 declare function tableDesignBottom(el: TemplateElement): number;
 /**

package/dist/index.d.ts

@@ -232,8 +232,11 @@ declare function elementPositionStyle(left: number, top: number, width: number,
 
 /**
  * 表格设计底部（mm）= 设计 top + 设计高度。
- * 设计高度优先取 tableRows 设计行高之和（设计意图，不受渲染数据量影响），
- * 缺失时回退 options.height。
+ * 设计高度取 max(options.height, tableRows 行高之和)：
+ * - options.height 是设计器实测回写的渲染高度（用户在画布上所见并据此对齐下方元素的底部），
+ *   为相对布局偏移的忠实基准；
+ * - tableRows 行高之和是 min-height 语义下表格实际渲染的物理下界，
+ *   当 options.height 缺失或被低估时兜底，避免跟随元素偏移算成负值反向叠压表格。
  */
 declare function tableDesignBottom(el: TemplateElement): number;
 /**

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   TemplateEngine
-} from "./chunk-AKWV6SID.js";
+} from "./chunk-B2XJSF4V.js";
 import {
   DEFAULT_READINESS_MS,
   DEFAULT_SHRINK_MIN_FONT_SIZE_PT,
@@ -121,7 +121,7 @@ import {
   tokenize,
   validateTiling,
   withTimeout
-} from "./chunk-KFRPTLFV.js";
+} from "./chunk-BBSFBAWT.js";
 export {
   DEFAULT_READINESS_MS,
   DEFAULT_SHRINK_MIN_FONT_SIZE_PT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worm-vue3-print/core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "description": "打印模板表达式引擎、同构渲染管线与框架无关的设计器内核（HTML 生成/分页/数据绑定/设计器模型与工具），无 Vue/React 依赖",
   "main": "dist/index.cjs",