@qianxiang-ai/fu-report-viewer-engine 1.1.11 → 1.1.12

package/dist/legacy-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-converter.d.ts","sourceRoot":"","sources":["../src/legacy-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAMV,uBAAuB,EAKvB,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,YAAY,CAAA;AA4BnB,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE,uBAA4B,GACpC,oBAAoB,CAgBtB;AAyKD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,SAAS,kBAAkB,EAAE,CA4B5F"}
+{"version":3,"file":"legacy-converter.d.ts","sourceRoot":"","sources":["../src/legacy-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAMV,uBAAuB,EAKvB,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,YAAY,CAAA;AA4BnB,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE,uBAA4B,GACpC,oBAAoB,CAgBtB;AA0ND,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,SAAS,kBAAkB,EAAE,CA4B5F"}

package/dist/legacy-converter.js

@@ -41,8 +41,19 @@ function convertSheet(source, options) {
     const defaultColumnWidth = clamp(number(options.defaultColumnWidth, 100), 24, 1000);
     const expanded = expandRows(object(document.rows), options.datasets ?? {}, defaultRowHeight);
     const expandedRowShift = Math.max(0, ...expanded.map(row => row.outputRow - row.sourceRow));
-    const rowCount = clamp(Math.max(1, ...expanded.map(row => row.outputRow + 1), areaEnd(document, 'eri') + 1 + expandedRowShift), 1, MAX_TRACKS);
-    const columnCount = clamp(Math.max(1, maxCellColumn(expanded) + 1, areaEnd(document, 'eci') + 1), 1, 2048);
+    const sourceToOutput = new Map();
+    expanded.forEach(row => {
+        if (!sourceToOutput.has(row.sourceRow))
+            sourceToOutput.set(row.sourceRow, row.outputRow);
+    });
+    const merges = mergeRanges(document, expanded, sourceToOutput);
+    const layerSources = arrays(document.imgList, document.images, document.chartList, document.charts, document.barcodeList, document.qrcodeList, document.richTextList);
+    const rowCount = clamp(Math.max(1, ...expanded.map(row => row.outputRow + 1), areaEnd(document, 'eri') + 1 + expandedRowShift, ...merges.map(merge => merge.row + merge.rowspan), ...layerSources.map(raw => {
+        const item = object(raw);
+        const row = integer(item.row, 0);
+        return (sourceToOutput.get(row) ?? row) + clamp(integer(item.rowspan, 1), 1, 10_000);
+    })), 1, MAX_TRACKS);
+    const columnCount = clamp(Math.max(1, maxCellColumn(expanded) + 1, areaEnd(document, 'eci') + 1, ...merges.map(merge => merge.column + merge.colspan)), 1, 2048);
     const hidden = object(document.hidden);
     const hiddenRows = integerSet(hidden.rows);
     const hiddenColumns = integerSet(hidden.cols);
@@ -52,15 +63,13 @@ function convertSheet(source, options) {
     }, hiddenRows);
     const columnsSource = object(document.cols);
     const columns = tracks(columnCount, defaultColumnWidth, index => number(object(columnsSource[String(index)]).width, defaultColumnWidth), hiddenColumns);
-    const sourceToOutput = new Map();
-    expanded.forEach(row => {
-        if (!sourceToOutput.has(row.sourceRow))
-            sourceToOutput.set(row.sourceRow, row.outputRow);
-    });
-    const merges = mergeRanges(document, expanded, sourceToOutput);
     const covered = coveredCells(merges);
     const styles = Array.isArray(document.styles) ? document.styles.map(object) : [];
     const cells = [];
+    let lastContentRow = Math.max(0, ...merges.filter(merge => {
+        const bounds = cellBounds(rows, columns, merge.row, merge.column, merge.rowspan, merge.colspan);
+        return bounds.width > 0 && bounds.height > 0;
+    }).map(merge => merge.row + merge.rowspan - 1));
     for (const row of expanded) {
         for (const [columnKey, rawCell] of Object.entries(row.cells)) {
             const column = integer(columnKey, -1);
@@ -71,9 +80,14 @@ function convertSheet(source, options) {
             const rowspan = merge?.rowspan ?? 1;
             const colspan = merge?.colspan ?? 1;
             const bounds = cellBounds(rows, columns, row.outputRow, column, rowspan, colspan);
-            const style = normalizeStyle(styles[integer(cell.style, -1)] ?? object(cell.style));
+            if (bounds.width <= 0 || bounds.height <= 0)
+                continue;
+            const sourceStyle = styles[integer(cell.style, -1)] ?? object(cell.style);
+            const style = normalizeStyle(sourceStyle);
             const padding = normalizePadding(cell.padding ?? styles[integer(cell.style, -1)]?.padding);
             const value = resolveCellValue(cell, row, options.datasets ?? {});
+            if (hasPrintContent(cell, value.text, sourceStyle, value.richText))
+                lastContentRow = Math.max(lastContentRow, row.outputRow + rowspan - 1);
             if (cell.virtual && value.text.trim() === '')
                 continue;
             cells.push({
@@ -94,24 +108,57 @@ function convertSheet(source, options) {
         }
     }
     collapseDynamicGroups(cells, rows);
-    const visibleCells = cells.filter(cell => cell.rowspan > 0).map(({ dynamicGroup: _ignored, ...cell }) => cell);
     const layers = convertLayers(document, rows, columns, sourceToOutput);
+    // 按展开后的正文和实际图层范围裁尾，原始模板及正文中间的空行保持原位。
+    const layerBottom = Math.max(0, ...layers.map(layer => layer.bounds.y + layer.bounds.height));
+    if (layerBottom > 0) {
+        const end = rows.findIndex(track => track.offset + track.size >= layerBottom);
+        lastContentRow = Math.max(lastContentRow, end < 0 ? rows.length - 1 : end);
+    }
+    const printRows = rows.slice(0, lastContentRow + 1);
+    const visibleCells = cells.filter(cell => cell.rowspan > 0 && cell.row < printRows.length)
+        .map(({ dynamicGroup: _ignored, ...cell }) => cell);
     const width = columns.reduce((sum, track) => sum + track.size, 0);
-    const height = rows.reduce((sum, track) => sum + track.size, 0);
+    const height = Math.max(layerBottom, printRows.reduce((sum, track) => sum + track.size, 0));
     return {
         id: source.id,
         name: source.name,
         order: source.order,
         width,
         height,
-        rows,
+        rows: printRows,
         columns,
         cells: visibleCells,
         layers,
-        pages: paginate(rows, object(document.printConfig)),
-        frozen: freezePoint(string(document.freeze, ''), rows, columns)
+        pages: paginate(printRows, object(document.printConfig), height),
+        frozen: freezePoint(string(document.freeze, ''), printRows, columns)
     };
 }
+/** 字体或白底样式不独立占页；显式版式占位和可见样式仍须保留。 */
+function hasPrintContent(cell, text, style, richText) {
+    if ((richText === undefined ? text.trim() : hasRichPrintContent(richText)) || cell.merge != null
+        || [cell.completeBlankStatus, cell.fixedHead, cell.fixedTail].some(printFlagEnabled))
+        return true;
+    if (['virtual', 'rendered', 'lineStart', 'fillForm'].some(key => {
+        if (key === 'rendered' && richText !== undefined)
+            return false;
+        const value = cell[key];
+        return value != null && value !== false && value !== 0 && String(value).trim() !== '';
+    }))
+        return true;
+    return hasPrintBackground(style.bgcolor ?? style.background) || Object.keys(object(style.border)).length > 0;
+}
+function printFlagEnabled(value) {
+    return value === true || value === 1 || value === 'true' || value === '1';
+}
+function hasRichPrintContent(nodes = []) {
+    return nodes.some(node => node.type === 'text' ? node.text.trim() !== ''
+        : node.type !== 'lineBreak' && (hasRichPrintContent(node.children) || hasPrintBackground(node.style?.background ?? node.style?.backgroundColor)));
+}
+function hasPrintBackground(value) {
+    const background = string(value, '').replace(/\s/g, '').toLowerCase();
+    return !['', '#fff', '#ffffff', 'white', 'transparent', 'rgb(255,255,255)', 'rgba(255,255,255,1)'].includes(background);
+}
 function expandRows(rows, datasets, defaultHeight) {
     const sourceIndexes = Object.keys(rows).map(value => integer(value, -1))
         .filter(value => value >= 0).sort((a, b) => a - b);
@@ -307,9 +354,14 @@ function safeRichTextStyleValue(key, value) {
     return /^(?:-?\d+(?:\.\d+)?(?:px|em|rem|%|vh|vw)?|auto)(?:\s+(?:-?\d+(?:\.\d+)?(?:px|em|rem|%|vh|vw)?|auto)){0,3}$/.test(value);
 }
 function decodeHtmlEntities(value) {
-    return value.replace(/&(?:amp|lt|gt|quot|#39);/g, entity => ({
-        '&amp;': '&', '&lt;': '<', '&gt;': '>', '&quot;': '"', '&#39;': "'"
-    })[entity] ?? entity);
+    return value.replace(/&(?:amp|lt|gt|quot|apos|nbsp|#(?:\d+|x[0-9a-f]+));/gi, entity => {
+        const named = { '&amp;': '&', '&lt;': '<', '&gt;': '>', '&quot;': '"', '&apos;': "'", '&nbsp;': '\u00a0' };
+        if (named[entity.toLowerCase()] !== undefined)
+            return named[entity.toLowerCase()];
+        const hex = entity.slice(0, 3).toLowerCase() === '&#x';
+        const point = Number.parseInt(entity.slice(hex ? 3 : 2, -1), hex ? 16 : 10);
+        return point > 0 && point <= 0x10ffff && !(point >= 0xd800 && point <= 0xdfff) ? String.fromCodePoint(point) : entity;
+    });
 }
 function mergeRanges(document, rows, sourceToOutput) {
     const result = [];
@@ -334,7 +386,14 @@ function mergeRanges(document, rows, sourceToOutput) {
         }
     }
     const unique = new Map(result.map(item => [`${item.row}:${item.column}`, item]));
-    return [...unique.values()];
+    const visible = [];
+    // 覆盖格的历史合并不是可见锚点，不能扩展打印范围或遮挡后续单元格。
+    for (const merge of [...unique.values()].sort((a, b) => a.row - b.row || a.column - b.column)) {
+        if (!visible.some(parent => parent.row <= merge.row && parent.row + parent.rowspan > merge.row
+            && parent.column <= merge.column && parent.column + parent.colspan > merge.column))
+            visible.push(merge);
+    }
+    return visible;
 }
 function coveredCells(merges) {
     const covered = new Set();
@@ -462,7 +521,7 @@ function normalizeChartType(value) {
         return value;
     return 'bar';
 }
-function paginate(rows, config) {
+function paginate(rows, config, contentHeight) {
     const paperHeightMm = string(config.layout, 'portrait') === 'landscape'
         ? number(config.width, 297) : number(config.height, 297);
     const margin = clamp(number(config.marginY, 10), 0, paperHeightMm / 3);
@@ -478,6 +537,12 @@ function paginate(rows, config) {
         firstRow = lastRow + 1;
         top = rows[firstRow]?.offset ?? rows.reduce((sum, row) => sum + row.size, 0);
     }
+    // 悬浮图层可以超过最后一行；继续分页但不向表格模型插入不存在的数据行。
+    while (pages.length && pages[pages.length - 1].top + pageHeight < contentHeight) {
+        const previous = pages[pages.length - 1];
+        pages.push({ index: pages.length, top: previous.top + pageHeight, height: pageHeight,
+            firstRow: rows.length - 1, lastRow: rows.length - 1 });
+    }
     return pages;
 }
 function freezePoint(value, rows, columns) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qianxiang-ai/fu-report-viewer-engine",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "license": "AGPL-3.0-only",
   "author": "位志国 <ijunfu@aliyun.com>",
   "type": "module",
@@ -20,7 +20,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@qianxiang-ai/fu-report-contracts": "1.1.11"
+    "@qianxiang-ai/fu-report-contracts": "1.1.12"
   },
   "scripts": {
     "build": "node ../../scripts/clean-dist.mjs && tsc -p tsconfig.json",