office-viewer 0.1.4 → 0.2.0

package/lib/package/XMLPackageParser.d.ts

@@ -19,7 +19,8 @@ export default class XMLPackageParser implements PackageParser {
     /**
      * 在 xml 下基本不用这个
      */
-    getFileByType(filePath: string, type: 'string' | 'blob'): string | Uint8Array | Blob | null;
+    getFileByType(filePath: string, type: 'string' | 'blob'): string | Blob | Uint8Array | null;
+    saveFile(filePath: string, content: Uint8Array | string): void;
     /**
      * 判断文件是否存在
      */

package/lib/package/ZipPackageParser.d.ts

@@ -17,7 +17,11 @@ export default class ZipPackageParser implements PackageParser {
     /**
      * 根据类型读取文件
      */
-    getFileByType(filePath: string, type: 'string' | 'blob' | 'uint8array'): string | Uint8Array | Blob | null;
+    getFileByType(filePath: string, type: 'string' | 'blob' | 'uint8array'): string | Blob | Uint8Array | null;
+    /**
+     * xml 下没这功能
+     */
+    saveFile(filePath: string, content: Uint8Array | string): void;
     /**
      * 判断文件是否存在
      */

package/lib/package/ZipPackageParser.js

@@ -52,6 +52,15 @@ var ZipPackageParser = /** @class */ (function () {
         console.warn('getFileByType', filePath, 'not found');
         return null;
     };
+    /**
+     * xml 下没这功能
+     */
+    ZipPackageParser.prototype.saveFile = function (filePath, content) {
+        if (typeof content === 'string') {
+            content = fflate.strToU8(content);
+        }
+        this.zip[filePath] = content;
+    };
     /**
      * 判断文件是否存在
      */

package/lib/render/renderParagraph.js

@@ -15,14 +15,13 @@ var setElementStyle = require('./setElementStyle.js');
 var renderTab = require('./renderTab.js');
 var OMath = require('../openxml/math/OMath.js');
 var renderMath = require('./renderMath.js');
-var Tab = require('../openxml/word/Tab.js');
 
 /**
  * 渲染段落
  * @param renderEmptySpace 如果是 true 的话，当内容为空时会自动加上  
  */
 function renderParagraph(word, paragraph, renderEmptySpace, inHeader) {
-    var e_1, _a, e_2, _b, e_3, _c;
+    var e_1, _a;
     if (renderEmptySpace === void 0) { renderEmptySpace = true; }
     if (inHeader === void 0) { inHeader = false; }
     word.currentParagraph = paragraph;
@@ -42,45 +41,25 @@ function renderParagraph(word, paragraph, renderEmptySpace, inHeader) {
         // 虽然目前这个实现很 hack，但可以支持常见情况
         dom.appendChild(p, renderTab.renderTab(word, properties.tabs[0], true));
         // 同时删掉第一个 run 中的 tab
-        var done = false;
-        try {
-            for (var _d = tslib.__values(paragraph.children), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var child = _e.value;
-                if (done) {
-                    break;
-                }
-                if (child instanceof Run.Run) {
-                    try {
-                        for (var _f = (e_2 = void 0, tslib.__values(child.children)), _g = _f.next(); !_g.done; _g = _f.next()) {
-                            var runChild = _g.value;
-                            if (runChild instanceof Tab.Tab) {
-                                child.children.splice(child.children.indexOf(runChild), 1);
-                                done = true;
-                                break;
-                            }
-                        }
-                    }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                    }
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
+        // 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 _h = tslib.__values(paragraph.children), _j = _h.next(); !_j.done; _j = _h.next()) {
-            var child = _j.value;
+        for (var _b = tslib.__values(paragraph.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var child = _c.value;
             if (child instanceof Run.Run) {
                 if (child.fldChar === 'begin') {
                     inFldChar = true;
@@ -105,12 +84,12 @@ function renderParagraph(word, paragraph, renderEmptySpace, inHeader) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_1) throw e_1.error; }
     }
     // 空行自动加个空格，不然会没高度
     if (p.innerHTML === '' && renderEmptySpace) {

package/lib/util/fileType.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 自动识别文件类型，只支持少数几种，参考了 file-type 项目里的实现
+ */
+type FileType = {
+    ext: string;
+    mime: string;
+};
+export declare function fileTypeFromBuffer(buffer: Uint8Array): FileType | null;
+export {};

package/lib/util/fileType.js

@@ -0,0 +1,70 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+
+/**
+ * 自动识别文件类型，只支持少数几种，参考了 file-type 项目里的实现
+ */
+function check(buffer, headers, options) {
+    var e_1, _a;
+    if (options === void 0) { options = {}; }
+    var offset = options.offset || 0;
+    try {
+        for (var _b = tslib.__values(headers.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var _d = tslib.__read(_c.value, 2), index = _d[0], header = _d[1];
+            // If a bitmask is set
+            if (options.mask) {
+                // If header doesn't equal `buf` with bits masked off
+                if (header !== (options.mask[index] & buffer[index + offset])) {
+                    return false;
+                }
+            }
+            else if (header !== buffer[index + offset]) {
+                return false;
+            }
+        }
+    }
+    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 true;
+}
+function stringToBytes(string) {
+    return tslib.__spreadArray([], tslib.__read(string), false).map(function (character) { return character.charCodeAt(0); });
+}
+function checkString(buffer, string, options) {
+    if (options === void 0) { options = {}; }
+    return check(buffer, stringToBytes(string), options);
+}
+function fileTypeFromBuffer(buffer) {
+    if (check(buffer, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) {
+        return { ext: 'png', mime: 'image/png' };
+    }
+    if (check(buffer, [0xff, 0xd8, 0xff])) {
+        return { ext: 'jpg', mime: 'image/jpeg' };
+    }
+    if (check(buffer, [0x47, 0x49, 0x46])) {
+        return { ext: 'gif', mime: 'image/gif' };
+    }
+    if (check(buffer, [0x42, 0x4d])) {
+        return { ext: 'bmp', mime: 'image/bmp' };
+    }
+    if (check(buffer, [0xc5, 0xd0, 0xd3, 0xc6])) {
+        return { ext: 'eps', mime: 'application/eps' };
+    }
+    if (checkString(buffer, '8BPS')) {
+        return { ext: 'psd', mime: 'image/vnd.adobe.photoshop' };
+    }
+    if (checkString(buffer, '%PDF')) {
+        return { ext: 'pdf', mime: 'application/pdf' };
+    }
+    return null;
+}
+
+exports.fileTypeFromBuffer = fileTypeFromBuffer;

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.d.ts

@@ -7,4 +7,10 @@ import Word from '../Word';
  * 替换单个文本变量
  */
 export declare function replaceT(word: Word, t: Element, data: any): void;
-export declare function replaceVar(word: Word, documentData: Document): void;
+/**
+ * 变量替换主入口
+ * @param word
+ * @param documentData
+ * @param replaceImage 是否替换掉图片，只有下载时才替换，避免性能问题
+ */
+export declare function replaceVar(word: Word, documentData: Document, replaceImage?: boolean): Promise<void>;