office-viewer 0.1.3 → 0.1.4

package/esm/render/renderRun.js

@@ -35,12 +35,14 @@ function renderText(span, word, text, paragraph) {
     var _a;
     // 简单过滤一下提升性能
     if (text.indexOf('{{') === -1) {
+        var finalText = void 0;
         if ((_a = paragraph === null || paragraph === void 0 ? void 0 : paragraph.properties) === null || _a === void 0 ? void 0 : _a.autoSpace) {
-            span.textContent = cjkspace(text.split(''));
+            finalText = cjkspace(text.split(''));
         }
         else {
-            span.textContent = text;
+            finalText = text;
         }
+        span.textContent = finalText;
     }
     else {
         span.dataset.originText = text;
@@ -48,6 +50,9 @@ function renderText(span, word, text, paragraph) {
         span.classList.add(VARIABLE_CLASS_NAME);
         span.textContent = word.replaceText(text);
     }
+    // 大于两个空格才转成 nbsp
+    var html = span.innerHTML.split('  ').join('  ');
+    span.innerHTML = html;
 }
 /**
  * 更新文档里的所有变量

package/esm/render/renderStyle.js

@@ -21,7 +21,7 @@ function generateDefaultStyle(word) {
     }
     var hyphens = ((_a = word.settings) === null || _a === void 0 ? void 0 : _a.autoHyphenation) ? 'hyphens: auto;' : '';
     var classPrefix = word.getClassPrefix();
-    return "\n\n\n  /** docDefaults **/\n  .".concat(classPrefix, " {\n    --docx-theme-font-minorHAnsi: Calibri,  Helvetica, Arial, 'Helvetica Neue';\n    --docx-theme-font-minorEastAsia: 'PingFang SC', 'Microsoft YaHei', 'Hiragino Sans GB', 'STHeiti',\n    'Microsoft YaHei';\n  }\n\n  .").concat(classPrefix, " p {\n    margin: 0;\n    padding: 0;\n    line-height: 1.5;\n    ").concat(hyphens, "\n  }\n\n  .").concat(classPrefix, " .justify:after {\n    content: \"\";\n    display: inline-block;\n    width: 100%;\n  }\n\n  .").concat(classPrefix, " table {\n    border-spacing: 0;\n  }\n\n  .").concat(classPrefix, " .").concat(classPrefix, "-p {\n    ").concat(defaultPStyle, "\n  }\n\n  .").concat(classPrefix, " .").concat(classPrefix, "-r {\n    white-space: pre-wrap;\n    overflow-wrap: break-word;\n    ").concat(defaultRStyle, "\n  }\n  ");
+    return "\n\n\n  /** docDefaults **/\n  .".concat(classPrefix, " {\n    --docx-theme-font-minorHAnsi: Calibri,  Helvetica, Arial, 'Helvetica Neue';\n    --docx-theme-font-minorEastAsia: 'PingFang SC', 'Microsoft YaHei', 'Hiragino Sans GB', 'STHeiti',\n    'Microsoft YaHei';\n  }\n\n  .").concat(classPrefix, " p {\n    margin: 0;\n    padding: 0;\n    line-height: 1.5;\n    ").concat(hyphens, "\n  }\n\n  .").concat(classPrefix, " .justify:after {\n    content: \"\";\n    display: inline-block;\n    width: 100%;\n  }\n\n  .").concat(classPrefix, " table {\n    border-spacing: 0;\n  }\n\n  .").concat(classPrefix, " .").concat(classPrefix, "-p {\n    ").concat(defaultPStyle, "\n  }\n\n  .").concat(classPrefix, " .").concat(classPrefix, "-r {\n    overflow-wrap: break-word;\n    ").concat(defaultRStyle, "\n  }\n  ");
 }
 /**
  * 生成表格级别样式

package/esm/render/renderTab.d.ts

@@ -5,4 +5,4 @@ import Word from '../Word';
  * 不支持 tabs 里的自定义宽度，因为要算渲染后的宽度，比较麻烦
  * http://officeopenxml.com/WPtab.php
  */
-export declare function renderTab(word: Word, tab: Tab): HTMLElement;
+export declare function renderTab(word: Word, tab: Tab, renderWidth?: boolean): HTMLElement;

package/esm/render/renderTab.js

@@ -5,12 +5,18 @@ import { createElement } from '../util/dom.js';
  * 不支持 tabs 里的自定义宽度，因为要算渲染后的宽度，比较麻烦
  * http://officeopenxml.com/WPtab.php
  */
-function renderTab(word, tab) {
+function renderTab(word, tab, renderWidth) {
+    if (renderWidth === void 0) { renderWidth = false; }
     var tabElement = createElement('span');
+    tabElement.style.display = 'inline-block';
+    tabElement.style.width = '2em';
     tabElement.innerHTML = ' ';
     if (tab.leader === 'dot') {
         tabElement.style.borderBottom = '1pt dotted';
     }
+    if (renderWidth && tab.pos && (tab.type === 'start' || tab.type == 'left')) {
+        tabElement.style.width = tab.pos;
+    }
     return tabElement;
 }
 

package/esm/util/get.d.ts

@@ -0,0 +1,4 @@
+/**
+ * https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_get
+ */
+export declare const get: (obj: any, path: string, defaultValue?: undefined) => any;

package/esm/util/get.js

@@ -0,0 +1,18 @@
+/**
+ * https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_get
+ */
+var get = function (obj, path, defaultValue) {
+    if (defaultValue === void 0) { defaultValue = undefined; }
+    var travel = function (regexp) {
+        return String.prototype.split
+            .call(path, regexp)
+            .filter(Boolean)
+            .reduce(function (res, key) {
+            return res !== null && res !== undefined ? res[key] : res;
+        }, obj);
+    };
+    var result = travel(/[,[\]]+?/) || travel(/[,[\].]+?/);
+    return result === undefined || result === obj ? defaultValue : result;
+};
+
+export { get };

package/esm/util/replaceVar.js

@@ -24,6 +24,7 @@ function replaceText(word, text, data) {
             return String(result);
         }
         else {
+            console.warn('var error: [', text, '] not found in data');
             return '';
         }
     }
@@ -125,7 +126,7 @@ function replaceTableRow(word, tr) {
                     }
                     finally { if (e_5) throw e_5.error; }
                 }
-                table.appendChild(newTr);
+                table.insertBefore(newTr, tr);
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }

package/lib/Word.js

@@ -26,6 +26,7 @@ var parseEndnotes = require('./parse/parseEndnotes.js');
 var renderNotes = require('./render/renderNotes.js');
 var print = require('./util/print.js');
 var Settings = require('./openxml/Settings.js');
+var get = require('./util/get.js');
 
 var defaultRenderOptions = {
     classPrefix: 'docx-viewer',
@@ -47,8 +48,8 @@ var defaultRenderOptions = {
     renderHeader: true,
     renderFooter: true,
     data: {},
-    evalVar: function (t) {
-        return t;
+    evalVar: function (path, data) {
+        return get.get(data, path);
     }
 };
 var Word = /** @class */ (function () {
@@ -297,17 +298,19 @@ var Word = /** @class */ (function () {
      * 进行单个文本替换
      */
     Word.prototype.replaceText = function (text) {
+        var _this = this;
         if (this.renderOptions.enableVar === false) {
             return text;
         }
         var data = this.renderOptions.data;
         if (text.indexOf('{{') !== -1) {
-            text = text.replace(/^{{/g, '').replace(/}}$/g, '');
-            var result = this.renderOptions.evalVar(text, data);
-            if (typeof result === 'undefined') {
-                return '';
-            }
-            return String(result);
+            text = text.replace(/{{([^}]+)}}/g, function (all, group) {
+                var result = _this.renderOptions.evalVar(group, data);
+                if (typeof result === 'undefined') {
+                    return '';
+                }
+                return String(result);
+            });
         }
         return text;
     };
@@ -420,18 +423,21 @@ var Word = /** @class */ (function () {
      * 获取主题色
      */
     Word.prototype.getThemeColor = function (name) {
-        var _a, _b, _c;
+        var _a, _b;
         if (this.settings.clrSchemeMapping) {
             name = this.settings.clrSchemeMapping[name] || name;
         }
         if (this.themes && this.themes.length > 0) {
             var theme = this.themes[0];
-            var color = (_c = (_b = (_a = theme.themeElements) === null || _a === void 0 ? void 0 : _a.clrScheme) === null || _b === void 0 ? void 0 : _b.colors) === null || _c === void 0 ? void 0 : _c[name];
+            var colors = (_b = (_a = theme.themeElements) === null || _a === void 0 ? void 0 : _a.clrScheme) === null || _b === void 0 ? void 0 : _b.colors;
+            var color = colors === null || colors === void 0 ? void 0 : colors[name];
             if (color) {
                 return color;
             }
             else {
+                // 找不到可能是从其它地方拷贝过来的，这时取 accent1
                 console.warn('unknown theme color: ' + name);
+                return (colors === null || colors === void 0 ? void 0 : colors['accent1']) || '';
             }
         }
         return '';

package/lib/openxml/drawing/Drawing.d.ts

@@ -5,6 +5,7 @@ import { CSSStyle } from './../Style';
 import Word from '../../Word';
 import { Pic } from './Pic';
 import { WPS } from '../word/wps/WPS';
+import { WPG } from '../word/wps/WPG';
 /**
  * drawing 在文档中的位置，目前有两种情况，child 和 anchor
  */
@@ -24,6 +25,7 @@ export interface Anchor {
 export declare class Drawing {
     pic?: Pic;
     wps?: WPS;
+    wpg?: WPG;
     diagram?: ConstrainDOMStringParameters;
     position: Position;
     anchor?: Anchor;

package/lib/openxml/drawing/Drawing.js

@@ -8,6 +8,7 @@ var OpenXML = require('../../OpenXML.js');
 var Pic = require('./Pic.js');
 var WPS = require('../word/wps/WPS.js');
 var Diagram = require('./diagram/Diagram.js');
+var WPG = require('../word/wps/WPG.js');
 
 /**
  * 目前图片和 textbox 都会依赖这个
@@ -127,6 +128,9 @@ var Drawing = /** @class */ (function () {
                                     case 'wps:wsp':
                                         drawing.wps = WPS.WPS.fromXML(word, graphicDataChild);
                                         break;
+                                    case 'wpg:wgp':
+                                        drawing.wpg = WPG.WPG.fromXML(word, graphicDataChild);
+                                        break;
                                     case 'dgm:relIds':
                                         // 这个是 diagram 的关系
                                         // http://webapp.docx4java.org/OnlineDemo/ecma376/DrawingML/relIds.html

package/lib/openxml/drawing/Transform.d.ts

@@ -13,6 +13,8 @@ export interface Ext {
 export declare class Transform {
     off?: Off;
     ext?: Ext;
+    chOff?: Off;
+    chExt?: Ext;
     rot?: number;
     static fromXML(word: Word, element: Element): Transform;
 }

package/lib/openxml/drawing/Transform.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var parseSize = require('../../parse/parseSize.js');
 
 /**
@@ -11,20 +12,48 @@ var Transform = /** @class */ (function () {
     function Transform() {
     }
     Transform.fromXML = function (word, element) {
+        var e_1, _a;
         var transform = new Transform();
-        var off = element.getElementsByTagName('a:off').item(0);
-        if (off) {
-            transform.off = {
-                x: parseSize.parseSize(off, 'x', parseSize.LengthUsage.Emu),
-                y: parseSize.parseSize(off, 'y', parseSize.LengthUsage.Emu)
-            };
+        try {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                var tagName = child.tagName;
+                switch (tagName) {
+                    case 'a:off':
+                        transform.off = {
+                            x: parseSize.parseSize(child, 'x', parseSize.LengthUsage.Emu),
+                            y: parseSize.parseSize(child, 'y', parseSize.LengthUsage.Emu)
+                        };
+                        break;
+                    case 'a:ext':
+                        transform.ext = {
+                            cx: parseSize.parseSize(child, 'cx', parseSize.LengthUsage.Emu),
+                            cy: parseSize.parseSize(child, 'cy', parseSize.LengthUsage.Emu)
+                        };
+                        break;
+                    case 'a:chOff':
+                        transform.chOff = {
+                            x: parseSize.parseSize(child, 'x', parseSize.LengthUsage.Emu),
+                            y: parseSize.parseSize(child, 'y', parseSize.LengthUsage.Emu)
+                        };
+                        break;
+                    case 'a:chExt':
+                        transform.chExt = {
+                            cx: parseSize.parseSize(child, 'cx', parseSize.LengthUsage.Emu),
+                            cy: parseSize.parseSize(child, 'cy', parseSize.LengthUsage.Emu)
+                        };
+                        break;
+                    default:
+                        console.warn('Transform: Unknown tag ', tagName, child);
+                }
+            }
         }
-        var ext = element.getElementsByTagName('a:ext').item(0);
-        if (ext) {
-            transform.ext = {
-                cx: parseSize.parseSize(ext, 'cx', parseSize.LengthUsage.Emu),
-                cy: parseSize.parseSize(ext, 'cy', parseSize.LengthUsage.Emu)
-            };
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
         var rot = element.getAttribute('rot');
         if (rot) {

package/lib/openxml/word/Tab.d.ts

@@ -1,7 +1,7 @@
 import Word from '../../Word';
 import { ST_TabJc, ST_TabTlc } from '../Types';
 export declare class Tab {
-    type: ST_TabJc;
+    type: ST_TabJc | 'left';
     pos: string;
     leader?: ST_TabTlc;
     static fromXML(word: Word, element: Element): Tab;

package/lib/openxml/word/wps/WPG.d.ts

@@ -1,5 +1,14 @@
 /**
- * 图形组，目前还不不支持
+ * 图形组，目前是当成 wps 用了
  */
+import { WPS } from './WPS';
+import Word from '../../../Word';
+import { ShapePr } from '../../drawing/ShapeProperties';
+import { Pic } from '../../drawing/Pic';
 export declare class WPG {
+    wps: WPS[];
+    wpg: WPG[];
+    spPr?: ShapePr;
+    pic?: Pic;
+    static fromXML(word: Word, element: Element): WPG;
 }

package/lib/openxml/word/wps/WPG.js

@@ -0,0 +1,60 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var WPS = require('./WPS.js');
+var ShapeProperties = require('../../drawing/ShapeProperties.js');
+var Pic = require('../../drawing/Pic.js');
+
+/**
+ * 图形组，目前是当成 wps 用了
+ */
+var WPG = /** @class */ (function () {
+    function WPG() {
+    }
+    WPG.fromXML = function (word, element) {
+        var e_1, _a;
+        var wpg = new WPG();
+        var wps = [];
+        wpg.wps = wps;
+        wpg.wpg = [];
+        try {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                var tagName = child.tagName;
+                switch (tagName) {
+                    case 'wpg:cNvGrpSpPr':
+                        // 和展现无关
+                        break;
+                    case 'wpg:grpSpPr':
+                        wpg.spPr = ShapeProperties.ShapePr.fromXML(word, child);
+                        break;
+                    case 'wps:wsp':
+                        wps.push(WPS.WPS.fromXML(word, child));
+                        break;
+                    case 'pic:pic':
+                        wpg.pic = Pic.Pic.fromXML(word, child);
+                        break;
+                    case 'wpg:grpSp':
+                        // 组合中的组合
+                        wpg.wpg.push(WPG.fromXML(word, child));
+                        break;
+                    default:
+                        console.warn('WPS: Unknown tag ', tagName, child);
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return wpg;
+    };
+    return WPG;
+}());
+
+exports.WPG = WPG;

package/lib/openxml/word/wps/WPS.js

@@ -88,6 +88,7 @@ var WPS = /** @class */ (function () {
                 var tagName = child.tagName;
                 switch (tagName) {
                     case 'wps:cNvSpPr':
+                    case 'wps:cNvPr':
                         // 和展现无关
                         break;
                     case 'wps:spPr':