office-viewer 0.1.0 → 0.1.3

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

@@ -1,12 +1,10 @@
 /**
  * http://officeopenxml.com/WPtable.php
  */
-import Word from '../../Word';
 import { CSSStyle } from '../Style';
-import { CT_TblLook } from '../Types';
 import { Properties } from './properties/Properties';
-import { Tr } from './table/Tr';
-export type CT_TblLookKey = keyof CT_TblLook;
+import type { Tr } from './table/Tr';
+export type TblLookKey = 'firstRow' | 'firstRow' | 'lastRow' | 'firstColumn' | 'lastColumn' | 'noHBand' | 'noVBand';
 export interface TablePr extends Properties {
     /**
      * 表格标题
@@ -26,7 +24,7 @@ export interface TablePr extends Properties {
     /**
      * 条件格式
      */
-    tblLook?: Record<CT_TblLookKey, boolean>;
+    tblLook?: Record<TblLookKey, boolean>;
     /**
      * 行间隔
      */
@@ -36,14 +34,11 @@ export interface TablePr extends Properties {
      */
     colBandSize?: number;
 }
-interface GridCol {
+export interface GridCol {
     w: string;
 }
 export declare class Table {
     properties: TablePr;
     tblGrid: GridCol[];
     trs: Tr[];
-    static parseTablePr(word: Word, element: Element): TablePr;
-    static fromXML(word: Word, element: Element): Table;
 }
-export {};

package/lib/openxml/word/Table.js

@@ -2,250 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
-var OpenXML = require('../../OpenXML.js');
-var parseBorder = require('../../parse/parseBorder.js');
-var parseColor = require('../../parse/parseColor.js');
-var parseSize = require('../../parse/parseSize.js');
-var Types = require('../Types.js');
-var Tc = require('./table/Tc.js');
-var Tr = require('./table/Tr.js');
-
 /**
  * http://officeopenxml.com/WPtable.php
  */
-/**
- * 表格的 jc 需要使用 float 来实现
- * http://officeopenxml.com/WPtableAlignment.php
- */
-function parseTblJc(element, cssStyle) {
-    var val = OpenXML.getVal(element);
-    switch (val) {
-        case 'left':
-        case 'start':
-            // TODO: 会导致前面的文字掉下去，感觉还是不能支持这个功能
-            // cssStyle['float'] = 'left';
-            break;
-        case 'right':
-        case 'end':
-            cssStyle['float'] = 'right';
-    }
-}
-/**
- * 这个其实分左右，但目前只支持左，右可能是阿拉伯语？
- * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/tblInd_2.html
- */
-function parseTblInd(element, style) {
-    var width = Tc.parseTblWidth(element);
-    if (width) {
-        style['margin-left'] = width;
-    }
-}
-function parseTblW(element, style) {
-    var width = Tc.parseTblWidth(element);
-    if (width) {
-        style['width'] = width;
-    }
-}
-/**
- * http://officeopenxml.com/WPtableLayout.php
- */
-function parseTblLayout(element, style) {
-    var type = element.getAttribute('w:type');
-    if (type === Types.ST_TblLayoutType.fixed) {
-        style['table-layout'] = 'fixed';
-    }
-}
-function parseTblGrid(element) {
-    var e_1, _a;
-    var gridCol = [];
-    var gridColElements = element.getElementsByTagName('w:gridCol');
-    try {
-        for (var gridColElements_1 = tslib_es6.__values(gridColElements), gridColElements_1_1 = gridColElements_1.next(); !gridColElements_1_1.done; gridColElements_1_1 = gridColElements_1.next()) {
-            var gridColElement = gridColElements_1_1.value;
-            var w = parseSize.parseSize(gridColElement, 'w:w');
-            gridCol.push({ w: w });
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (gridColElements_1_1 && !gridColElements_1_1.done && (_a = gridColElements_1.return)) _a.call(gridColElements_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return gridCol;
-}
-// http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/ST_TblStyleOverrideType.html
-// val 是旧的格式
-function parseTblLook(child) {
-    var tblLook = {};
-    var tblLookVal = OpenXML.getValHex(child);
-    if (OpenXML.getAttrBoolean(child, 'firstRow', false) || tblLookVal & 0x0020) {
-        tblLook['firstRow'] = true;
-    }
-    if (OpenXML.getAttrBoolean(child, 'lastRow', false) || tblLookVal & 0x0040) {
-        tblLook['lastRow'] = true;
-    }
-    if (OpenXML.getAttrBoolean(child, 'firstColumn', false) || tblLookVal & 0x0080) {
-        tblLook['firstColumn'] = true;
-    }
-    if (OpenXML.getAttrBoolean(child, 'lastColumn', false) || tblLookVal & 0x0100) {
-        tblLook['lastColumn'] = true;
-    }
-    if (OpenXML.getAttrBoolean(child, 'noHBand', false) || tblLookVal & 0x0200) {
-        tblLook['noHBand'] = true;
-    }
-    else {
-        tblLook['noHBand'] = false;
-    }
-    if (OpenXML.getAttrBoolean(child, 'noVBand', false) || tblLookVal & 0x0400) {
-        tblLook['noVBand'] = true;
-    }
-    else {
-        tblLook['noVBand'] = false;
-    }
-    return tblLook;
-}
-/**
- * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/tblpPr.html
- * 只支持部分
- */
-function parsetTlpPr(word, child, style) {
-    // 如果设置 padding 会导致绝对定位不准确，所以一旦设置就不支持
-    if (typeof word.renderOptions.padding === 'undefined') {
-        var tplpX = parseSize.parseSize(child, 'w:tblpX');
-        var tplpY = parseSize.parseSize(child, 'w:tblpY');
-        style.position = 'absolute';
-        style.top = tplpY;
-        style.left = tplpX;
-    }
-    // 之前想用 float 来实现，但是会导致文字掉下去
-    // const topFromText = parseSize(child, 'w:topFromText');
-    // const bottomFromText = parseSize(child, 'w:bottomFromText');
-    // const rightFromText = parseSize(child, 'w:rightFromText');
-    // const leftFromText = parseSize(child, 'w:leftFromText');
-    // style['float'] = 'left';
-    // style['margin-bottom'] = addSize(style['margin-bottom'], bottomFromText);
-    // style['margin-left'] = addSize(style['margin-left'], leftFromText);
-    // style['margin-right'] = addSize(style['margin-right'], rightFromText);
-    // style['margin-top'] = addSize(style['margin-top'], topFromText);
-}
 var Table = /** @class */ (function () {
     function Table() {
         this.properties = {};
         this.tblGrid = [];
         this.trs = [];
     }
-    Table.parseTablePr = function (word, element) {
-        var e_2, _a;
-        var properties = {};
-        var tableStyle = {};
-        var tcStyle = {};
-        properties.tblLook = {};
-        properties.cssStyle = tableStyle;
-        properties.tcCSSStyle = tcStyle;
-        try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var child = _c.value;
-                var tagName = child.tagName;
-                switch (tagName) {
-                    case 'w:tblBorders':
-                        parseBorder.parseBorders(word, child, tableStyle);
-                        properties.insideBorder = Tc.parseInsideBorders(word, child);
-                        break;
-                    case 'w:tcBorders':
-                        parseBorder.parseBorders(word, child, tableStyle);
-                        break;
-                    case 'w:tblInd':
-                        parseTblInd(child, tableStyle);
-                        break;
-                    case 'w:jc':
-                        parseTblJc(child, tableStyle);
-                        break;
-                    case 'w:tblCellMar':
-                    case 'w:tcMar':
-                        // http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/tblCellMar_1.html
-                        Tc.parseCellMargin(child, tcStyle);
-                        break;
-                    case 'w:tblStyle':
-                        properties.pStyle = OpenXML.getVal(child);
-                        break;
-                    case 'w:tblW':
-                        parseTblW(child, tableStyle);
-                        break;
-                    case 'w:shd':
-                        // http://officeopenxml.com/WPtableShading.php
-                        tableStyle['background-color'] = parseColor.parseShdColor(word, child);
-                        break;
-                    case 'w:tblCaption':
-                        properties.tblCaption = OpenXML.getVal(child);
-                        break;
-                    case 'w:tblCellSpacing':
-                        Tc.parseTblCellSpacing(child, tableStyle);
-                        break;
-                    case 'w:tblLayout':
-                        parseTblLayout(child, tableStyle);
-                        break;
-                    case 'w:tblLook':
-                        properties.tblLook = parseTblLook(child);
-                        break;
-                    case 'w:tblStyleRowBandSize':
-                        properties.rowBandSize = OpenXML.getValNumber(child);
-                        break;
-                    case 'w:tblStyleColBandSize':
-                        properties.colBandSize = OpenXML.getValNumber(child);
-                        break;
-                    case 'w:tblpPr':
-                        parsetTlpPr(word, child, tableStyle);
-                        break;
-                    default:
-                        console.warn('parseTableProperties unknown tag', tagName, child);
-                }
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        return properties;
-    };
-    Table.fromXML = function (word, element) {
-        var e_3, _a;
-        var table = new Table();
-        // 用于计算列的跨行，这里记下前面的跨行情况
-        var rowSpanMap = {};
-        try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var child = _c.value;
-                var tagName = child.tagName;
-                switch (tagName) {
-                    case 'w:tblPr':
-                        table.properties = Table.parseTablePr(word, child);
-                        break;
-                    case 'w:tr':
-                        table.trs.push(Tr.Tr.fromXML(word, child, rowSpanMap));
-                        break;
-                    case 'w:tblGrid':
-                        table.tblGrid = parseTblGrid(child);
-                        break;
-                    default:
-                        console.warn('Table.fromXML unknown tag', tagName, child);
-                }
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        return table;
-    };
     return Table;
 }());
 

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

@@ -4,10 +4,9 @@
  * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/Main%20Document%20Story.html
  */
 import Word from '../../Word';
-import { DocumentBackground } from './Background';
 import { Body } from './Body';
 export declare class WDocument {
     body: Body;
-    documentBackground?: DocumentBackground;
+    backgroundColor?: string;
     static fromXML(word: Word, element: Document): WDocument;
 }

package/lib/openxml/word/WDocument.js

@@ -2,7 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
+var color = require('../../util/color.js');
 var parseColor = require('../../parse/parseColor.js');
 var Body = require('./Body.js');
 
@@ -11,22 +12,44 @@ var Body = require('./Body.js');
  * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/document.html
  * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/Main%20Document%20Story.html
  */
+/**
+ * 计算出最终实际背景色
+ */
+function getBackgroundColor(documentBackground) {
+    if (documentBackground.color) {
+        return documentBackground.color;
+    }
+    if (documentBackground.themeColor) {
+        var themeColor = documentBackground.themeColor;
+        if (documentBackground.themeTint) {
+            var color$1 = new color.Color(themeColor);
+            var themeShade = parseInt(documentBackground.themeTint, 16);
+            color$1.tint(themeShade / 256);
+        }
+        else if (documentBackground.themeShade) {
+            var color$1 = new color.Color(themeColor);
+            var themeShade = parseInt(documentBackground.themeShade, 16);
+            color$1.lumMod(themeShade / 256);
+        }
+    }
+    return '#FFFFF';
+}
 var WDocument = /** @class */ (function () {
     function WDocument() {
     }
     WDocument.fromXML = function (word, element) {
-        var e_1, _a;
+        var e_1, _a, e_2, _b;
         var doc = new WDocument();
-        var body = element.querySelector('body');
+        var body = element.getElementsByTagName('w:body').item(0);
         if (body) {
             doc.body = Body.Body.fromXML(word, body);
         }
-        var background = element.querySelector('background');
+        var background = element.getElementsByTagName('w:background').item(0);
         if (background) {
             var documentBackground = {};
             try {
-                for (var _b = tslib_es6.__values(background.attributes), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var attr = _c.value;
+                for (var _c = tslib.__values(background.attributes), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var attr = _d.value;
                     var name_1 = attr.name;
                     switch (name_1) {
                         case 'w:color':
@@ -42,6 +65,7 @@ var WDocument = /** @class */ (function () {
                             documentBackground.themeTint = parseColor.parseColorAttr(word, background, 'w:themeTint');
                             break;
                         default:
+                            console.log('unknown background', background);
                             break;
                     }
                 }
@@ -49,10 +73,32 @@ var WDocument = /** @class */ (function () {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
+            try {
+                for (var _e = tslib.__values(background.children), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var child = _f.value;
+                    var name_2 = child.tagName;
+                    switch (name_2) {
+                        case 'v:background':
+                            // vml 的背景色，不支持
+                            break;
+                        default:
+                            console.log('unknown background', background);
+                            break;
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            doc.backgroundColor = getBackgroundColor(documentBackground);
         }
         return doc;
     };

package/lib/openxml/word/numbering/AbstractNum.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var Lvl = require('./Lvl.js');
 var OpenXML = require('../../../OpenXML.js');
 
@@ -21,7 +21,7 @@ var AbstractNum = /** @class */ (function () {
         abstractNum.multiLevelType = element.getAttribute('w:multiLevelType');
         var lvls = element.getElementsByTagName('w:lvl');
         try {
-            for (var lvls_1 = tslib_es6.__values(lvls), lvls_1_1 = lvls_1.next(); !lvls_1_1.done; lvls_1_1 = lvls_1.next()) {
+            for (var lvls_1 = tslib.__values(lvls), lvls_1_1 = lvls_1.next(); !lvls_1_1.done; lvls_1_1 = lvls_1.next()) {
                 var child = lvls_1_1.value;
                 var lvlId = child.getAttribute('w:ilvl') || '';
                 abstractNum.lvls[lvlId] = Lvl.Lvl.fromXML(word, child);
@@ -34,7 +34,9 @@ var AbstractNum = /** @class */ (function () {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        var multiLevelType = element.querySelector('multiLevelType');
+        var multiLevelType = element
+            .getElementsByTagName('w:multiLevelType')
+            .item(0);
         if (multiLevelType) {
             abstractNum.multiLevelType = OpenXML.getVal(multiLevelType);
         }

package/lib/openxml/word/numbering/Lvl.js

@@ -2,10 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var Run = require('../Run.js');
 var OpenXML = require('../../../OpenXML.js');
-var Types = require('../../Types.js');
 var Paragraph = require('../Paragraph.js');
 
 var Lvl = /** @class */ (function () {
@@ -13,15 +12,15 @@ var Lvl = /** @class */ (function () {
         this.start = 1;
         this.lvlText = '%1.';
         this.isLgl = false;
-        this.lvlJc = Types.ST_Jc.start;
-        this.suff = Types.ST_LevelSuffix.space;
+        this.lvlJc = 'start';
+        this.suff = 'space';
     }
     Lvl.fromXML = function (word, element) {
         var e_1, _a;
         var lvl = new Lvl();
         lvl.ilvl = element.getAttribute('w:ilvl');
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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) {
@@ -37,6 +36,10 @@ var Lvl = /** @class */ (function () {
                     case 'w:lvlJc':
                         lvl.lvlJc = OpenXML.getVal(child);
                         break;
+                    case 'w:legacy':
+                        // 老的属性应该不需要支持了
+                        // http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/legacy.html
+                        break;
                     case 'w:pPr':
                         lvl.pPr = Paragraph.Paragraph.parseParagraphPr(word, child);
                         break;
@@ -46,6 +49,9 @@ var Lvl = /** @class */ (function () {
                     case 'w:isLgl':
                         lvl.isLgl = OpenXML.getValBoolean(child);
                         break;
+                    case 'w:pStyle':
+                        // 这个在 paragraph 里处理了
+                        break;
                     default:
                         console.warn("Lvl: Unknown tag ", tagName, child);
                 }

package/lib/openxml/word/numbering/Num.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var OpenXML = require('../../../OpenXML.js');
 var Lvl = require('./Lvl.js');
 
@@ -14,14 +14,16 @@ var Num = /** @class */ (function () {
         var e_1, _a;
         var num = new Num();
         num.numId = element.getAttribute('w:numId') || '';
-        var abstractNumId = element.querySelector('abstractNumId');
+        var abstractNumId = element
+            .getElementsByTagName('w:abstractNumId')
+            .item(0);
         if (abstractNumId) {
             num.abstractNumId = OpenXML.getVal(abstractNumId);
         }
-        var lvlOverride = element.querySelector('lvlOverride');
+        var lvlOverride = element.getElementsByTagName('w:lvlOverride').item(0);
         if (lvlOverride) {
             try {
-                for (var _b = tslib_es6.__values(lvlOverride.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = tslib.__values(lvlOverride.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var child = _c.value;
                     var tagName = child.tagName;
                     switch (tagName) {
@@ -29,6 +31,12 @@ var Num = /** @class */ (function () {
                             var lvlId = child.getAttribute('w:lvlId') || '';
                             num.lvlOverride.lvls[lvlId] = Lvl.Lvl.fromXML(word, child);
                             break;
+                        case 'w:startOverride':
+                            var id = child.getAttribute('w:lvlId') || '';
+                            if (num.lvlOverride.lvls[id]) {
+                                num.lvlOverride.lvls[id].start = OpenXML.getValNumber(child);
+                            }
+                            break;
                         default:
                             console.warn("Num: Unknown tag ", tagName, child);
                     }

package/lib/openxml/word/numbering/NumberProperties.js

@@ -9,11 +9,11 @@ var NumberPr = /** @class */ (function () {
     }
     NumberPr.fromXML = function (word, element) {
         var numPr = new NumberPr();
-        var ilvl = element.querySelector('ilvl');
+        var ilvl = element.getElementsByTagName('w:ilvl').item(0);
         if (ilvl) {
             numPr.ilvl = OpenXML.getVal(ilvl);
         }
-        var numId = element.querySelector('numId');
+        var numId = element.getElementsByTagName('w:numId').item(0);
         if (numId) {
             numPr.numId = OpenXML.getVal(numId);
         }

package/lib/openxml/word/numbering/Numbering.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var AbstractNum = require('./AbstractNum.js');
 var Num = require('./Num.js');
 
@@ -18,7 +18,7 @@ var Numbering = /** @class */ (function () {
         var e_1, _a, e_2, _b;
         var numbering = new Numbering();
         try {
-            for (var _c = tslib_es6.__values(element.getElementsByTagName('w:abstractNum')), _d = _c.next(); !_d.done; _d = _c.next()) {
+            for (var _c = tslib.__values(element.getElementsByTagName('w:abstractNum')), _d = _c.next(); !_d.done; _d = _c.next()) {
                 var abstractNumElement = _d.value;
                 var abstractNum = AbstractNum.AbstractNum.fromXML(word, abstractNumElement);
                 numbering.abstractNums[abstractNum.abstractNumId] = abstractNum;
@@ -32,7 +32,7 @@ var Numbering = /** @class */ (function () {
             finally { if (e_1) throw e_1.error; }
         }
         try {
-            for (var _e = tslib_es6.__values(element.getElementsByTagName('w:num')), _f = _e.next(); !_f.done; _f = _e.next()) {
+            for (var _e = tslib.__values(element.getElementsByTagName('w:num')), _f = _e.next(); !_f.done; _f = _e.next()) {
                 var numElement = _f.value;
                 var num = Num.Num.fromXML(word, numElement);
                 numbering.nums[num.numId] = num;

package/lib/openxml/word/table/Tc.d.ts

@@ -1,11 +1,10 @@
-import Word from '../../../Word';
 import { CSSStyle } from '../../Style';
 import { Paragraph } from '../Paragraph';
 import { Table } from '../Table';
 import { ST_Merge } from '../../Types';
 export interface TcPr {
     cssStyle?: CSSStyle;
-    hideMark?: false;
+    hideMark?: boolean;
     vMerge?: ST_Merge;
     gridSpan?: number;
     rowSpan?: number;
@@ -18,29 +17,9 @@ export interface TcPr {
     };
 }
 type TcChild = Paragraph | Table;
-export declare function parseCellMargin(element: Element, style: CSSStyle): void;
-export declare function parseTblCellSpacing(element: Element, style: CSSStyle): void;
-/**
- * parseBorders 不支持 insideH 和 insideV，所以单独支持一下
- * 实际显示时需要过滤掉第一列
- */
-export declare function parseInsideBorders(word: Word, element: Element): {
-    H: string | undefined;
-    V: string | undefined;
-};
-/**
- * http://officeopenxml.com/WPtableWidth.php
- */
-export declare function parseTblWidth(element: Element): string;
 export declare class Tc {
     properties: TcPr;
     children: TcChild[];
     add(child: TcChild): void;
-    static parseTcPr(word: Word, element: Element): TcPr;
-    static fromXML(word: Word, element: Element, currentCol: {
-        index: number;
-    }, rowSpanMap: {
-        [key: string]: Tc;
-    }): Tc | null;
 }
 export {};