office-viewer 0.3.13 → 0.3.15

package/esm/createOfficeViewer.js

@@ -19,8 +19,8 @@ import { fileTypeFromArrayBuffer } from './util/fileType.js';
 function createOfficeViewer(docFile, renderOptions, fileName, parser) {
     if (parser === void 0) { parser = new ZipPackageParser(); }
     return __awaiter(this, void 0, void 0, function () {
-        var fileExt, excel, fileType, isWord, isExcel, contentTypes, _a, _b, item, excel;
-        var e_1, _c;
+        var fileExt, excel, buffer, fileType, XLSX, workbook, rawData, e_1, isWord, isExcel, contentTypes, _a, _b, item, excel;
+        var e_2, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -33,15 +33,35 @@ function createOfficeViewer(docFile, renderOptions, fileName, parser) {
                     _d.sent();
                     return [2 /*return*/, excel];
                 case 2:
-                    fileType = fileTypeFromArrayBuffer(docFile);
-                    if (fileType === null || (fileType.ext !== 'zip' && fileType.ext !== 'xml')) {
-                        if ((fileType === null || fileType === void 0 ? void 0 : fileType.ext) === 'cfb') {
-                            return [2 /*return*/, new UnSupport('不支持加密文件')];
-                        }
+                    buffer = docFile;
+                    fileType = fileTypeFromArrayBuffer(buffer);
+                    if (!((fileType === null || fileType === void 0 ? void 0 : fileType.ext) === 'cfb')) return [3 /*break*/, 7];
+                    _d.label = 3;
+                case 3:
+                    _d.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, import('./node_modules/xlsx/xlsx.mjs.js')];
+                case 4:
+                    XLSX = _d.sent();
+                    workbook = XLSX.read(new Uint8Array(buffer));
+                    rawData = XLSX.write(workbook, { type: 'array', bookType: 'xlsx' });
+                    buffer = new Uint8Array(rawData).buffer;
+                    if (fileName) {
+                        fileName = fileName.replace(/\.xls$/i, '.xlsx');
+                    }
+                    return [3 /*break*/, 6];
+                case 5:
+                    e_1 = _d.sent();
+                    return [2 /*return*/, new UnSupport('XLS文件转换失败: ' + e_1.message)];
+                case 6: return [3 /*break*/, 8];
+                case 7:
+                    if (fileType === null ||
+                        (fileType.ext !== 'zip' && fileType.ext !== 'xml')) {
                         return [2 /*return*/, new UnSupport('不支持的文件类型: ' + (fileType === null || fileType === void 0 ? void 0 : fileType.ext))];
                     }
+                    _d.label = 8;
+                case 8:
                     try {
-                        parser.load(docFile);
+                        parser.load(buffer);
                     }
                     catch (error) {
                         return [2 /*return*/, new UnSupport('文件解析失败')];
@@ -64,16 +84,16 @@ function createOfficeViewer(docFile, renderOptions, fileName, parser) {
                                 }
                             }
                         }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_1) throw e_1.error; }
+                            finally { if (e_2) throw e_2.error; }
                         }
                     }
                     else {
-                        if (fileName === null || fileName === void 0 ? void 0 : fileName.endsWith('.xlsx')) {
+                        if ((fileName === null || fileName === void 0 ? void 0 : fileName.endsWith('.xlsx')) || (fileName === null || fileName === void 0 ? void 0 : fileName.endsWith('.xls'))) {
                             isExcel = true;
                         }
                         else if (fileName === null || fileName === void 0 ? void 0 : fileName.endsWith('.docx')) {
@@ -85,10 +105,10 @@ function createOfficeViewer(docFile, renderOptions, fileName, parser) {
                         isWord = true;
                     }
                     if (isWord) {
-                        return [2 /*return*/, new Word(docFile, renderOptions, parser)];
+                        return [2 /*return*/, new Word(buffer, renderOptions, parser)];
                     }
                     else if (isExcel) {
-                        excel = new Excel(docFile, fileName, renderOptions, parser);
+                        excel = new Excel(buffer, fileName, renderOptions, parser);
                         return [2 /*return*/, excel];
                     }
                     else {

package/esm/excel/render/dnd/handleMouseup.js

@@ -3,12 +3,13 @@ import { dragState, resetDragState } from './handleMousedown.js';
 
 function handleMouseup() {
     var _a, _b;
+    var wasDragging = dragState.isDragging;
     dragState.isDragging = false;
     removeEventListener();
-    if (dragState.dragType === 'col-grid') {
+    if (wasDragging && dragState.dragType === 'col-grid') {
         (_a = dragState.workbook) === null || _a === void 0 ? void 0 : _a.uiEvent.emit('DRAG_COL_GRID_LINE_END', dragState.col, dragState.tmpColWidth);
     }
-    if (dragState.dragType === 'row-grid') {
+    if (wasDragging && dragState.dragType === 'row-grid') {
         (_b = dragState.workbook) === null || _b === void 0 ? void 0 : _b.uiEvent.emit('DRAG_ROW_GRID_LINE_END', dragState.row, dragState.tmpRowHeight);
     }
     resetDragState();

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('../../../node_modules/echarts/index.js').then(function (echarts) {
+        import('echarts').then(function (echarts) {
             // @ts-ignore 奇怪为啥不对
             var chart = echarts.init(_this.drawingContainer);
             chart.setOption(option);

package/esm/excel/render/drawing/chart/buildLabel.d.ts

@@ -1,63 +1,2 @@
 import { CT_DLbls } from '../../../../openxml/ChartTypes';
-export declare function buildLabel(dLbls?: CT_DLbls): {
-    show?: boolean | undefined;
-    position?: string | any[] | undefined;
-    distance?: number | undefined;
-    rotate?: number | undefined;
-    offset?: any[] | undefined;
-    formatter?: string | Function | undefined;
-    color?: string | undefined;
-    fontStyle?: string | undefined;
-    fontWeight?: string | number | undefined;
-    fontFamily?: string | undefined;
-    fontSize?: number | undefined;
-    align?: string | undefined;
-    verticalAlign?: string | undefined;
-    lineHeight?: number | undefined;
-    backgroundColor?: string | object | undefined;
-    borderColor?: string | undefined;
-    borderWidth?: number | undefined;
-    borderRadius?: number | undefined;
-    padding?: number | any[] | undefined;
-    shadowColor?: string | undefined;
-    shadowBlur?: number | undefined;
-    shadowOffsetX?: number | undefined;
-    shadowOffsetY?: number | undefined;
-    width?: string | number | undefined;
-    height?: string | number | undefined;
-    textBorderColor?: string | undefined;
-    textBorderWidth?: number | undefined;
-    textShadowColor?: string | undefined;
-    textShadowBlur?: number | undefined;
-    textShadowOffsetX?: number | undefined;
-    textShadowOffsetY?: number | undefined;
-    rich?: {
-        [userStyle: string]: {
-            color?: string | undefined;
-            fontStyle?: string | undefined;
-            fontWeight?: string | number | undefined;
-            fontFamily?: string | undefined;
-            fontSize?: number | undefined;
-            align?: string | undefined;
-            verticalAlign?: string | undefined;
-            lineHeight?: number | undefined;
-            backgroundColor?: string | object | undefined;
-            borderColor?: string | undefined;
-            borderWidth?: number | undefined;
-            borderRadius?: number | undefined;
-            padding?: number | any[] | undefined;
-            shadowColor?: string | undefined;
-            shadowBlur?: number | undefined;
-            shadowOffsetX?: number | undefined;
-            shadowOffsetY?: number | undefined;
-            width?: string | number | undefined;
-            height?: string | number | undefined;
-            textBorderColor?: string | undefined;
-            textBorderWidth?: number | undefined;
-            textShadowColor?: string | undefined;
-            textShadowBlur?: number | undefined;
-            textShadowOffsetX?: number | undefined;
-            textShadowOffsetY?: number | undefined;
-        };
-    } | undefined;
-} | undefined;
+export declare function buildLabel(dLbls?: CT_DLbls): echarts.EChartOption.SeriesLine;

package/esm/excel/render/drawing/chart/convertLegend.d.ts

@@ -2,4 +2,4 @@ import { CT_Legend } from '../../../../openxml/ChartTypes';
 /**
  * 将 Excel chart 的图例转换为 Echarts 的图例
  */
-export declare function convertLegend(categories: string[], chartLegend?: CT_Legend): import("echarts").EChartOption.Legend;
+export declare function convertLegend(categories: string[], chartLegend?: CT_Legend): echarts.EChartOption.Legend;

package/esm/excel/render/drawing/chart/fromAreaChart.d.ts

@@ -7,68 +7,7 @@ export declare function fromAreaChart(workbook: Workbook, areaChart: CT_AreaChar
         type: string;
         stack: string | undefined;
         data: number[];
-        label: {
-            show?: boolean | undefined;
-            position?: string | any[] | undefined;
-            distance?: number | undefined;
-            rotate?: number | undefined;
-            offset?: any[] | undefined;
-            formatter?: string | Function | undefined;
-            color?: string | undefined;
-            fontStyle?: string | undefined;
-            fontWeight?: string | number | undefined;
-            fontFamily?: string | undefined;
-            fontSize?: number | undefined;
-            align?: string | undefined;
-            verticalAlign?: string | undefined;
-            lineHeight?: number | undefined;
-            backgroundColor?: string | object | undefined;
-            borderColor?: string | undefined;
-            borderWidth?: number | undefined;
-            borderRadius?: number | undefined;
-            padding?: number | any[] | undefined;
-            shadowColor?: string | undefined;
-            shadowBlur?: number | undefined;
-            shadowOffsetX?: number | undefined;
-            shadowOffsetY?: number | undefined;
-            width?: string | number | undefined;
-            height?: string | number | undefined;
-            textBorderColor?: string | undefined;
-            textBorderWidth?: number | undefined;
-            textShadowColor?: string | undefined;
-            textShadowBlur?: number | undefined;
-            textShadowOffsetX?: number | undefined;
-            textShadowOffsetY?: number | undefined;
-            rich?: {
-                [userStyle: string]: {
-                    color?: string | undefined;
-                    fontStyle?: string | undefined;
-                    fontWeight?: string | number | undefined;
-                    fontFamily?: string | undefined;
-                    fontSize?: number | undefined;
-                    align?: string | undefined;
-                    verticalAlign?: string | undefined;
-                    lineHeight?: number | undefined;
-                    backgroundColor?: string | object | undefined;
-                    borderColor?: string | undefined;
-                    borderWidth?: number | undefined;
-                    borderRadius?: number | undefined;
-                    padding?: number | any[] | undefined;
-                    shadowColor?: string | undefined;
-                    shadowBlur?: number | undefined;
-                    shadowOffsetX?: number | undefined;
-                    shadowOffsetY?: number | undefined;
-                    width?: string | number | undefined;
-                    height?: string | number | undefined;
-                    textBorderColor?: string | undefined;
-                    textBorderWidth?: number | undefined;
-                    textShadowColor?: string | undefined;
-                    textShadowBlur?: number | undefined;
-                    textShadowOffsetX?: number | undefined;
-                    textShadowOffsetY?: number | undefined;
-                };
-            } | undefined;
-        } | undefined;
+        label: echarts.EChartOption.SeriesLine;
         areaStyle: {};
     }[];
 };

package/esm/excel/render/drawing/chart/fromLineChart.d.ts

@@ -7,67 +7,6 @@ export declare function fromLineChart(workbook: Workbook, lineChart: CT_LineChar
         type: string;
         stack: string | undefined;
         data: number[];
-        label: {
-            show?: boolean | undefined;
-            position?: string | any[] | undefined;
-            distance?: number | undefined;
-            rotate?: number | undefined;
-            offset?: any[] | undefined;
-            formatter?: string | Function | undefined;
-            color?: string | undefined;
-            fontStyle?: string | undefined;
-            fontWeight?: string | number | undefined;
-            fontFamily?: string | undefined;
-            fontSize?: number | undefined;
-            align?: string | undefined;
-            verticalAlign?: string | undefined;
-            lineHeight?: number | undefined;
-            backgroundColor?: string | object | undefined;
-            borderColor?: string | undefined;
-            borderWidth?: number | undefined;
-            borderRadius?: number | undefined;
-            padding?: number | any[] | undefined;
-            shadowColor?: string | undefined;
-            shadowBlur?: number | undefined;
-            shadowOffsetX?: number | undefined;
-            shadowOffsetY?: number | undefined;
-            width?: string | number | undefined;
-            height?: string | number | undefined;
-            textBorderColor?: string | undefined;
-            textBorderWidth?: number | undefined;
-            textShadowColor?: string | undefined;
-            textShadowBlur?: number | undefined;
-            textShadowOffsetX?: number | undefined;
-            textShadowOffsetY?: number | undefined;
-            rich?: {
-                [userStyle: string]: {
-                    color?: string | undefined;
-                    fontStyle?: string | undefined;
-                    fontWeight?: string | number | undefined;
-                    fontFamily?: string | undefined;
-                    fontSize?: number | undefined;
-                    align?: string | undefined;
-                    verticalAlign?: string | undefined;
-                    lineHeight?: number | undefined;
-                    backgroundColor?: string | object | undefined;
-                    borderColor?: string | undefined;
-                    borderWidth?: number | undefined;
-                    borderRadius?: number | undefined;
-                    padding?: number | any[] | undefined;
-                    shadowColor?: string | undefined;
-                    shadowBlur?: number | undefined;
-                    shadowOffsetX?: number | undefined;
-                    shadowOffsetY?: number | undefined;
-                    width?: string | number | undefined;
-                    height?: string | number | undefined;
-                    textBorderColor?: string | undefined;
-                    textBorderWidth?: number | undefined;
-                    textShadowColor?: string | undefined;
-                    textShadowBlur?: number | undefined;
-                    textShadowOffsetX?: number | undefined;
-                    textShadowOffsetY?: number | undefined;
-                };
-            } | undefined;
-        } | undefined;
+        label: echarts.EChartOption.SeriesLine;
     }[];
 };