office-viewer 0.3.14 → 0.3.16

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

@@ -8,5 +8,6 @@ export type NoteChild = Paragraph | Table;
 export declare class Note {
     children: NoteChild[];
     addChild(child: NoteChild): void;
+    isEmpty(): boolean;
     static fromXML(word: Word, element: Element): Note;
 }

package/lib/openxml/word/Note.js

@@ -16,6 +16,9 @@ var Note = /** @class */ (function () {
     Note.prototype.addChild = function (child) {
         this.children.push(child);
     };
+    Note.prototype.isEmpty = function () {
+        return this.children.length === 0;
+    };
     Note.fromXML = function (word, element) {
         var e_1, _a;
         var note = new Note();

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

@@ -23,7 +23,12 @@ export declare class Text {
     text: string;
     constructor(text: string | number);
 }
-type RunChild = Break | Drawing | Text | Tab | Pict | Ruby | InstrText | Sym | SoftHyphen | Separator | NoBreakHyphen;
+export declare class FootnoteRef {
+    id: string;
+    type: 'footnote' | 'endnote';
+    constructor(id: string, type: 'footnote' | 'endnote');
+}
+type RunChild = Break | Drawing | Text | Tab | Pict | Ruby | InstrText | Sym | SoftHyphen | Separator | NoBreakHyphen | FootnoteRef;
 export declare class Run {
     properties: RunPr;
     children: RunChild[];

package/lib/openxml/word/Run.js

@@ -23,6 +23,13 @@ var Text = /** @class */ (function () {
     }
     return Text;
 }());
+var FootnoteRef = /** @class */ (function () {
+    function FootnoteRef(id, type) {
+        this.id = id;
+        this.type = type;
+    }
+    return FootnoteRef;
+}());
 var Run = /** @class */ (function () {
     function Run() {
         this.properties = {};
@@ -100,6 +107,12 @@ var Run = /** @class */ (function () {
                     case 'w:noBreakHyphen':
                         run.addChild(new NoBreakHyphen.NoBreakHyphen());
                         break;
+                    case 'w:footnoteReference':
+                        run.addChild(new FootnoteRef(child.getAttribute('w:id') || '', 'footnote'));
+                        break;
+                    case 'w:endnoteReference':
+                        run.addChild(new FootnoteRef(child.getAttribute('w:id') || '', 'endnote'));
+                        break;
                     case 'w:separator':
                         run.addChild(new Separator.Separator());
                         break;
@@ -123,5 +136,6 @@ var Run = /** @class */ (function () {
     return Run;
 }());
 
+exports.FootnoteRef = FootnoteRef;
 exports.Run = Run;
 exports.Text = Text;

package/lib/package/XMLPackageParser.d.ts

@@ -20,7 +20,7 @@ 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;
     /**
      * 读取文本内容
      */

package/lib/package/ZipPackageParser.d.ts

@@ -18,7 +18,7 @@ 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;
     /**
      * 读取文本内容
      */

package/lib/util/fflate.js

@@ -569,8 +569,8 @@ var wblk = function (dat, out, final, syms, lf, df, eb, li, bs, bl, p) {
             wbits(out, p + 3 * i, lct[clim[i]]);
         p += 3 * nlcc;
         var lcts = [lclt, lcdt];
-        for (var it_1 = 0; it_1 < 2; ++it_1) {
-            var clct = lcts[it_1];
+        for (var it = 0; it < 2; ++it) {
+            var clct = lcts[it];
             for (var i = 0; i < clct.length; ++i) {
                 var len = clct[i] & 31;
                 wbits(out, p, llm[len]), (p += lct[len]);

package/lib/util/saxes.js

@@ -317,7 +317,7 @@ var SaxesParser = /** @class */ (function () {
                 this.closedRoot =
                     this.sawRoot =
                         fragmentOpt;
-        // An XML declaration is intially possible only when parsing whole
+        // An XML declaration is initially possible only when parsing whole
         // documents.
         this.xmlDeclPossible = !fragmentOpt;
         this.xmlDeclExpects = ['version'];

package/lib/word/parse/jcToTextAlign.d.ts

@@ -2,4 +2,4 @@
  *
  * http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/ST_Jc.html
  */
-export declare function jcToTextAlign(jc: string): "left" | "center" | "right" | "justify";
+export declare function jcToTextAlign(jc: string): "center" | "justify" | "left" | "right";

package/lib/word/render/renderNotes.js

@@ -14,12 +14,23 @@ var renderTable = require('./renderTable.js');
  */
 function renderNote(word, noteRoot, type, id, note) {
     var e_1, _a;
+    var _b;
     var noteChild = note.children;
     var noteElement = dom.createElement('div');
+    noteElement.style.display = 'flex';
+    noteElement.style.alignItems = 'baseline';
     var mark = dom.createElement('a');
     var fName = type + '-' + id;
     mark.name = fName;
     mark.id = fName;
+    var index = (_b = word.noteIndexMap[fName]) !== null && _b !== void 0 ? _b : id;
+    var indexAnchor = dom.createElement('a');
+    indexAnchor.style.flexShrink = '0';
+    indexAnchor.style.marginRight = '0.3em';
+    indexAnchor.style.textDecoration = 'none';
+    indexAnchor.textContent = '[' + String(index) + ']';
+    noteElement.appendChild(mark);
+    noteElement.appendChild(indexAnchor);
     noteRoot.appendChild(noteElement);
     try {
         for (var noteChild_1 = tslib.__values(noteChild), noteChild_1_1 = noteChild_1.next(); !noteChild_1_1.done; noteChild_1_1 = noteChild_1.next()) {
@@ -62,11 +73,19 @@ function renderNotes(word) {
     var noteRoot = dom.createElement('div');
     if (hasNote(word.footNotes)) {
         for (var fId in word.footNotes) {
+            if (fId === '0' || fId === '-1')
+                continue;
+            if (word.footNotes[fId].isEmpty())
+                continue;
             renderNote(word, noteRoot, 'footnote', fId, word.footNotes[fId]);
         }
     }
     if (hasNote(word.endNotes)) {
         for (var fId in word.endNotes || {}) {
+            if (fId === '0' || fId === '-1')
+                continue;
+            if (word.endNotes[fId].isEmpty())
+                continue;
             renderNote(word, noteRoot, 'endnote', fId, word.endNotes[fId]);
         }
     }

package/lib/word/render/renderRun.js

@@ -131,6 +131,22 @@ function renderRun(word, run, paragraph, inFldChar, inHeader) {
                 else if (child instanceof Separator.Separator) {
                     dom.appendChild(span, renderSeparator.renderSeparator());
                 }
+                else if (child instanceof Run.FootnoteRef) {
+                    var target = child.type + '-' + child.id;
+                    var displayIndex = word.noteIndexMap[target];
+                    // 如果脚注内容为空（不在映射中），不渲染引用
+                    if (displayIndex == null)
+                        break;
+                    var anchor = dom.createElement('a');
+                    anchor.href = '#' + target;
+                    anchor.style.verticalAlign = 'super';
+                    anchor.style.fontSize = '0.75em';
+                    anchor.style.textDecoration = 'none';
+                    anchor.dataset.noteId = child.id;
+                    anchor.dataset.noteType = child.type;
+                    anchor.textContent = '[' + String(displayIndex) + ']';
+                    dom.appendChild(span, anchor);
+                }
                 else {
                     console.warn('unknown child', child);
                 }

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "office-viewer",
-  "version": "0.3.14",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/baidu/amis-inner.git"
+  },
+  "version": "0.3.16",
   "description": "office 文档在线预览",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -71,6 +75,7 @@
     "@rollup/plugin-typescript": "^8.3.4",
     "@swc/jest": "^0.2.34",
     "@testing-library/jest-dom": "^5.17.0",
+    "@types/node": "^14.0.24",
     "@types/jest": "^28.1.0",
     "@types/prettier": "^2.7.3",
     "amis-formula": "^2.7.2",
@@ -87,7 +92,7 @@
     "xml-formatter": "^3.3.2"
   },
   "peerDependencies": {
-    "echarts": "^5.4.0"
+    "echarts": "^5.5.1"
   },
   "jest": {
     "testEnvironment": "jsdom",
@@ -119,4 +124,4 @@
       "printBasicPrototype": false
     }
   }
-}
+}