@file-viewer/renderer-word 2.3.0 → 2.3.2

package/dist/wordDoc.js

@@ -1,4 +1,4 @@
-import { defaultMsDocCss, parseMsDocToHtml } from '@file-viewer/doc';
+import { defaultMsDocCss, parseMsDocToHtml, sanitizeMsDocHtml } from '@file-viewer/doc';
 import { applyPrintPageSize, buildPrintPageStyle, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, registerFileViewerZoomProvider, resolveFileViewerFitScale, 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>';
@@ -368,21 +368,31 @@ function makeMsDocResponsive(target) {
  * 渲染 doc 文件
  */
 export default async function render(buffer, target, context) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const rendered = await parseMsDocToHtml(buffer, {
         renderOptions: {
-            css: `${defaultMsDocCss()}\n${WORD_PAGE_CSS}`
+            css: `${defaultMsDocCss()}\n${WORD_PAGE_CSS}`,
+            externalLinkPolicy: (_c = (_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.externalLinkPolicy) !== null && _c !== void 0 ? _c : 'block'
         }
     });
-    target.innerHTML = `<style data-msdoc>${rendered.css}</style>${wrapAsWordPages(rendered.html)}`;
+    const targetWindow = target.ownerDocument.defaultView;
+    if (!targetWindow) {
+        throw new Error('The DOC target must belong to a browser document');
+    }
+    const style = target.ownerDocument.createElement('style');
+    style.dataset.msdoc = '';
+    style.textContent = rendered.css;
+    const content = target.ownerDocument.createElement('div');
+    content.append(sanitizeMsDocHtml(wrapAsWordPages(rendered.html), targetWindow));
+    target.replaceChildren(style, ...Array.from(content.childNodes));
     const disposeResponsive = makeMsDocResponsive(target);
-    (_a = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _a === void 0 ? void 0 : _a.call(context, {
+    (_d = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _d === void 0 ? void 0 : _d.call(context, {
         includeDocumentStyles: false,
         getPrintMaskPages: () => Array.from(target.querySelectorAll('.msdoc-page')),
         printStyle: buildMsDocPrintStyle,
         toHtml: () => prepareMsDocCloneForExport(target)
     });
-    (_b = context === null || context === void 0 ? void 0 : context.registerThumbnailAdapter) === null || _b === void 0 ? void 0 : _b.call(context, {
+    (_e = context === null || context === void 0 ? void 0 : context.registerThumbnailAdapter) === null || _e === void 0 ? void 0 : _e.call(context, {
         getTarget: () => target.querySelector('.msdoc-page') || target
     });
     return {

package/dist/wordDocx.js

@@ -9,7 +9,7 @@ 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_VENDOR_ASSET_VERSION = '0.3.26';
+const DOCX_VENDOR_ASSET_VERSION = '0.3.27';
 const ZIP_SIGNATURE_PK = 0x504b;
 const WORDPROCESSINGML_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const OFFICE_RELATIONSHIP_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships';
@@ -258,6 +258,9 @@ const appendDocxVendorAssetVersion = (url, explicitUrl) => {
     if (!url || explicitUrl) {
         return url;
     }
+    if (/[?&]file-viewer-docx=[^&#]*/.test(url)) {
+        return url.replace(/([?&])file-viewer-docx=[^&#]*/, `$1file-viewer-docx=${DOCX_VENDOR_ASSET_VERSION}`);
+    }
     return `${url}${url.includes('?') ? '&' : '?'}file-viewer-docx=${DOCX_VENDOR_ASSET_VERSION}`;
 };
 export const applyDocxExternalLinkPolicy = (target, policy) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-word",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "private": false,
   "type": "module",
   "description": "Standalone Word and compatible document renderer plugin for File Viewer powered by @file-viewer/docx, @file-viewer/doc, and RTF/ODF parsing.",
@@ -58,7 +58,7 @@
   ],
   "dependencies": {
     "@file-viewer/core": "2.3.0",
-    "@file-viewer/doc": "2.3.0",
+    "@file-viewer/doc": "2.3.1",
     "@file-viewer/docx": "^0.3.27",
     "jszip": "^3.10.1",
     "rtf.js": "^3.0.9"

package/dist/docxChart.d.ts

@@ -1,4 +0,0 @@
-type DOMParserConstructor = new () => DOMParser;
-export declare const collectDocxChartSeriesNames: (buffer: ArrayBuffer, DOMParserCtor: DOMParserConstructor) => Promise<string[][]>;
-export declare const applyDocxChartSeriesNames: (buffer: ArrayBuffer, target: HTMLDivElement) => Promise<void>;
-export {};

package/dist/docxChart.js

@@ -1,149 +0,0 @@
-import JSZip from 'jszip';
-const localName = (node) => {
-    const name = node.localName || node.nodeName;
-    return name.split(':').pop() || name;
-};
-const elementsByLocal = (node, name) => {
-    const result = [];
-    const visit = (current) => {
-        childElements(current).forEach((child) => {
-            if (localName(child) === name) {
-                result.push(child);
-            }
-            visit(child);
-        });
-    };
-    if (node) {
-        visit(node);
-    }
-    return result;
-};
-const childElements = (node) => {
-    return node
-        ? Array.from(node.childNodes).filter((child) => child.nodeType === 1)
-        : [];
-};
-const firstChildByLocal = (node, name) => {
-    return childElements(node).find((child) => localName(child) === name);
-};
-const relationshipId = (element) => {
-    return (element.getAttribute('r:id') ||
-        element.getAttributeNS('http://schemas.openxmlformats.org/officeDocument/2006/relationships', 'id') ||
-        '');
-};
-const resolvePartPath = (sourcePart, target) => {
-    const sourceDirectory = sourcePart.slice(0, Math.max(0, sourcePart.lastIndexOf('/')));
-    const parts = (target.startsWith('/') ? target.slice(1) : `${sourceDirectory}/${target}`).split('/');
-    const normalized = [];
-    for (const part of parts) {
-        if (!part || part === '.') {
-            continue;
-        }
-        if (part === '..') {
-            normalized.pop();
-        }
-        else {
-            normalized.push(part);
-        }
-    }
-    return normalized.join('/');
-};
-const readXml = async (zip, path, DOMParserCtor) => {
-    const file = zip.file(path);
-    if (!file) {
-        return null;
-    }
-    return new DOMParserCtor().parseFromString(await file.async('text'), 'application/xml');
-};
-const extractSeriesName = (series) => {
-    var _a, _b;
-    const tx = firstChildByLocal(series, 'tx');
-    if (!tx) {
-        return '';
-    }
-    const points = elementsByLocal(tx, 'pt')
-        .map((point) => {
-        var _a, _b;
-        return ({
-            index: Number(point.getAttribute('idx')) || 0,
-            value: ((_b = (_a = firstChildByLocal(point, 'v')) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || ''
-        });
-    })
-        .sort((left, right) => left.index - right.index)
-        .map((point) => point.value)
-        .filter(Boolean);
-    if (points.length) {
-        return points.join(' ');
-    }
-    const richText = elementsByLocal(tx, 't')
-        .map((text) => { var _a; return ((_a = text.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || ''; })
-        .filter(Boolean)
-        .join(' ');
-    if (richText) {
-        return richText;
-    }
-    return ((_b = (_a = elementsByLocal(tx, 'v')[0]) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '';
-};
-export const collectDocxChartSeriesNames = async (buffer, DOMParserCtor) => {
-    const zip = await JSZip.loadAsync(buffer);
-    const documentPart = 'word/document.xml';
-    const [documentXml, relationshipsXml] = await Promise.all([
-        readXml(zip, documentPart, DOMParserCtor),
-        readXml(zip, 'word/_rels/document.xml.rels', DOMParserCtor)
-    ]);
-    if (!documentXml || !relationshipsXml) {
-        return [];
-    }
-    const relationships = new Map(elementsByLocal(relationshipsXml.documentElement, 'Relationship').map((relationship) => [
-        relationship.getAttribute('Id') || '',
-        {
-            target: relationship.getAttribute('Target') || '',
-            type: relationship.getAttribute('Type') || ''
-        }
-    ]));
-    const chartParts = elementsByLocal(documentXml.documentElement, 'chart').flatMap((chart) => {
-        const relationship = relationships.get(relationshipId(chart));
-        if (!(relationship === null || relationship === void 0 ? void 0 : relationship.target) || !relationship.type.endsWith('/chart')) {
-            return [];
-        }
-        return [resolvePartPath(documentPart, relationship.target)];
-    });
-    return Promise.all(chartParts.map(async (chartPart) => {
-        const chartXml = await readXml(zip, chartPart, DOMParserCtor);
-        return chartXml ? elementsByLocal(chartXml.documentElement, 'ser').map(extractSeriesName) : [];
-    }));
-};
-export const applyDocxChartSeriesNames = async (buffer, target) => {
-    var _a;
-    const charts = Array.from(target.querySelectorAll('.docx-chart'));
-    const hasFallbackLegend = charts.some((chart) => /Series\s+\d+/.test(chart.textContent || ''));
-    if (!hasFallbackLegend) {
-        return;
-    }
-    const DOMParserCtor = ((_a = target.ownerDocument.defaultView) === null || _a === void 0 ? void 0 : _a.DOMParser) || globalThis.DOMParser;
-    if (!DOMParserCtor) {
-        return;
-    }
-    try {
-        const namesByChart = await collectDocxChartSeriesNames(buffer, DOMParserCtor);
-        charts.forEach((chart, chartIndex) => {
-            var _a;
-            const names = ((_a = namesByChart[chartIndex]) === null || _a === void 0 ? void 0 : _a.filter(Boolean)) || [];
-            if (!names.length) {
-                return;
-            }
-            chart.dataset.chartSeriesNames = JSON.stringify(names);
-            const textElements = Array.from(chart.querySelectorAll('text'));
-            names.forEach((name, seriesIndex) => {
-                const fallback = `Series ${seriesIndex + 1}`;
-                const legend = textElements.find((text) => { var _a; return ((_a = text.textContent) === null || _a === void 0 ? void 0 : _a.trim()) === fallback; });
-                if (legend) {
-                    legend.textContent = name;
-                }
-            });
-        });
-    }
-    catch (error) {
-        console.warn('[file-viewer] DOCX 图表系列名修复失败，保留基础图表结果。', error);
-    }
-};