office-viewer 0.1.3 → 0.1.5

package/lib/render/renderParagraph.js

@@ -12,6 +12,7 @@ var renderHyperLink = require('./renderHyperLink.js');
 var renderBookmark = require('./renderBookmark.js');
 var renderNumbering = require('./renderNumbering.js');
 var setElementStyle = require('./setElementStyle.js');
+var renderTab = require('./renderTab.js');
 var OMath = require('../openxml/math/OMath.js');
 var renderMath = require('./renderMath.js');
 
@@ -35,6 +36,27 @@ function renderParagraph(word, paragraph, renderEmptySpace, inHeader) {
         dom.appendChild(p, renderNumbering.renderNumbering(p, word, properties.numPr));
     }
     var inFldChar = false;
+    if (properties.tabs && properties.tabs.length) {
+        // 目前只支持渲染第一个，因为第二个位置取决于前面内容位置，挺麻烦
+        // 虽然目前这个实现很 hack，但可以支持常见情况
+        dom.appendChild(p, renderTab.renderTab(word, properties.tabs[0], true));
+        // 同时删掉第一个 run 中的 tab
+        // let done = false;
+        // for (const child of paragraph.children) {
+        //   if (done) {
+        //     break;
+        //   }
+        //   if (child instanceof Run) {
+        //     for (const runChild of child.children) {
+        //       if (runChild instanceof Tab) {
+        //         child.children.splice(child.children.indexOf(runChild), 1);
+        //         done = true;
+        //         break;
+        //       }
+        //     }
+        //   }
+        // }
+    }
     try {
         for (var _b = tslib.__values(paragraph.children), _c = _b.next(); !_c.done; _c = _b.next()) {
             var child = _c.value;

package/lib/render/renderRun.js

@@ -39,12 +39,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 = autoSpace.cjkspace(text.split(''));
+            finalText = autoSpace.cjkspace(text.split(''));
         }
         else {
-            span.textContent = text;
+            finalText = text;
         }
+        span.textContent = finalText;
     }
     else {
         span.dataset.originText = text;
@@ -52,6 +54,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/lib/render/renderStyle.js

@@ -25,7 +25,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/lib/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/lib/render/renderTab.js

@@ -9,12 +9,18 @@ var dom = require('../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 = dom.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/lib/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/lib/util/get.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * 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;
+};
+
+exports.get = get;

package/lib/util/mergeRun.js

@@ -39,7 +39,13 @@ function canMerge(element) {
             if (childChild.tagName === 'w:t') {
                 hasText = true;
                 textHasSpace = childChild.getAttribute('xml:space') === 'preserve';
-                break;
+                if (textHasSpace) {
+                    break;
+                }
+            }
+            // 有 tab 的情况下不能合并
+            if (childChild.tagName === 'w:tab') {
+                return false;
             }
         }
     }

package/lib/util/replaceVar.js

@@ -28,6 +28,7 @@ function replaceText(word, text, data) {
             return String(result);
         }
         else {
+            console.warn('var error: [', text, '] not found in data');
             return '';
         }
     }
@@ -129,7 +130,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "office-viewer",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "office 文档在线预览",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -65,7 +65,6 @@
   },
   "jest": {
     "testEnvironment": "jsdom",
-    "collectCoverage": true,
     "coverageReporters": [
       "text",
       "cobertura"
@@ -99,4 +98,4 @@
       "printBasicPrototype": false
     }
   }
-}
+}