@corbe30/fortune-excel 1.0.6 → 1.0.7

package/README.md

@@ -32,7 +32,7 @@ function App() {
 
   return (
     <>
-      <ImportHelper setKey={setKey} setSheets={setSheets} sheetRef={workbookRef1} />
+      <ImportHelper setKey={setKey} setSheets={setSheets} sheetRef={workbookRef} />
       <Workbook
         key={key}
         data={sheets}

package/dist/ImportHelper.js

@@ -38,7 +38,7 @@ import React from "react";
 import { transformExcelToFortune } from "./Transform.js";
 export var ImportHelper = function (props) {
     var setSheets = props.setSheets, setKey = props.setKey, sheetRef = props.sheetRef;
-    return (React.createElement("input", { type: "file", id: "ImportHelper", onChange: function (e) { return __awaiter(void 0, void 0, void 0, function () {
+    return (React.createElement("input", { type: "file", id: "ImportHelper", accept: ".xlsx", onChange: function (e) { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, transformExcelToFortune(e, setSheets, setKey, sheetRef)];

package/dist/ToExcel/ExcelFile.js

@@ -55,7 +55,7 @@ export function exportSheetExcel(luckysheetRef) {
                             return true;
                         var worksheet = workbook.addWorksheet(table.name);
                         // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
-                        setStyleAndValue(luckysheetRef, table.data, worksheet);
+                        setStyleAndValue(luckysheetRef, table, worksheet);
                         setMerge((_b = table === null || table === void 0 ? void 0 : table.config) === null || _b === void 0 ? void 0 : _b.merge, worksheet);
                         setBorder(table, worksheet);
                         setImages(table, worksheet, workbook);
@@ -66,7 +66,7 @@ export function exportSheetExcel(luckysheetRef) {
                     buffer = _a.sent();
                     fileData = new Blob([buffer]);
                     // 5.保存为文件
-                    fileSaver.saveAs(fileData, "abc.xlsx");
+                    fileSaver.saveAs(fileData, "".concat(luckysheetRef.getSheet().name, ".xlsx"));
                     return [2 /*return*/];
             }
         });

package/dist/ToExcel/ExcelImage.js

@@ -39,6 +39,7 @@ var getImagePosition = function (num, arr) {
     return radio;
 };
 var setImages = function (table, worksheet, workbook) {
+    var _a, _b, _c, _d;
     var localTable = __assign({}, table);
     var images = localTable.images, visibledatacolumn = localTable.visibledatacolumn, //所有行的位置
     visibledatarow = localTable.visibledatarow;
@@ -53,12 +54,34 @@ var setImages = function (table, worksheet, workbook) {
             base64: myBase64Image,
             extension: "png",
         });
-        var col_st = getImagePosition(item.default.left, visibledatacolumn);
-        var row_st = getImagePosition(item.default.top, visibledatarow);
+        if (!visibledatacolumn || !visibledatarow) {
+            var defaultColWidth = localTable.defaultColWidth || 73;
+            var defaultRowHeight = localTable.defaultRowHeight || 19;
+            var rowCount = localTable.data.length;
+            var colCount = localTable.data[0].length;
+            visibledatacolumn = [];
+            visibledatarow = [];
+            var lastVal = 0;
+            for (var i = 0; i < rowCount; i++) {
+                var rowHeight = (((_b = (_a = localTable.config) === null || _a === void 0 ? void 0 : _a.rowlen) === null || _b === void 0 ? void 0 : _b[i]) || defaultRowHeight);
+                var rowPosition = lastVal + rowHeight;
+                visibledatarow.push(rowPosition);
+                lastVal = rowPosition;
+            }
+            lastVal = 0;
+            for (var i = 0; i < colCount; i++) {
+                var colWidth = (((_d = (_c = localTable.config) === null || _c === void 0 ? void 0 : _c.columnlen) === null || _d === void 0 ? void 0 : _d[i]) || defaultColWidth);
+                var colPosition = lastVal + colWidth;
+                visibledatacolumn.push(colPosition);
+                lastVal = colPosition;
+            }
+        }
+        var col_st = getImagePosition(item.left, visibledatacolumn);
+        var row_st = getImagePosition(item.top, visibledatarow);
         //模式1，图片左侧与luckysheet位置一样，像素比例保持不变，但是，右侧位置可能与原图所在单元格不一致
         worksheet.addImage(imageId, {
             tl: { col: col_st, row: row_st },
-            ext: { width: item.default.width, height: item.default.height },
+            ext: { width: item.width, height: item.height },
         });
         //模式2,图片四个角位置没有变动，但是图片像素比例可能和原图不一样
         // const w_ed = item.default.left+item.default.width;

package/dist/ToExcel/ExcelStyle.d.ts

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

package/dist/ToExcel/ExcelStyle.js

@@ -1,5 +1,13 @@
 import { fillConvert, fontConvert, alignmentConvert } from "./ExcelConvert.js";
-var setStyleAndValue = function (luckysheet, cellArr, worksheet) {
+var isTime = function (d) {
+    return d === "hh:mm";
+};
+var formatHyperlink = function (address) {
+    var sheetCell = address.split("!");
+    return "#'".concat(sheetCell[0], "'!").concat(sheetCell[1] || "A1");
+};
+var setStyleAndValue = function (luckysheet, table, worksheet) {
+    var cellArr = table === null || table === void 0 ? void 0 : table.data;
     if (!Array.isArray(cellArr))
         return;
     cellArr.forEach(function (row, rowid) {
@@ -7,6 +15,7 @@ var setStyleAndValue = function (luckysheet, cellArr, worksheet) {
         //设置单元格行高,默认乘以1.2倍
         dbrow.height = luckysheet.getRowHeight([rowid])[rowid] / 1.2;
         row.every(function (cell, columnid) {
+            var _a;
             if (!cell)
                 return true;
             if (rowid == 0) {
@@ -19,8 +28,23 @@ var setStyleAndValue = function (luckysheet, cellArr, worksheet) {
             var alignment = alignmentConvert(cell.vt, cell.ht, cell.tb && parseInt(cell.tb, 10), cell.tr && parseInt(cell.tr, 10));
             var value;
             var v = "";
-            // TODO: check and add support for currency, boolean, date format
-            if (cell.ct && cell.ct.t == "inlineStr") {
+            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)];
+                if ((hlData === null || hlData === void 0 ? void 0 : hlData.linkType) === "webpage") {
+                    v = {
+                        text: cell.v,
+                        hyperlink: hlData === null || hlData === void 0 ? void 0 : hlData.linkAddress,
+                        tooltip: cell.v,
+                    };
+                }
+                // will not work in Google Sheets but will work in excel (open issue in exceljs)
+                else if (hlData.linkType === "cellrange" ||
+                    hlData.linkType === "sheet") {
+                    v = { text: cell.v, hyperlink: formatHyperlink(hlData === null || hlData === void 0 ? void 0 : hlData.linkAddress) };
+                }
+            }
+            else if (cell.ct && cell.ct.t == "inlineStr") {
                 var s = cell.ct.s;
                 s.forEach(function (val, num) {
                     v += val.v;
@@ -28,11 +52,18 @@ var setStyleAndValue = function (luckysheet, cellArr, worksheet) {
             }
             else if (cell.ct && cell.ct.t == "n") {
                 v = +cell.v;
+                if (cell.ct !== "General")
+                    numFmt = cell.ct.fa;
+            }
+            else if (cell.ct.t == "d") {
+                var mockDate = isTime(cell.ct.fa) ? "2000-01-01 " : "";
+                v = new Date(mockDate + cell.m);
+                numFmt = cell.ct.fa;
             }
             else {
                 v = cell.v;
             }
-            if (cell.f) {
+            if (cell.f && typeof v !== "object") {
                 value = {
                     formula: cell.f.startsWith("=") ? cell.f.slice(1) : cell.f,
                     result: v,
@@ -46,6 +77,7 @@ var setStyleAndValue = function (luckysheet, cellArr, worksheet) {
             target.font = font;
             target.alignment = alignment;
             target.value = value;
+            target.numFmt = numFmt;
             return true;
         });
     });

package/dist/ToolbarItem.js

@@ -40,7 +40,7 @@ import { transformFortuneToExcel } from "./Transform.js";
 export var exportToolBarItem = function (sheetRef) {
     return {
         key: "export",
-        tooltip: "export .xlsl",
+        tooltip: "Export .xlsx",
         icon: ExportIcon(),
         onClick: function (e) { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -57,7 +57,7 @@ export var exportToolBarItem = function (sheetRef) {
 export var importToolBarItem = function () {
     return {
         key: "import",
-        tooltip: "import .xlsl",
+        tooltip: "Import .xlsx",
         icon: ImportIcon(),
         onClick: function (e) {
             var _a;

package/dist/icons/ExportIcon.js

@@ -1,7 +1,7 @@
 import React from "react";
 function ExportIcon() {
     return React.createElement("svg", { width: "24", height: "24", fill: "none" },
-        React.createElement("path", { d: "M12 14L11.6464 14.3536L12 14.7071L12.3536 14.3536L12 14ZM12.5 5C12.5 4.72386 12.2761 4.5 12 4.5C11.7239 4.5 11.5 4.72386 11.5 5L12.5 5ZM6.64645 9.35355L11.6464 14.3536L12.3536 13.6464L7.35355 8.64645L6.64645 9.35355ZM12.3536 14.3536L17.3536 9.35355L16.6464 8.64645L11.6464 13.6464L12.3536 14.3536ZM12.5 14L12.5 5L11.5 5L11.5 14L12.5 14Z", fill: "#525C6F", "stroke-width": "0.35", stroke: "#525C6F" }),
-        React.createElement("path", { d: "M5 16L5 17C5 18.1046 5.89543 19 7 19L17 19C18.1046 19 19 18.1046 19 17V16", stroke: "#525C6F", "stroke-width": "1.25" }));
+        React.createElement("path", { d: "M12 14L11.6464 14.3536L12 14.7071L12.3536 14.3536L12 14ZM12.5 5C12.5 4.72386 12.2761 4.5 12 4.5C11.7239 4.5 11.5 4.72386 11.5 5L12.5 5ZM6.64645 9.35355L11.6464 14.3536L12.3536 13.6464L7.35355 8.64645L6.64645 9.35355ZM12.3536 14.3536L17.3536 9.35355L16.6464 8.64645L11.6464 13.6464L12.3536 14.3536ZM12.5 14L12.5 5L11.5 5L11.5 14L12.5 14Z", fill: "#525C6F", strokeWidth: "0.35", stroke: "#525C6F" }),
+        React.createElement("path", { d: "M5 16L5 17C5 18.1046 5.89543 19 7 19L17 19C18.1046 19 19 18.1046 19 17V16", stroke: "#525C6F", strokeWidth: "1.25" }));
 }
 export default ExportIcon;

package/dist/icons/ImportIcon.js

@@ -1,7 +1,7 @@
 import React from "react";
 function ImportIcon() {
     return React.createElement("svg", { width: "24", height: "24", fill: "none" },
-        React.createElement("path", { d: "M12 5L11.6464 4.64645L12 4.29289L12.3536 4.64645L12 5ZM12.5 14C12.5 14.2761 12.2761 14.5 12 14.5C11.7239 14.5 11.5 14.2761 11.5 14L12.5 14ZM6.64645 9.64645L11.6464 4.64645L12.3536 5.35355L7.35355 10.3536L6.64645 9.64645ZM12.3536 4.64645L17.3536 9.64645L16.6464 10.3536L11.6464 5.35355L12.3536 4.64645ZM12.5 5L12.5 14L11.5 14L11.5 5L12.5 5Z", fill: "#525C6F", stroke: "#525C6F", "stroke-width": "0.35" }),
-        React.createElement("path", { d: "M5 16L5 17C5 18.1046 5.89543 19 7 19L17 19C18.1046 19 19 18.1046 19 17V16", stroke: "#525C6F", "stroke-width": "1.25" }));
+        React.createElement("path", { d: "M12 5L11.6464 4.64645L12 4.29289L12.3536 4.64645L12 5ZM12.5 14C12.5 14.2761 12.2761 14.5 12 14.5C11.7239 14.5 11.5 14.2761 11.5 14L12.5 14ZM6.64645 9.64645L11.6464 4.64645L12.3536 5.35355L7.35355 10.3536L6.64645 9.64645ZM12.3536 4.64645L17.3536 9.64645L16.6464 10.3536L11.6464 5.35355L12.3536 4.64645ZM12.5 5L12.5 14L11.5 14L11.5 5L12.5 5Z", fill: "#525C6F", stroke: "#525C6F", strokeWidth: "0.35" }),
+        React.createElement("path", { d: "M5 16L5 17C5 18.1046 5.89543 19 7 19L17 19C18.1046 19 19 18.1046 19 17V16", stroke: "#525C6F", strokeWidth: "1.25" }));
 }
 export default ImportIcon;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corbe30/fortune-excel",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "An Excel import/export import library for FortuneSheet",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -11,7 +11,7 @@
     "excel"
   ],
   "author": "shashankc1705@gmail.com",
-  "homepage": "https://github.com/Corbe30/FortuneExcel",
+  "homepage": "https://corbe30.github.io/FortuneExcel",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Corbe30/FortuneExcel.git"