office-viewer 0.3.11 → 0.3.13

package/esm/excel/io/excel/parseWorkbook.js

@@ -50,53 +50,57 @@ function parseWorkbook(parser, styleSheet) {
                         theme: theme
                     };
                     sharedStrings = [];
-                    if (!parser.fileExists('xl/sharedStrings.xml')) return [3 /*break*/, 8];
-                    return [4 /*yield*/, parseSharedStrings(parser.getString('xl/sharedStrings.xml'))];
+                    if (!parser.fileExists('xl/sharedStrings.xml.json')) return [3 /*break*/, 7];
+                    sharedStrings = JSON.parse(parser.getString('xl/sharedStrings.xml.json'));
+                    return [3 /*break*/, 9];
                 case 7:
-                    sharedStrings = _f.sent();
-                    _f.label = 8;
+                    if (!parser.fileExists('xl/sharedStrings.xml')) return [3 /*break*/, 9];
+                    return [4 /*yield*/, parseSharedStrings(parser.getString('xl/sharedStrings.xml'))];
                 case 8:
-                    _f.trys.push([8, 16, 17, 18]);
-                    _a = __values(node.children || []), _b = _a.next();
+                    sharedStrings = _f.sent();
                     _f.label = 9;
                 case 9:
-                    if (!!_b.done) return [3 /*break*/, 15];
+                    _f.trys.push([9, 17, 18, 19]);
+                    _a = __values(node.children || []), _b = _a.next();
+                    _f.label = 10;
+                case 10:
+                    if (!!_b.done) return [3 /*break*/, 16];
                     child = _b.value;
                     tag = child.tag;
                     _c = tag;
                     switch (_c) {
-                        case 'sheets': return [3 /*break*/, 10];
-                        case 'calcPr': return [3 /*break*/, 12];
-                        case 'definedNames': return [3 /*break*/, 13];
+                        case 'sheets': return [3 /*break*/, 11];
+                        case 'calcPr': return [3 /*break*/, 13];
+                        case 'definedNames': return [3 /*break*/, 14];
                     }
-                    return [3 /*break*/, 14];
-                case 10:
+                    return [3 /*break*/, 15];
+                case 11:
                     _d = workbook;
                     return [4 /*yield*/, parseSheets(child, parser, workbook, sharedStrings)];
-                case 11:
-                    _d.sheets = _f.sent();
-                    return [3 /*break*/, 14];
                 case 12:
-                    workbook.calcPr = autoParse(child, CT_CalcPr_Attributes);
-                    return [3 /*break*/, 14];
+                    _d.sheets = _f.sent();
+                    return [3 /*break*/, 15];
                 case 13:
-                    workbook.definedNames = parseDefinedNames(child);
-                    return [3 /*break*/, 14];
+                    workbook.calcPr = autoParse(child, CT_CalcPr_Attributes);
+                    return [3 /*break*/, 15];
                 case 14:
+                    workbook.definedNames = parseDefinedNames(child);
+                    return [3 /*break*/, 15];
+                case 15:
                     _b = _a.next();
-                    return [3 /*break*/, 9];
-                case 15: return [3 /*break*/, 18];
-                case 16:
+                    return [3 /*break*/, 10];
+                case 16: return [3 /*break*/, 19];
+                case 17:
                     e_1_1 = _f.sent();
                     e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 18];
-                case 17:
+                    return [3 /*break*/, 19];
+                case 18:
                     try {
                         if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
-                case 18: return [2 /*return*/, workbook];
+                case 19: return [2 /*return*/, workbook];
             }
         });
     });

package/esm/excel/io/excel/util/Range.d.ts

@@ -5,6 +5,7 @@ import { ViewRange } from '../../../sheet/ViewRange';
 import { RangeRef } from '../../../types/RangeRef';
 /**
  * 解析选区字符串，比如 A1:B2
+ * 还支持 A 或者 A:B 这种整列选择
  */
 export declare function parseRange(range: string): RangeRef;
 /**
@@ -35,6 +36,14 @@ export declare function inRange(range: RangeRef, otherRange: RangeRef): boolean;
  * @param range2
  */
 export declare function rangeEqual(range1: RangeRef, range2: RangeRef): boolean;
+/**
+ * 获取两个选区的交集
+ */
+export declare function getIntersectRange(range1: RangeRef, range2: RangeRef): RangeRef | null;
+/**
+ * 获取多个选区之间的交集
+ */
+export declare function getIntersectRanges(ranges: RangeRef[]): RangeRef | null;
 /**
  * 判断两个选区是否相交
  */
@@ -64,3 +73,6 @@ export declare function viewRangeToRangeRef(viewRange: ViewRange): {
     endRow: number;
     endCol: number;
 };
+/**
+ * 获取量选区
+ */

package/esm/excel/io/excel/util/Range.js

@@ -1,5 +1,6 @@
 import { __read } from 'tslib';
-import { decodeAddress } from './decodeAddress.js';
+import { MAX_ROW } from '../../../render/Consts.js';
+import { columnNameToNumber, decodeAddress } from './decodeAddress.js';
 import { numberToLetters } from './numberToLetters.js';
 
 /**
@@ -7,6 +8,7 @@ import { numberToLetters } from './numberToLetters.js';
  */
 /**
  * 解析选区字符串，比如 A1:B2
+ * 还支持 A 或者 A:B 这种整列选择
  */
 function parseRange(range) {
     if (range.indexOf(':') !== -1) {
@@ -15,6 +17,16 @@ function parseRange(range) {
             throw new Error('range 格式错误');
         }
         var _a = __read(parts, 2), start = _a[0], end = _a[1];
+        if (start.match(/^[A-Z]{1,3}$/) && end.match(/^[A-Z]{1,3}$/)) {
+            var startCol = columnNameToNumber(start);
+            var endCol = columnNameToNumber(end);
+            return {
+                startRow: 0,
+                startCol: startCol,
+                endRow: MAX_ROW,
+                endCol: endCol
+            };
+        }
         var startRange = decodeAddress(start);
         var endRange = decodeAddress(end);
         return {
@@ -25,6 +37,15 @@ function parseRange(range) {
         };
     }
     else {
+        if (range.match(/^[A-Z]{1,3}$/)) {
+            var col = columnNameToNumber(range);
+            return {
+                startRow: 0,
+                startCol: col,
+                endRow: MAX_ROW,
+                endCol: col
+            };
+        }
         var startRange = decodeAddress(range);
         return {
             startRow: startRange.row,
@@ -116,5 +137,8 @@ function viewRangeToRangeRef(viewRange) {
         endCol: cols[cols.length - 1]
     };
 }
+/**
+ * 获取量选区
+ */
 
 export { isCellInRange, isMergeCell, isSingleCell, mergeRange, parseRange, rangeEqual, rangeIntersect, rangeRefToString, viewRangeToRangeRef };

package/esm/excel/io/excel/util/__tests__/range.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/excel/io/excel/util/decodeAddress.d.ts

@@ -9,3 +9,9 @@ export declare function decodeAddress(value: string): {
     col: number;
     row: number;
 };
+/**
+ * 将 A 转成 0
+ * @param columnName
+ * @returns
+ */
+export declare function columnNameToNumber(columnName: string): number;

package/esm/excel/io/excel/util/decodeAddress.js

@@ -59,5 +59,22 @@ function decodeAddress(value) {
     }
     return address;
 }
+/**
+ * 将 A 转成 0
+ * @param columnName
+ * @returns
+ */
+function columnNameToNumber(columnName) {
+    columnName = columnName.toUpperCase();
+    var len = columnName.length;
+    var number = 0;
+    for (var i = 0; i < len; i++) {
+        var code = columnName.charCodeAt(i);
+        if (!isNaN(code)) {
+            number += (code - 64) * Math.pow(26, (len - i - 1));
+        }
+    }
+    return number - 1;
+}
 
-export { decodeAddress };
+export { columnNameToNumber, decodeAddress };

package/esm/excel/render/ExcelRender.js

@@ -343,7 +343,7 @@ var ExcelRender = /** @class */ (function () {
      */
     ExcelRender.prototype.loadFont = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var fontURL, notAvailableFonts, needReDraw, notAvailableFonts_1, notAvailableFonts_1_1, font, fontFace, e_1_1;
+            var fontURL, notAvailableFonts, needReDraw, notAvailableFonts_1, notAvailableFonts_1_1, font, fontFace, e_1_1, currentSheet;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -392,6 +392,8 @@ var ExcelRender = /** @class */ (function () {
                         if (needReDraw) {
                             // 宽度可能变化
                             inValidTextSizeCache();
+                            currentSheet = this.workbook.getActiveSheet();
+                            currentSheet.clearFontCache();
                             this.setNeedReDraw();
                         }
                         return [2 /*return*/];

package/esm/excel/render/Icons.js

@@ -1,7 +1,7 @@
 /** generated by genIcons.ts, do not edit */
 var Icons = {
     filter: '<?xml version="1.0" encoding="UTF-8"?>\n<svg width="217px" height="217px" viewBox="0 0 217 217" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n    <title>filter</title>\n    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n        <g id="filter" transform="translate(2, 2)" stroke="#717171">\n            <rect id="Rectangle" stroke-width="4" fill="#FFFFFF" x="0" y="0" width="213" height="213"></rect>\n            <g id="Group" transform="translate(57, 79.7096)" stroke-linecap="square" stroke-width="8">\n                <line x1="0" y1="0.290367902" x2="48.9405681" y2="48.9300718" id="Line"></line>\n                <line x1="49.5" y1="48.7903679" x2="98.2903679" y2="1.0658141e-14" id="Line-2"></line>\n            </g>\n        </g>\n    </g>\n</svg>',
-    filterDown: '<?xml version="1.0" encoding="UTF-8"?>\n<svg width="217px" height="217px" viewBox="0 0 217 217" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n    <title>filterDown</title>\n    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n        <g id="filterDown" transform="translate(2, 2)">\n            <rect id="Rectangle" stroke="#717171" stroke-width="4" x="0" y="0" width="213" height="213"></rect>\n            <path d="M192.487604,49.3238637 C193.452114,51.6534092 193.054963,53.6420455 191.29615,55.2897728 L149.339943,97.3068182 L149.339943,160.545454 C149.339943,162.931818 148.233592,164.607954 146.020892,165.573864 C145.283325,165.857955 144.574126,166 143.893295,166 C142.361426,166 141.084867,165.460227 140.063621,164.380682 L118.277031,142.5625 C117.199048,141.482955 116.660057,140.204545 116.660057,138.727273 L116.660057,97.3068182 L74.7038504,55.2897728 C72.9450371,53.6420455 72.5478857,51.6534092 73.5123962,49.3238637 C74.4769068,47.1079547 76.1506161,46 78.5335243,46 L187.466476,46 C189.849384,46 191.523093,47.1079546 192.487604,49.3238637 Z" id="Path" fill="#717171" fill-rule="nonzero"></path>\n            <polygon id="down_arrow" fill="#717171" fill-rule="nonzero" transform="translate(50, 113) rotate(180) translate(-50, -113)" points="42.4971879 82.9240649 42.4971879 173 57.5028121 173 57.5028121 82.9240649 80 82.9240649 50 53 20 82.9240649"></polygon>\n        </g>\n    </g>\n</svg>',
+    filterDown: '<?xml version="1.0" encoding="UTF-8"?>\n<svg width="217px" height="217px" viewBox="0 0 217 217" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n    <title>filterDown</title>\n    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n        <g id="filterDown" transform="translate(2, 2)">\n            <rect id="Rectangle" stroke="#717171" stroke-width="4" fill="#FFFFFF" x="0" y="0" width="213" height="213"></rect>\n            <path d="M192.487604,49.3238637 C193.452114,51.6534092 193.054963,53.6420455 191.29615,55.2897728 L149.339943,97.3068182 L149.339943,160.545454 C149.339943,162.931818 148.233592,164.607954 146.020892,165.573864 C145.283325,165.857955 144.574126,166 143.893295,166 C142.361426,166 141.084867,165.460227 140.063621,164.380682 L118.277031,142.5625 C117.199048,141.482955 116.660057,140.204545 116.660057,138.727273 L116.660057,97.3068182 L74.7038504,55.2897728 C72.9450371,53.6420455 72.5478857,51.6534092 73.5123962,49.3238637 C74.4769068,47.1079547 76.1506161,46 78.5335243,46 L187.466476,46 C189.849384,46 191.523093,47.1079546 192.487604,49.3238637 Z" id="Path" fill="#717171" fill-rule="nonzero"></path>\n            <polygon id="down_arrow" fill="#717171" fill-rule="nonzero" transform="translate(50, 113) rotate(180) translate(-50, -113)" points="42.4971879 82.9240649 42.4971879 173 57.5028121 173 57.5028121 82.9240649 80 82.9240649 50 53 20 82.9240649"></polygon>\n        </g>\n    </g>\n</svg>',
     filterUp: '<?xml version="1.0" encoding="UTF-8"?>\n<svg width="217px" height="217px" viewBox="0 0 217 217" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n    <title>filterUp</title>\n    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n        <g id="filterUp" transform="translate(2, 2)">\n            <rect id="Rectangle" stroke="#717171" stroke-width="4" fill="#FFFFFF" x="0" y="0" width="213" height="213"></rect>\n            <path d="M191.487604,49.3238637 C192.452114,51.6534092 192.054963,53.6420455 190.29615,55.2897728 L148.339943,97.3068182 L148.339943,160.545454 C148.339943,162.931818 147.233592,164.607954 145.020892,165.573864 C144.283325,165.857955 143.574126,166 142.893295,166 C141.361426,166 140.084867,165.460227 139.063621,164.380682 L117.277031,142.5625 C116.199048,141.482955 115.660057,140.204545 115.660057,138.727273 L115.660057,97.3068182 L73.7038504,55.2897728 C71.9450371,53.6420455 71.5478857,51.6534092 72.5123962,49.3238637 C73.4769068,47.1079547 75.1506161,46 77.5335243,46 L186.466476,46 C188.849384,46 190.523093,47.1079546 191.487604,49.3238637 Z" id="Path" fill="#717171" fill-rule="nonzero"></path>\n            <polygon id="up_arrow" fill="#717171" fill-rule="nonzero" points="42.4971879 82.9240649 42.4971879 173 57.5028121 173 57.5028121 82.9240649 80 82.9240649 50 53 20 82.9240649"></polygon>\n        </g>\n    </g>\n</svg>',
     hasFilter: '<?xml version="1.0" encoding="UTF-8"?>\n<svg width="217px" height="217px" viewBox="0 0 217 217" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n    <title>hasFilter</title>\n    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">\n        <g id="hasFilter" transform="translate(2, 2)">\n            <rect id="Rectangle" stroke="#717171" stroke-width="4" fill="#FFFFFF" x="0" y="0" width="213" height="213"></rect>\n            <path d="M185.487604,49.3238637 C186.452114,51.6534092 186.054963,53.6420455 184.29615,55.2897728 L142.339943,97.3068182 L142.339943,160.545454 C142.339943,162.931818 141.233592,164.607954 139.020892,165.573864 C138.283325,165.857955 137.574126,166 136.893295,166 C135.361426,166 134.084867,165.460227 133.063621,164.380682 L111.277031,142.5625 C110.199048,141.482955 109.660057,140.204545 109.660057,138.727273 L109.660057,97.3068182 L67.7038504,55.2897728 C65.9450371,53.6420455 65.5478857,51.6534092 66.5123962,49.3238637 C67.4769068,47.1079547 69.1506161,46 71.5335243,46 L180.466476,46 C182.849384,46 184.523093,47.1079546 185.487604,49.3238637 Z" id="Path" fill="#717171" fill-rule="nonzero"></path>\n            <polygon id="Path" fill="#717171" fill-rule="nonzero" points="80 126 53.5 166 27 126"></polygon>\n        </g>\n    </g>\n</svg>',
     left: '<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">\n    <path\n        d="M8.84182 3.13514C9.04327 3.32401 9.05348 3.64042 8.86462 3.84188L5.43521 7.49991L8.86462 11.1579C9.05348 11.3594 9.04327 11.6758 8.84182 11.8647C8.64036 12.0535 8.32394 12.0433 8.13508 11.8419L4.38508 7.84188C4.20477 7.64955 4.20477 7.35027 4.38508 7.15794L8.13508 3.15794C8.32394 2.95648 8.64036 2.94628 8.84182 3.13514Z"\n        fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path>\n</svg>\n',

package/esm/excel/render/drawing/EChartsRender.js

@@ -8,7 +8,7 @@ var EChartsRender = /** @class */ (function (_super) {
     }
     EChartsRender.prototype.render = function (option) {
         var _this = this;
-        import('echarts').then(function (echarts) {
+        import('../../../node_modules/echarts/index.js').then(function (echarts) {
             // @ts-ignore 奇怪为啥不对
             var chart = echarts.init(_this.drawingContainer);
             chart.setOption(option);

package/esm/excel/render/sheetTab/StatusBar.js

@@ -42,7 +42,7 @@ var StatusBar = /** @class */ (function () {
                     if (data.isDate) {
                         continue;
                     }
-                    var numberVal = parseFloat((data.value || data.text).trim());
+                    var numberVal = parseFloat((data.value || data.text) + ''.trim());
                     if (isNaN(numberVal)) {
                         continue;
                     }

package/esm/excel/render/sparkline/drawSparkline.js

@@ -36,7 +36,7 @@ function drawSparkline(currentSheet, viewRange, canvas) {
                     if (targetSheet) {
                         var displayHidden = sparklineGroup.displayHidden;
                         var dataInRange = targetSheet.getCellValueByRange(dataRange, displayHidden);
-                        var data_1 = dataInRange.map(function (val) { return val.value; });
+                        var data_1 = dataInRange.map(function (val) { return val.value + ''; });
                         var cacheKey = "".concat(sheetName, "!").concat(JSON.stringify(sparkline));
                         var padding_1 = 3;
                         canvas.customDrawWithCache(cacheKey, cellDisplayData_1.x + padding_1, cellDisplayData_1.y + padding_1, cellDisplayData_1.width - 2 * padding_1, cellDisplayData_1.height - 2 * padding_1, function (ctx) {

package/esm/excel/sheet/ColWidth.d.ts

@@ -1,5 +1,6 @@
 /**
  * col 宽度相关的工具函数
+ * https://learn.microsoft.com/en-US/office/troubleshoot/excel/determine-column-widths
  */
 /**
  * 用于根据字符数获取列宽

package/esm/excel/sheet/ColWidth.js

@@ -1,5 +1,6 @@
 /**
  * col 宽度相关的工具函数
+ * https://learn.microsoft.com/en-US/office/troubleshoot/excel/determine-column-widths
  */
 /**
  * 用于根据字符数获取列宽

package/esm/excel/sheet/Sheet.d.ts

@@ -277,4 +277,5 @@ export declare class Sheet {
      */
     setRowHeight(row: number, height: number): void;
     setColWidth(col: number, width: number): void;
+    clearFontCache(): void;
 }

package/esm/excel/sheet/Sheet.js

@@ -669,6 +669,9 @@ var Sheet = /** @class */ (function () {
     Sheet.prototype.setColWidth = function (col, width) {
         this.dataProvider.setColWidth(this.sheetIndex, col, width);
     };
+    Sheet.prototype.clearFontCache = function () {
+        this.dataProvider.clearDefaultFontSizeCache();
+    };
     return Sheet;
 }());
 

package/esm/excel/sheet/cfRule/aboveAverage.js

@@ -1,4 +1,5 @@
 import { lte, gte, gt } from '../../../util/number.js';
+import { toNumber } from '../../data/toNumber.js';
 import { applyCfRuleDxf } from './applyCfRuleDxf.js';
 
 function getAverageValue(values) {
@@ -27,7 +28,7 @@ function aboveAverage(sheet, cellInfo, ranges, cfRule) {
             if (value.text === '') {
                 return;
             }
-            values_1.push(parseFloat(value.value));
+            values_1.push(toNumber(value.value));
         });
         rangeAverage = getAverageValue(values_1);
         if (rangeAverage === null) {

package/esm/excel/sheet/cfRule/getMinMax.js

@@ -12,7 +12,19 @@ function getMinMax(rangeValues) {
             if (val === '' || val === undefined) {
                 continue;
             }
-            var num = parseFloat(val);
+            var num = void 0;
+            if (typeof val === 'boolean') {
+                num = val ? 1 : 0;
+            }
+            if (typeof val === 'string') {
+                num = parseFloat(val);
+            }
+            if (typeof val === 'number') {
+                num = val;
+            }
+            if (val === undefined) {
+                continue;
+            }
             if (min === undefined || lt(num, min)) {
                 min = num;
             }

package/esm/excel/sheet/cfRule/top10.js

@@ -1,4 +1,5 @@
 import { lte, gte, lt, gt } from '../../../util/number.js';
+import { toNumber } from '../../data/toNumber.js';
 import { applyCfRuleDxf } from './applyCfRuleDxf.js';
 
 function getRankValue(values, cfRule) {
@@ -45,7 +46,7 @@ function top10(sheet, cellInfo, ranges, cfRule) {
             if (value.text === '') {
                 return;
             }
-            values_1.push(parseFloat(value.value));
+            values_1.push(toNumber(value.value));
         });
         rankValue = getRankValue(values_1, cfRule);
         if (rankValue === null) {

package/esm/excel/types/CellValue.d.ts

@@ -8,7 +8,7 @@ export type CellValue = {
      * 单元格最终展现的文本
      */
     text: string;
-    value: string;
+    value: string | number | boolean | undefined;
     color?: string;
     isDate?: boolean;
 };

package/esm/excel/types/IDataProvider.d.ts

@@ -155,4 +155,8 @@ export interface IDataProvider {
      * 修改列宽
      */
     setColWidth(sheetIndex: number, col: number, width: number): void;
+    /**
+     * 清理默认字体大小缓存
+     */
+    clearDefaultFontSizeCache(): void;
 }