@file-viewer/renderer-word 2.1.9 → 2.1.11

package/README.en.md

@@ -32,7 +32,7 @@ Use `@file-viewer/preset-all` when you want the same complete matrix as the offi
 ## Capabilities
 
 - DOCX / DOCM / DOTX / DOTM use the self-maintained `@file-viewer/docx` engine with Worker parsing, continuous reading layout, cached TOC fields, and async batched rendering.
-- DOC / DOT use `msdoc-viewer` with a Word-like paper surface, zoom, print, and HTML export adapters.
+- DOC / DOT use `@file-viewer/doc` with a Word-like paper surface, zoom, print, and HTML export adapters.
 - RTF uses `rtf.js`; ODT / ODP read `content.xml` from OpenDocument packages for safe structure previews.
 - The renderer reuses core search, zoom, print, export, lifecycle, and operation APIs.
 
@@ -56,4 +56,4 @@ const options = {
 
 ## Migration
 
-`@file-viewer/core` no longer depends on `@file-viewer/docx`, `msdoc-viewer`, `rtf.js`, `linkedom`, or `@xmldom/xmldom` directly. Install and pass this renderer for full Word preview, or use `@file-viewer/preset-all`.
+`@file-viewer/core` no longer depends on `@file-viewer/docx`, `@file-viewer/doc`, `rtf.js`, `linkedom`, or `@xmldom/xmldom` directly. Install and pass this renderer for full Word preview, or use `@file-viewer/preset-all`.

package/README.md

@@ -32,7 +32,7 @@ const options = {
 ## 能力边界
 
 - DOCX / DOCM / DOTX / DOTM 使用自研 `@file-viewer/docx`，默认 Worker 解析、连续流式阅读、目录字段缓存和异步分批渲染。
-- DOC / DOT 使用 `msdoc-viewer`，并套用 Word 风格纸张阅读面、缩放、打印和 HTML 导出适配。
+- DOC / DOT 使用 `@file-viewer/doc`，并套用 Word 风格纸张阅读面、缩放、打印和 HTML 导出适配。
 - RTF 使用 `rtf.js`，ODT / ODP 读取 OpenDocument 包内 `content.xml` 做安全结构预览。
 - 继续复用 core 的统一搜索、缩放、打印、导出、生命周期和操作能力。
 
@@ -56,4 +56,4 @@ const options = {
 
 ## 迁移说明
 
-`@file-viewer/core` 已不再直接依赖 `@file-viewer/docx`、`msdoc-viewer`、`rtf.js`、`linkedom` 或 `@xmldom/xmldom`。需要 Word 完整预览时，请安装本包并通过 `renderers` 传入，或使用 `@file-viewer/preset-all`。
+`@file-viewer/core` 已不再直接依赖 `@file-viewer/docx`、`@file-viewer/doc`、`rtf.js`、`linkedom` 或 `@xmldom/xmldom`。需要 Word 完整预览时，请安装本包并通过 `renderers` 传入，或使用 `@file-viewer/preset-all`。

package/dist/wordDoc.js

@@ -1,4 +1,4 @@
-import { defaultMsDocCss, parseMsDocToHtml } from 'msdoc-viewer';
+import { defaultMsDocCss, parseMsDocToHtml } from '@file-viewer/doc';
 import { applyPrintPageSize, buildPrintPageStyle, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
 const PAGE_BREAK_MARKER = '<span class="msdoc-page-break"></span>';
 const EMPTY_PAGE_HTML = '<p class="msdoc-paragraph"><br></p>';

package/dist/wordDocx.js

@@ -4,13 +4,11 @@ const DOCX_DEFAULT_PAGE_SIZE = {
     width: 794,
     height: 1123
 };
-const DOCX_PROGRESSIVE_BATCH_SIZE = 2;
-const DOCX_WORKER_TIMEOUT = 5000;
 const DOCX_WORKER_UNSAFE_PROTOCOLS = new Set(['file:', 'about:', 'data:']);
 const DOCX_MIN_SCALE = 0.24;
 const DOCX_MAX_SCALE = 3;
 const DOCX_ZOOM_STEP = 0.15;
-const DOCX_EMU_PER_CSS_PIXEL = 9525;
+const DOCX_VENDOR_ASSET_VERSION = '0.3.15';
 const ZIP_SIGNATURE_PK = 0x504b;
 const loadLibrary = (() => {
     const loader = {
@@ -72,8 +70,14 @@ const shouldUseDocxWorker = (target, docxOptions) => {
     }
     return !DOCX_WORKER_UNSAFE_PROTOCOLS.has(getTargetProtocol(target));
 };
+const appendDocxVendorAssetVersion = (url, explicitUrl) => {
+    if (!url || explicitUrl) {
+        return url;
+    }
+    return `${url}${url.includes('?') ? '&' : '?'}file-viewer-docx=${DOCX_VENDOR_ASSET_VERSION}`;
+};
 const createDocxOptions = (target, context, notifyProgressiveRender) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b;
     const docxOptions = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.docx;
     const documentBaseUrl = target.ownerDocument.URL || undefined;
     const useWorker = shouldUseDocxWorker(target, docxOptions);
@@ -83,44 +87,56 @@ const createDocxOptions = (target, context, notifyProgressiveRender) => {
             notifyProgressiveRender();
         }
     };
-    return {
-        // Word 会写入 autoSpaceDN/autoSpaceDE 等兼容标签；生产预览保持静默，避免 DOCX 调试告警刷屏。
-        debug: false,
-        experimental: false,
+    const options = {
         useWorker,
-        workerUrl: useWorker
-            ? resolveFileViewerDocxWorkerUrl(docxOptions, documentBaseUrl)
-            : undefined,
-        workerJsZipUrl: useWorker
-            ? resolveFileViewerDocxWorkerJsZipUrl(docxOptions, documentBaseUrl)
-            : undefined,
-        workerFallback: true,
-        workerTimeout: (_b = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.workerTimeout) !== null && _b !== void 0 ? _b : DOCX_WORKER_TIMEOUT,
-        renderPageBatchSize: (_c = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.renderPageBatchSize) !== null && _c !== void 0 ? _c : ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.progressive) === false ? Number.MAX_SAFE_INTEGER : DOCX_PROGRESSIVE_BATCH_SIZE),
-        renderYieldEveryMs: (_d = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.renderYieldEveryMs) !== null && _d !== void 0 ? _d : 16,
-        strictWordCompatibility: (_e = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.strictWordCompatibility) !== null && _e !== void 0 ? _e : true,
-        paginationTolerance: (_f = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.paginationTolerance) !== null && _f !== void 0 ? _f : 2,
         breakPages: usePagedLayout,
-        maxDynamicPaginationPasses: usePagedLayout
-            ? (_g = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.maxDynamicPaginationPasses) !== null && _g !== void 0 ? _g : 1000
-            : 0,
-        awaitLayout: (_h = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.awaitLayout) !== null && _h !== void 0 ? _h : usePagedLayout,
-        preserveComplexFieldResults: (_j = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.preserveComplexFieldResults) !== null && _j !== void 0 ? _j : true,
-        updatePageReferences: (_k = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.updatePageReferences) !== null && _k !== void 0 ? _k : false,
-        hideWebHiddenContent: (_l = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.hideWebHiddenContent) !== null && _l !== void 0 ? _l : false,
-        ignoreLastRenderedPageBreak: (_m = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.ignoreLastRenderedPageBreak) !== null && _m !== void 0 ? _m : !usePagedLayout,
+        ignoreLastRenderedPageBreak: (_b = docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.ignoreLastRenderedPageBreak) !== null && _b !== void 0 ? _b : !usePagedLayout,
         progress
     };
+    if (useWorker) {
+        options.workerUrl = appendDocxVendorAssetVersion(resolveFileViewerDocxWorkerUrl(docxOptions, documentBaseUrl), !!(docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.workerUrl));
+        options.workerJsZipUrl = appendDocxVendorAssetVersion(resolveFileViewerDocxWorkerJsZipUrl(docxOptions, documentBaseUrl), !!(docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.workerJsZipUrl));
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.workerTimeout) !== undefined) {
+        options.workerTimeout = docxOptions.workerTimeout;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.renderPageBatchSize) !== undefined) {
+        options.renderPageBatchSize = docxOptions.renderPageBatchSize;
+    }
+    else if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.progressive) === false) {
+        options.renderPageBatchSize = Number.MAX_SAFE_INTEGER;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.renderYieldEveryMs) !== undefined) {
+        options.renderYieldEveryMs = docxOptions.renderYieldEveryMs;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.strictWordCompatibility) !== undefined) {
+        options.strictWordCompatibility = docxOptions.strictWordCompatibility;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.paginationTolerance) !== undefined) {
+        options.paginationTolerance = docxOptions.paginationTolerance;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.maxDynamicPaginationPasses) !== undefined) {
+        options.maxDynamicPaginationPasses = docxOptions.maxDynamicPaginationPasses;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.awaitLayout) !== undefined) {
+        options.awaitLayout = docxOptions.awaitLayout;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.preserveComplexFieldResults) !== undefined) {
+        options.preserveComplexFieldResults = docxOptions.preserveComplexFieldResults;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.updatePageReferences) !== undefined) {
+        options.updatePageReferences = docxOptions.updatePageReferences;
+    }
+    if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.hideWebHiddenContent) !== undefined) {
+        options.hideWebHiddenContent = docxOptions.hideWebHiddenContent;
+    }
+    return options;
 };
 const isTargetHTMLElement = (value, target) => {
     var _a;
     const HTMLElementCtor = (_a = getTargetWindow(target)) === null || _a === void 0 ? void 0 : _a.HTMLElement;
     return HTMLElementCtor ? value instanceof HTMLElementCtor : value instanceof HTMLElement;
 };
-const shouldPaginateOversizedDocxSections = (context) => {
-    var _a, _b;
-    return ((_b = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.docx) === null || _b === void 0 ? void 0 : _b.visualPagination) === true;
-};
 const DOCX_RESPONSIVE_CSS = `
 .docx-fit-viewer {
   box-sizing: border-box;
@@ -172,616 +188,13 @@ const DOCX_RESPONSIVE_CSS = `
   position: relative;
   z-index: 1;
 }
-.docx-fit-viewer .docx-vml-watermark {
-  position: absolute;
-  inset: 0;
-  z-index: 0;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  opacity: 0.28;
-  filter: saturate(0.72) brightness(1.24);
-  pointer-events: none;
-  user-select: none;
-}
-.docx-fit-viewer .docx-vml-fallback,
-.docx-fit-viewer .docx-chart-fallback {
-  display: block;
-  max-width: 100%;
-  margin: 12px auto;
-  break-inside: avoid;
-  page-break-inside: avoid;
-}
-.docx-fit-viewer .docx-vml-fallback {
-  text-align: center;
-}
-.docx-fit-viewer .docx-vml-fallback img {
-  display: block;
-  max-width: 100%;
-  height: auto;
-  margin: 0 auto;
-}
-.docx-fit-viewer .docx-chart-fallback {
-  box-sizing: border-box;
-  overflow: hidden;
-  border: 1px solid #d7dee8;
-  border-radius: 8px;
-  background: #ffffff;
-  box-shadow: 0 1px 6px rgba(15, 23, 42, 0.08);
-}
-.docx-fit-viewer .docx-chart-fallback svg {
-  display: block;
-  width: 100%;
-  height: auto;
-}
 `;
-function getXmlLocalName(node) {
-    return node.localName || node.tagName.split(':').pop() || node.tagName;
-}
-function getXmlElements(root, localName) {
-    return Array.from(root.querySelectorAll('*')).filter(element => getXmlLocalName(element) === localName);
-}
-function getFirstXmlElement(root, localName) {
-    return getXmlElements(root, localName)[0];
-}
-function getXmlAttribute(element, name, namespace) {
-    return (namespace ? element.getAttributeNS(namespace, name) : null)
-        || element.getAttribute(name)
-        || element.getAttribute(`r:${name}`);
-}
-function getXmlText(element) {
-    if (!element) {
-        return '';
-    }
-    return (element.textContent || '').replace(/\s+/g, ' ').trim();
-}
-function getXmlAncestor(element, localName) {
-    let current = (element === null || element === void 0 ? void 0 : element.parentElement) || null;
-    while (current) {
-        if (getXmlLocalName(current) === localName) {
-            return current;
-        }
-        current = current.parentElement;
-    }
-    return null;
-}
-function getParagraphIndex(element) {
-    const paragraph = getXmlLocalName(element) === 'p' ? element : getXmlAncestor(element, 'p');
-    if (!paragraph) {
-        return undefined;
-    }
-    let index = 0;
-    let sibling = paragraph.previousElementSibling;
-    while (sibling) {
-        if (getXmlLocalName(sibling) === 'p') {
-            index += 1;
-        }
-        sibling = sibling.previousElementSibling;
-    }
-    return index;
-}
-function parseXml(xml, target) {
-    var _a;
-    const Parser = ((_a = getTargetWindow(target)) === null || _a === void 0 ? void 0 : _a.DOMParser) || globalThis.DOMParser;
-    if (!Parser) {
-        return null;
-    }
-    const doc = new Parser().parseFromString(xml, 'application/xml');
-    if (doc.querySelector('parsererror')) {
-        return null;
-    }
-    return doc;
-}
-function normalizeZipPath(path) {
-    const segments = [];
-    path.split('/').forEach(segment => {
-        if (!segment || segment === '.') {
-            return;
-        }
-        if (segment === '..') {
-            segments.pop();
-            return;
-        }
-        segments.push(segment);
-    });
-    return segments.join('/');
-}
-function getDirectoryName(path) {
-    const index = path.lastIndexOf('/');
-    return index >= 0 ? path.slice(0, index) : '';
-}
-function getRelationshipPath(partPath) {
-    const directory = getDirectoryName(partPath);
-    const name = partPath.slice(directory ? directory.length + 1 : 0);
-    return normalizeZipPath(`${directory}/_rels/${name}.rels`);
-}
-function resolveRelationshipTarget(partPath, target) {
-    if (target.startsWith('/')) {
-        return normalizeZipPath(target.slice(1));
-    }
-    return normalizeZipPath(`${getDirectoryName(partPath)}/${target}`);
-}
-function getMimeType(path) {
-    var _a;
-    const extension = (_a = path.split('.').pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-    switch (extension) {
-        case 'png':
-            return 'image/png';
-        case 'jpg':
-        case 'jpeg':
-            return 'image/jpeg';
-        case 'gif':
-            return 'image/gif';
-        case 'bmp':
-            return 'image/bmp';
-        case 'webp':
-            return 'image/webp';
-        case 'svg':
-            return 'image/svg+xml';
-        default:
-            return 'application/octet-stream';
-    }
-}
-function parseCssLengthToPixels(value) {
-    if (!value) {
-        return undefined;
-    }
-    const match = value.trim().match(/^(-?\d+(?:\.\d+)?)(px|pt|in|cm|mm)?$/i);
-    if (!match) {
-        return undefined;
-    }
-    const amount = Number(match[1]);
-    if (!Number.isFinite(amount) || amount <= 0) {
-        return undefined;
-    }
-    const unit = (match[2] || 'px').toLowerCase();
-    switch (unit) {
-        case 'pt':
-            return amount * 96 / 72;
-        case 'in':
-            return amount * 96;
-        case 'cm':
-            return amount * 96 / 2.54;
-        case 'mm':
-            return amount * 96 / 25.4;
-        default:
-            return amount;
-    }
-}
-function parseStyleDeclaration(style) {
-    const declarations = new Map();
-    if (!style) {
-        return declarations;
-    }
-    style.split(';').forEach(declaration => {
-        const separator = declaration.indexOf(':');
-        if (separator <= 0) {
-            return;
-        }
-        declarations.set(declaration.slice(0, separator).trim().toLowerCase(), declaration.slice(separator + 1).trim());
-    });
-    return declarations;
-}
-function parseShapeSize(style) {
-    const declarations = parseStyleDeclaration(style);
-    return {
-        width: parseCssLengthToPixels(declarations.get('width')),
-        height: parseCssLengthToPixels(declarations.get('height'))
-    };
-}
-function getExtentSize(element) {
-    const inline = getXmlAncestor(element, 'inline') || getXmlAncestor(element, 'anchor');
-    const extent = inline ? getFirstXmlElement(inline, 'extent') : undefined;
-    const width = Number(extent === null || extent === void 0 ? void 0 : extent.getAttribute('cx'));
-    const height = Number(extent === null || extent === void 0 ? void 0 : extent.getAttribute('cy'));
-    return {
-        width: Number.isFinite(width) && width > 0 ? width / DOCX_EMU_PER_CSS_PIXEL : undefined,
-        height: Number.isFinite(height) && height > 0 ? height / DOCX_EMU_PER_CSS_PIXEL : undefined
-    };
-}
-async function readDocxRelationships(zip, partPath, target) {
-    const relFile = zip.file(getRelationshipPath(partPath));
-    const relationships = new Map();
-    if (!relFile) {
-        return relationships;
-    }
-    const relDoc = parseXml(await relFile.async('text'), target);
-    if (!relDoc) {
-        return relationships;
-    }
-    getXmlElements(relDoc, 'Relationship').forEach(element => {
-        const id = element.getAttribute('Id');
-        const relationshipTarget = element.getAttribute('Target');
-        if (!id || !relationshipTarget) {
-            return;
-        }
-        relationships.set(id, {
-            id,
-            type: element.getAttribute('Type') || '',
-            target: relationshipTarget,
-            targetMode: element.getAttribute('TargetMode') || undefined
-        });
-    });
-    return relationships;
-}
-async function getDataUrlFromZip(zip, sourcePath) {
-    const file = zip.file(sourcePath);
-    if (!file) {
-        return undefined;
-    }
-    const base64 = await file.async('base64');
-    return `data:${getMimeType(sourcePath)};base64,${base64}`;
-}
-function getDocxPartPaths(zip) {
-    return Object.keys(zip.files)
-        .filter(path => path === 'word/document.xml'
-        || /^word\/header\d+\.xml$/i.test(path)
-        || /^word\/footer\d+\.xml$/i.test(path))
-        .sort((left, right) => {
-        if (left === 'word/document.xml') {
-            return -1;
-        }
-        if (right === 'word/document.xml') {
-            return 1;
-        }
-        return left.localeCompare(right);
-    });
-}
-function inferVmlFallbackRole(partPath, shape, style) {
-    const shapeId = `${(shape === null || shape === void 0 ? void 0 : shape.getAttribute('id')) || ''} ${(shape === null || shape === void 0 ? void 0 : shape.getAttribute('o:spid')) || ''}`.toLowerCase();
-    const normalizedStyle = (style || '').toLowerCase();
-    if (partPath.includes('/header')
-        && (shapeId.includes('watermark') || normalizedStyle.includes('z-index:-') || normalizedStyle.includes('mso-position-horizontal:center'))) {
-        return 'watermark';
-    }
-    if ((shape === null || shape === void 0 ? void 0 : shape.getAttribute('o:ole')) === 't' || (shape === null || shape === void 0 ? void 0 : shape.getAttribute('ole')) === 't') {
-        return 'ole-preview';
-    }
-    return 'vml-image';
-}
-async function collectDocxVmlFallbacks(zip, target) {
-    var _a;
-    const fallbacks = [];
-    const seen = new Set();
-    for (const partPath of getDocxPartPaths(zip)) {
-        const partFile = zip.file(partPath);
-        if (!partFile) {
-            continue;
-        }
-        const doc = parseXml(await partFile.async('text'), target);
-        if (!doc) {
-            continue;
-        }
-        const relationships = await readDocxRelationships(zip, partPath, target);
-        for (const imagedata of getXmlElements(doc, 'imagedata')) {
-            const relationshipId = getXmlAttribute(imagedata, 'id', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-            const relationship = relationshipId ? relationships.get(relationshipId) : undefined;
-            if (!relationship || relationship.targetMode === 'External' || !relationship.type.includes('/image')) {
-                continue;
-            }
-            const sourcePath = resolveRelationshipTarget(partPath, relationship.target);
-            const dataUrl = await getDataUrlFromZip(zip, sourcePath);
-            if (!dataUrl) {
-                continue;
-            }
-            const shape = getXmlAncestor(imagedata, 'shape');
-            const style = (shape === null || shape === void 0 ? void 0 : shape.getAttribute('style')) || undefined;
-            const role = inferVmlFallbackRole(partPath, shape, style);
-            const key = role === 'watermark'
-                ? `${role}:${sourcePath}`
-                : `${role}:${partPath}:${sourcePath}:${(_a = getParagraphIndex(imagedata)) !== null && _a !== void 0 ? _a : 'end'}`;
-            if (seen.has(key)) {
-                continue;
-            }
-            seen.add(key);
-            fallbacks.push({
-                role,
-                key,
-                dataUrl,
-                sourcePath,
-                partPath,
-                title: imagedata.getAttribute('o:title') || imagedata.getAttribute('title') || undefined,
-                style,
-                ...parseShapeSize(style),
-                paragraphIndex: partPath === 'word/document.xml' ? getParagraphIndex(imagedata) : undefined
-            });
-        }
-    }
-    return fallbacks;
-}
-function parseCacheValues(element) {
-    if (!element) {
-        return [];
-    }
-    return getXmlElements(element, 'pt')
-        .sort((left, right) => Number(left.getAttribute('idx') || 0) - Number(right.getAttribute('idx') || 0))
-        .map(point => getXmlText(getFirstXmlElement(point, 'v')))
-        .filter(Boolean);
-}
-function parseChartSeries(series) {
-    const name = parseCacheValues(getFirstXmlElement(getFirstXmlElement(series, 'tx') || series, 'strCache'))[0]
-        || parseCacheValues(getFirstXmlElement(getFirstXmlElement(series, 'tx') || series, 'numCache'))[0]
-        || 'Series';
-    const categories = parseCacheValues(getFirstXmlElement(getFirstXmlElement(series, 'cat') || series, 'strCache'));
-    const numericCategories = parseCacheValues(getFirstXmlElement(getFirstXmlElement(series, 'cat') || series, 'numCache'));
-    const values = parseCacheValues(getFirstXmlElement(getFirstXmlElement(series, 'val') || series, 'numCache'))
-        .map(value => Number(value))
-        .filter(value => Number.isFinite(value));
-    return {
-        name,
-        categories: categories.length ? categories : numericCategories,
-        values
-    };
-}
-function parseChartFallback(chartDoc, sourcePath, chartElement, paragraphIndex) {
-    const chartTypeElement = ['lineChart', 'barChart', 'pieChart', 'areaChart', 'scatterChart']
-        .map(type => getXmlElements(chartDoc, type)[0])
-        .find(Boolean);
-    const chartType = chartTypeElement ? getXmlLocalName(chartTypeElement) : 'chart';
-    const title = getXmlText(getFirstXmlElement(getFirstXmlElement(chartDoc, 'title') || chartDoc, 't'))
-        || sourcePath.split('/').pop() || 'Chart';
-    const series = (chartTypeElement ? getXmlElements(chartTypeElement, 'ser') : getXmlElements(chartDoc, 'ser'))
-        .map(parseChartSeries)
-        .filter(item => item.values.length);
-    const { width, height } = getExtentSize(chartElement);
-    if (!series.length) {
-        return undefined;
-    }
-    return {
-        key: `chart:${sourcePath}:${paragraphIndex !== null && paragraphIndex !== void 0 ? paragraphIndex : 'end'}`,
-        title,
-        type: chartType,
-        sourcePath,
-        series,
-        width,
-        height,
-        paragraphIndex
-    };
-}
-async function collectDocxChartFallbacks(zip, target) {
-    const partPath = 'word/document.xml';
-    const documentFile = zip.file(partPath);
-    if (!documentFile) {
-        return [];
-    }
-    const documentDoc = parseXml(await documentFile.async('text'), target);
-    if (!documentDoc) {
-        return [];
-    }
-    const relationships = await readDocxRelationships(zip, partPath, target);
-    const fallbacks = [];
-    const seen = new Set();
-    for (const chart of getXmlElements(documentDoc, 'chart')) {
-        const relationshipId = getXmlAttribute(chart, 'id', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-        const relationship = relationshipId ? relationships.get(relationshipId) : undefined;
-        if (!relationship || relationship.targetMode === 'External' || !relationship.type.includes('/chart')) {
-            continue;
-        }
-        const sourcePath = resolveRelationshipTarget(partPath, relationship.target);
-        const chartFile = zip.file(sourcePath);
-        if (!chartFile) {
-            continue;
-        }
-        const chartDoc = parseXml(await chartFile.async('text'), target);
-        const paragraphIndex = getParagraphIndex(chart);
-        const fallback = chartDoc ? parseChartFallback(chartDoc, sourcePath, chart, paragraphIndex) : undefined;
-        if (!fallback || seen.has(fallback.key)) {
-            continue;
-        }
-        seen.add(fallback.key);
-        fallbacks.push(fallback);
-    }
-    return fallbacks;
-}
-function escapeHtml(value) {
-    return value
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;');
-}
-function buildChartSvg(chart) {
-    var _a;
-    const width = Math.max(360, Math.round(chart.width || 520));
-    const height = Math.max(220, Math.round(chart.height || 320));
-    const padding = { top: 52, right: 30, bottom: 56, left: 54 };
-    const plotWidth = width - padding.left - padding.right;
-    const plotHeight = height - padding.top - padding.bottom;
-    const allValues = chart.series.flatMap(item => item.values);
-    const maxValue = Math.max(...allValues, 1);
-    const minValue = Math.min(...allValues, 0);
-    const valueSpan = Math.max(maxValue - minValue, 1);
-    const colors = ['#2563eb', '#10b981', '#f97316', '#8b5cf6', '#ef4444'];
-    const maxPoints = Math.max(...chart.series.map(item => item.values.length), 1);
-    const pointX = (index) => padding.left + (maxPoints === 1 ? plotWidth / 2 : index * plotWidth / (maxPoints - 1));
-    const pointY = (value) => padding.top + plotHeight - ((value - minValue) / valueSpan) * plotHeight;
-    const seriesPaths = chart.series.map((series, seriesIndex) => {
-        const color = colors[seriesIndex % colors.length];
-        const points = series.values.map((value, index) => `${pointX(index).toFixed(1)},${pointY(value).toFixed(1)}`).join(' ');
-        const circles = series.values.map((value, index) => {
-            const x = pointX(index).toFixed(1);
-            const y = pointY(value).toFixed(1);
-            return `<circle cx="${x}" cy="${y}" r="3.5" fill="${color}"><title>${escapeHtml(series.name)}: ${escapeHtml(String(value))}</title></circle>`;
-        }).join('');
-        return `<polyline points="${points}" fill="none" stroke="${color}" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>${circles}`;
-    }).join('');
-    const categories = ((_a = chart.series.find(item => item.categories.length)) === null || _a === void 0 ? void 0 : _a.categories) || [];
-    const labels = categories.slice(0, maxPoints).map((label, index) => {
-        const x = pointX(index);
-        const shown = label.length > 14 ? `${label.slice(0, 13)}...` : label;
-        return `<text x="${x.toFixed(1)}" y="${height - 22}" text-anchor="middle" fill="#64748b" font-size="11">${escapeHtml(shown)}</text>`;
-    }).join('');
-    const legend = chart.series.slice(0, 5).map((series, index) => {
-        const x = padding.left + index * 98;
-        const y = 30;
-        const color = colors[index % colors.length];
-        return `<g transform="translate(${x} ${y})"><rect width="10" height="10" rx="2" fill="${color}"/><text x="15" y="9" fill="#475569" font-size="11">${escapeHtml(series.name)}</text></g>`;
-    }).join('');
-    return `<svg viewBox="0 0 ${width} ${height}" role="img" aria-label="${escapeHtml(chart.title)}">
-    <rect x="0" y="0" width="${width}" height="${height}" rx="8" fill="#ffffff"/>
-    <text x="${padding.left}" y="22" fill="#0f172a" font-size="15" font-weight="700">${escapeHtml(chart.title)}</text>
-    ${legend}
-    <line x1="${padding.left}" y1="${padding.top + plotHeight}" x2="${padding.left + plotWidth}" y2="${padding.top + plotHeight}" stroke="#cbd5e1"/>
-    <line x1="${padding.left}" y1="${padding.top}" x2="${padding.left}" y2="${padding.top + plotHeight}" stroke="#cbd5e1"/>
-    <text x="${padding.left - 8}" y="${padding.top + 4}" text-anchor="end" fill="#64748b" font-size="11">${escapeHtml(maxValue.toFixed(1))}</text>
-    <text x="${padding.left - 8}" y="${padding.top + plotHeight}" text-anchor="end" fill="#64748b" font-size="11">${escapeHtml(minValue.toFixed(1))}</text>
-    ${seriesPaths}
-    ${labels}
-  </svg>`;
-}
-function getDocxSections(target) {
-    return Array.from(target.querySelectorAll('section.docx'));
-}
-function getDocxArticles(target) {
-    return Array.from(target.querySelectorAll('section.docx > article'));
-}
-function getDocxParagraphAnchor(target, paragraphIndex) {
-    if (paragraphIndex === undefined) {
-        return undefined;
-    }
-    const paragraphs = Array.from(target.querySelectorAll('section.docx > article p'));
-    return paragraphs[Math.min(Math.max(paragraphIndex, 0), Math.max(paragraphs.length - 1, 0))];
-}
-function insertDocxFallback(target, node, paragraphIndex) {
-    const anchor = getDocxParagraphAnchor(target, paragraphIndex);
-    if (anchor) {
-        anchor.after(node);
-        return;
-    }
-    const article = getDocxArticles(target)[0];
-    if (article) {
-        article.appendChild(node);
-    }
-}
-function injectDocxImageFallbacks(target, fallbacks) {
-    const sections = getDocxSections(target);
-    if (!sections.length) {
-        return;
-    }
-    fallbacks.forEach(fallback => {
-        if (fallback.role === 'watermark') {
-            sections.forEach(section => {
-                const image = target.ownerDocument.createElement('img');
-                image.className = 'docx-vml-watermark';
-                image.src = fallback.dataUrl;
-                image.alt = fallback.title || '';
-                image.dataset.docxFallback = fallback.key;
-                section.prepend(image);
-            });
-            return;
-        }
-        const figure = target.ownerDocument.createElement('figure');
-        figure.className = 'docx-vml-fallback';
-        figure.dataset.docxFallback = fallback.key;
-        if (fallback.width) {
-            figure.style.width = `${Math.round(fallback.width)}px`;
-        }
-        const image = target.ownerDocument.createElement('img');
-        image.src = fallback.dataUrl;
-        image.alt = fallback.title || (fallback.role === 'ole-preview' ? 'Embedded object preview' : 'Document image');
-        if (fallback.width) {
-            image.style.width = `${Math.round(fallback.width)}px`;
-        }
-        if (fallback.height) {
-            image.style.height = `${Math.round(fallback.height)}px`;
-        }
-        figure.appendChild(image);
-        insertDocxFallback(target, figure, fallback.paragraphIndex);
-    });
-}
-function injectDocxChartFallbacks(target, fallbacks) {
-    fallbacks.forEach(fallback => {
-        const figure = target.ownerDocument.createElement('figure');
-        figure.className = 'docx-chart-fallback';
-        figure.dataset.docxFallback = fallback.key;
-        if (fallback.width) {
-            figure.style.width = `${Math.round(fallback.width)}px`;
-        }
-        figure.innerHTML = buildChartSvg(fallback);
-        insertDocxFallback(target, figure, fallback.paragraphIndex);
-    });
-}
-async function enhanceDocxFallbacks(buffer, target) {
-    try {
-        const { default: JSZip } = await import('jszip');
-        const zip = await JSZip.loadAsync(buffer.slice(0));
-        const [imageFallbacks, chartFallbacks] = await Promise.all([
-            collectDocxVmlFallbacks(zip, target),
-            collectDocxChartFallbacks(zip, target)
-        ]);
-        if (imageFallbacks.length) {
-            injectDocxImageFallbacks(target, imageFallbacks);
-        }
-        if (chartFallbacks.length) {
-            injectDocxChartFallbacks(target, chartFallbacks);
-        }
-    }
-    catch (error) {
-        console.warn('[file-viewer] DOCX 兼容增强解析失败，已保留 @file-viewer/docx 原始渲染结果。', error);
-    }
-}
 function installResponsiveStyle(target) {
     const style = target.ownerDocument.createElement('style');
     style.textContent = DOCX_RESPONSIVE_CSS;
     target.prepend(style);
     return style;
 }
-function clonePageShell(section, article, pageHeight) {
-    const nextPage = section.cloneNode(false);
-    nextPage.innerHTML = '';
-    nextPage.dataset.docxPaginated = 'true';
-    nextPage.style.minHeight = `${pageHeight}px`;
-    nextPage.style.height = `${pageHeight}px`;
-    nextPage.style.overflow = 'hidden';
-    const nextArticle = article.cloneNode(false);
-    nextPage.appendChild(nextArticle);
-    Array.from(section.children).forEach(child => {
-        if (child !== article) {
-            nextPage.appendChild(child.cloneNode(true));
-        }
-    });
-    return { page: nextPage, article: nextArticle };
-}
-function getDocxPageHeight(section) {
-    var _a;
-    const style = (_a = section.ownerDocument.defaultView) === null || _a === void 0 ? void 0 : _a.getComputedStyle(section);
-    const minHeight = style ? parseFloat(style.minHeight) : 0;
-    return Number.isFinite(minHeight) && minHeight > 0 ? minHeight : section.offsetHeight;
-}
-function paginateOversizedSections(target) {
-    const wrapper = target.querySelector('.docx-wrapper');
-    if (!wrapper) {
-        return;
-    }
-    Array.from(wrapper.children).forEach(child => {
-        if (!isTargetHTMLElement(child, target) || !child.matches('section.docx')) {
-            return;
-        }
-        const article = child.querySelector(':scope > article');
-        if (!isTargetHTMLElement(article, target)) {
-            return;
-        }
-        const pageHeight = getDocxPageHeight(child);
-        const originalNodes = Array.from(article.childNodes);
-        if (!pageHeight || originalNodes.length < 2 || child.scrollHeight <= pageHeight * 1.15) {
-            return;
-        }
-        // 新 DOCX 引擎会优先使用 Word 保存的分页；这里保留预览层兜底分页，覆盖缺少分页标记的旧文件。
-        let current = clonePageShell(child, article, pageHeight);
-        child.before(current.page);
-        originalNodes.forEach(node => {
-            current.article.appendChild(node);
-            if (current.page.scrollHeight <= pageHeight + 1 || current.article.childNodes.length === 1) {
-                return;
-            }
-            current.article.removeChild(node);
-            current = clonePageShell(child, article, pageHeight);
-            child.before(current.page);
-            current.article.appendChild(node);
-        });
-        child.remove();
-    });
-}
 function wrapDocxSections(target, pagedLayout) {
     const wrapper = target.querySelector('.docx-wrapper');
     if (!wrapper) {
@@ -799,12 +212,10 @@ function wrapDocxSections(target, pagedLayout) {
     });
 }
 function makeDocxResponsive(target, context) {
+    var _a, _b;
     target.classList.add('docx-fit-viewer');
     const style = installResponsiveStyle(target);
-    const pagedLayout = shouldPaginateOversizedDocxSections(context);
-    if (pagedLayout) {
-        paginateOversizedSections(target);
-    }
+    const pagedLayout = ((_b = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.docx) === null || _b === void 0 ? void 0 : _b.visualPagination) === true;
     const frames = wrapDocxSections(target, pagedLayout);
     const view = getTargetWindow(target);
     const ResizeObserverCtor = view === null || view === void 0 ? void 0 : view.ResizeObserver;
@@ -989,7 +400,6 @@ export default async function (buffer, target, context) {
         ...docxOptions
     });
     notifyProgressiveRender();
-    await enhanceDocxFallbacks(buffer, target);
     const disposeResponsive = makeDocxResponsive(target, context);
     (_a = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _a === void 0 ? void 0 : _a.call(context, {
         includeDocumentStyles: false,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@file-viewer/renderer-word",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "private": false,
   "type": "module",
-  "description": "Standalone Word and compatible document renderer plugin for Flyfish File Viewer powered by @file-viewer/docx, msdoc-viewer, and RTF/ODF parsing.",
+  "description": "Standalone Word and compatible document renderer plugin for Flyfish File Viewer powered by @file-viewer/docx, @file-viewer/doc, and RTF/ODF parsing.",
   "keywords": [
     "file-viewer",
     "renderer",
@@ -57,10 +57,10 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "^2.1.9",
-    "@file-viewer/docx": "^0.3.12",
+    "@file-viewer/core": "^2.1.11",
+    "@file-viewer/doc": "^2.1.11",
+    "@file-viewer/docx": "^0.3.15",
     "jszip": "^3.10.1",
-    "msdoc-viewer": "^0.2.0",
     "rtf.js": "^3.0.9"
   },
   "devDependencies": {