@corbe30/fortune-excel 1.2.3 → 1.2.5

package/.github/workflows/publish.yml

@@ -21,10 +21,10 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - run: npm run build-storybook
-      - uses: actions/upload-pages-artifact@v2
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: storybook-static
       - id: deploy
-        uses: actions/deploy-pages@v3
+        uses: actions/deploy-pages@v4
         with:
           token: ${{ github.token }}

package/README.md

@@ -56,6 +56,16 @@ Developers of [FortuneSheetExcel](https://github.com/zenmrp/FortuneSheetExcel):
 - [@xxxDeveloper](https://github.com/xxxDeveloper)
 - [@mengshukeji](https://github.com/mengshukeji)
 
+Export support:
+- [Orleans9](https://blog.csdn.net/zinchliang) - [article](https://blog.csdn.net/zinchliang/article/details/120262185)
+
+## Contribution
+1. node v20.17.0
+2. Use npm and not yarn
+3. npm run prepare
+4. npm run build-storybook
+5. npm run storybook
+
 ## License
 
 [MIT](http://opensource.org/licenses/MIT)

package/dist/ToExcel/ExcelFile.js

@@ -79,14 +79,12 @@ function exportSheetExcel(luckysheetRef) {
                 case 0:
                     luckysheet = luckysheetRef.getAllSheets();
                     workbook = new exceljs_1.default.Workbook();
-                    // 2.创建表格，第二个参数可以配置创建什么样的工作表
                     luckysheet.every(function (table) {
                         var _a, _b;
                         if (((_a = table === null || table === void 0 ? void 0 : table.data) === null || _a === void 0 ? void 0 : _a.length) === 0)
                             return true;
                         var worksheet = workbook.addWorksheet(table.name);
-                        // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
-                        (0, ExcelStyle_1.setStyleAndValue)(luckysheetRef, table, worksheet);
+                        (0, ExcelStyle_1.setStyleAndValue)(table, worksheet);
                         (0, method_1.setMerge)((_b = table === null || table === void 0 ? void 0 : table.config) === null || _b === void 0 ? void 0 : _b.merge, worksheet);
                         (0, ExcelBorder_1.setBorder)(table, worksheet);
                         (0, ExcelImage_1.setImages)(table, worksheet, workbook);
@@ -98,7 +96,6 @@ function exportSheetExcel(luckysheetRef) {
                 case 1:
                     buffer = _a.sent();
                     fileData = new Blob([buffer]);
-                    // 5.保存为文件
                     fileSaver.saveAs(fileData, "".concat(luckysheetRef.getSheet().name, ".xlsx"));
                     return [2 /*return*/];
             }

package/dist/ToExcel/ExcelStyle.d.ts

@@ -1,3 +1,3 @@
 import ExcelJS from "exceljs";
-declare var setStyleAndValue: (luckysheet: any, table: any, worksheet: ExcelJS.Worksheet) => void;
+declare var setStyleAndValue: (table: any, worksheet: ExcelJS.Worksheet) => void;
 export { setStyleAndValue };

package/dist/ToExcel/ExcelStyle.js

@@ -13,31 +13,36 @@ var formatHyperlink = function (address) {
     var sheetCell = address.split("!");
     return "#'".concat(sheetCell[0], "'!").concat(sheetCell[1] || "A1");
 };
-var setStyleAndValue = function (luckysheet, table, worksheet) {
+var setStyleAndValue = function (table, worksheet) {
     var cellArr = table === null || table === void 0 ? void 0 : table.data;
     if (!Array.isArray(cellArr))
         return;
     cellArr.forEach(function (row, rowid) {
+        var _a, _b;
         var dbrow = worksheet.getRow(rowid + 1);
-        //设置单元格行高,默认乘以1.2倍
-        dbrow.height = luckysheet.getRowHeight([rowid])[rowid] / 1.2;
+        dbrow.height = (((_b = (_a = table.config) === null || _a === void 0 ? void 0 : _a.rowlen) === null || _b === void 0 ? void 0 : _b[rowid]) || 19) / 1.2;
         row.every(function (cell, columnid) {
-            var _a;
-            if (!cell || lodash_1.default.isNil(cell.v) || lodash_1.default.isNaN(cell.v))
-                return true;
+            var _a, _b, _c, _d;
             if (rowid == 0) {
                 var dobCol = worksheet.getColumn(columnid + 1);
-                //设置单元格列宽除以8
-                dobCol.width = luckysheet.getColumnWidth([columnid])[columnid] / 8;
+                dobCol.width = (((_b = (_a = table.config) === null || _a === void 0 ? void 0 : _a.columnlen) === null || _b === void 0 ? void 0 : _b[columnid]) || 73) / 8;
             }
+            if (!cell)
+                return true;
             var fill = (0, ExcelConvert_1.fillConvert)(cell.bg);
             var font = (0, ExcelConvert_1.fontConvert)(cell.ff, cell.fc, cell.bl, cell.it, cell.fs, cell.cl, cell.un);
             var alignment = (0, ExcelConvert_1.alignmentConvert)(cell.vt, cell.ht, cell.tb && parseInt(cell.tb, 10), cell.tr && parseInt(cell.tr, 10));
+            var target = worksheet.getCell(rowid + 1, columnid + 1);
+            target.fill = fill;
+            target.font = font;
+            target.alignment = alignment;
+            if ((lodash_1.default.isNil(cell.v) || lodash_1.default.isNaN(cell.v)) && ((_c = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _c === void 0 ? void 0 : _c.t) !== "inlineStr")
+                return true;
             var value;
             var v = "";
             var numFmt = undefined;
             if (cell.hl) {
-                var hlData = (_a = table.hyperlink) === null || _a === void 0 ? void 0 : _a["".concat(cell.hl.r, "_").concat(cell.hl.c)];
+                var hlData = (_d = table.hyperlink) === null || _d === void 0 ? void 0 : _d["".concat(cell.hl.r, "_").concat(cell.hl.c)];
                 if ((hlData === null || hlData === void 0 ? void 0 : hlData.linkType) === "webpage") {
                     v = {
                         text: cell.v,
@@ -79,10 +84,6 @@ var setStyleAndValue = function (luckysheet, table, worksheet) {
             else {
                 value = v;
             }
-            var target = worksheet.getCell(rowid + 1, columnid + 1);
-            target.fill = fill;
-            target.font = font;
-            target.alignment = alignment;
             target.value = value;
             target.numFmt = numFmt;
             return true;

package/dist/common/Transform.js

@@ -41,29 +41,28 @@ var FortuneFile_1 = require("../ToFortuneSheet/FortuneFile");
 var HandleZip_1 = require("../ToFortuneSheet/HandleZip");
 var ExcelFile_1 = require("../ToExcel/ExcelFile");
 var transformExcelToFortune = function (e, setSheets, setKey, sheetRef) { return __awaiter(void 0, void 0, void 0, function () {
-    var excelFile, files, fortuneFile, lsh, config, _i, _a, sheet;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var excelFile, files, fortuneFile, lsh;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0: return [4 /*yield*/, e.target.files[0].arrayBuffer()];
             case 1:
-                excelFile = _b.sent();
+                excelFile = _a.sent();
                 return [4 /*yield*/, new HandleZip_1.HandleZip(excelFile).unzipFile()];
             case 2:
-                files = _b.sent();
+                files = _a.sent();
                 fortuneFile = new FortuneFile_1.FortuneFile(files, excelFile.name);
                 fortuneFile.Parse();
                 lsh = fortuneFile.serialize();
-                config = lsh.sheets[0].config;
-                for (_i = 0, _a = lsh.sheets; _i < _a.length; _i++) {
-                    sheet = _a[_i];
-                    delete sheet.config;
-                }
                 setSheets(lsh.sheets);
                 setKey(function (k) { return k + 1; });
                 setTimeout(function () {
                     var _a, _b;
-                    (_a = sheetRef.current) === null || _a === void 0 ? void 0 : _a.setColumnWidth((config === null || config === void 0 ? void 0 : config.columnlen) || {});
-                    (_b = sheetRef.current) === null || _b === void 0 ? void 0 : _b.setRowHeight((config === null || config === void 0 ? void 0 : config.rowlen) || {});
+                    for (var _i = 0, _c = lsh.sheets; _i < _c.length; _i++) {
+                        var sheet = _c[_i];
+                        var config = sheet.config;
+                        (_a = sheetRef.current) === null || _a === void 0 ? void 0 : _a.setColumnWidth((config === null || config === void 0 ? void 0 : config.columnlen) || {}, { id: sheet.id });
+                        (_b = sheetRef.current) === null || _b === void 0 ? void 0 : _b.setRowHeight((config === null || config === void 0 ? void 0 : config.rowlen) || {}, { id: sheet.id });
+                    }
                 }, 1);
                 return [2 /*return*/];
         }

package/package.json

@@ -3,7 +3,7 @@
   "workspaces": [
     "src/*"
   ],
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "An Excel import/export import library for FortuneSheet",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",