@corbe30/fortune-excel 2.2.4 → 2.2.6

package/README.md

@@ -7,29 +7,33 @@
 <div align="center">
 
 <p>
-<a href="http://npmjs.com/package/@corbe30/fortune-excel" alt="fortuneExcel on npm">
-<img src="https://img.shields.io/npm/v/@corbe30/fortune-excel" /></a> <a href="http://npmjs.com/package/@corbe30/fortune-excel" alt="fortuneExcel downloads">
-<img src="https://img.shields.io/npm/d18m/%40corbe30%2Ffortune-excel" /></a>
+  <a href="http://npmjs.com/package/@corbe30/fortune-excel" alt="fortuneExcel on npm">
+    <img src="https://img.shields.io/npm/v/@corbe30/fortune-excel" />
+  </a> 
+  <a href="http://npmjs.com/package/@corbe30/fortune-excel" alt="fortuneExcel downloads">
+    <img src="https://img.shields.io/npm/d18m/%40corbe30%2Ffortune-excel" />
+  </a>
+  <a href="https://corbe30.github.io/FortuneExcel/" alt="fortuneExcel storybok">
+    <img src="https://img.shields.io/badge/storybook-FF4785" />
+  </a>
 </p>
 
 </div>
 
 ## Usage
 
-You can check the example in [Storybook](https://github.com/Corbe30/FortuneExcel/blob/main/src/stories/Page.tsx).
-
 1. Install the package:
     ```js
     npm i @corbe30/fortune-excel
     ```
 
-2. Add import/export toolbar item in fortune-sheet
-    > `<FortuneExcelHelper />` is a hidden component.
+2. Import/export toolbar item ([code example](https://github.com/Corbe30/FortuneExcel/tree/main/src/stories/Plugin.tsx))
+    > Note: `<FortuneExcelHelper />` is a hidden component.
     ```js
     import { FortuneExcelHelper, importToolBarItem, exportToolBarItem } from "@corbe30/fortune-excel";
 
     function App() {
-      const workbookRef = useRef();
+      const sheetRef = useRef();
       const [key, setKey] = useState(0);
       const [sheets, setSheets] = useState(data);
 
@@ -39,13 +43,13 @@ You can check the example in [Storybook](https://github.com/Corbe30/FortuneExcel
             setKey={setKey}
             setSheets={setSheets}
             sheetRef={sheetRef}
-            config={{ // this is the default config object
+            config={{ // default = all values are true
               import: { xlsx: true, csv: true },
               export: { xlsx: true, csv: true },
             }}
           />
           <Workbook
-            key={key} data={sheets} ref={workbookRef}
+            key={key} data={sheets} ref={sheetRef}
             customToolbarItems={[importToolBarItem(), exportToolBarItem()]}
           />
         </>
@@ -53,7 +57,7 @@ You can check the example in [Storybook](https://github.com/Corbe30/FortuneExcel
     }
     ```
 
-3. You can programmatically import/export as well:
+3. Programmatic import/export ([code example](https://github.com/Corbe30/FortuneExcel/tree/main/src/stories/Manual.tsx))
     ```js
     import { transformFortuneToExcel } from "@corbe30/fortune-excel";
 
@@ -61,12 +65,24 @@ You can check the example in [Storybook](https://github.com/Corbe30/FortuneExcel
       const exportedFile = await transformFortuneToExcel(
         sheetRef.current,
         "xlsx", // or "csv"; default = "xlsx"
-        true // if you want to start automatic download; default = true
+        true // start automatic download; default = true
       );
       console.log("Exported file data:", exportedFile);
     };
 
-    <button onClick={manualExport}>Try Manual Export!</button>
+    <button onClick={manualExport}>Export</button>
+    ```
+    ```js
+    import { transformExcelToFortune } from "@corbe30/fortune-excel";
+     
+    const manualImport = async (event) => {
+      await transformExcelToFortune(
+        event.target.files[0], // file type (csv/xlsx) is automatically identified
+        setSheets,
+        setKey,
+        sheetRef.current
+      )
+    }
     ```
 
 ## Authors and acknowledgment

package/dist/ToFortuneSheet/FortuneImage.js

@@ -20,6 +20,7 @@ var FortuneBase_1 = require("./FortuneBase");
 var emf_1 = require("../common/emf");
 var ImageList = /** @class */ (function () {
     function ImageList(files) {
+        var _a;
         if (files == null) {
             return;
         }
@@ -28,7 +29,7 @@ var ImageList = /** @class */ (function () {
             // let reg = new RegExp("xl/media/image1.png", "g");
             if (fileKey.indexOf("xl/media/") > -1) {
                 var fileNameArr = fileKey.split(".");
-                var suffix = fileNameArr[fileNameArr.length - 1].toLowerCase();
+                var suffix = (_a = fileNameArr[fileNameArr.length - 1]) === null || _a === void 0 ? void 0 : _a.toLowerCase();
                 if (suffix in
                     { png: 1, jpeg: 1, jpg: 1, gif: 1, bmp: 1, tif: 1, webp: 1, emf: 1 }) {
                     if (suffix == "emf") {

package/dist/ToFortuneSheet/HandleZip.js

@@ -46,22 +46,23 @@ var HandleZip = /** @class */ (function () {
         this.uploadFile = file;
     }
     HandleZip.prototype.unzipFile = function () {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var zip, fileList, _i, _a, _b, _path, zipEntry, fileName, fileNameArr, suffix, fileType, data;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var zip, fileList, _i, _b, _c, _path, zipEntry, fileName, fileNameArr, suffix, fileType, data;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, jszip_1.default.loadAsync(this.uploadFile)];
                     case 1:
-                        zip = _c.sent();
+                        zip = _d.sent();
                         fileList = {};
-                        _i = 0, _a = Object.entries(zip.files);
-                        _c.label = 2;
+                        _i = 0, _b = Object.entries(zip.files);
+                        _d.label = 2;
                     case 2:
-                        if (!(_i < _a.length)) return [3 /*break*/, 5];
-                        _b = _a[_i], _path = _b[0], zipEntry = _b[1];
+                        if (!(_i < _b.length)) return [3 /*break*/, 5];
+                        _c = _b[_i], _path = _c[0], zipEntry = _c[1];
                         fileName = zipEntry.name;
                         fileNameArr = fileName.split(".");
-                        suffix = fileNameArr[fileNameArr.length - 1].toLowerCase();
+                        suffix = (_a = fileNameArr[fileNameArr.length - 1]) === null || _a === void 0 ? void 0 : _a.toLowerCase();
                         fileType = "string";
                         if (suffix in
                             {
@@ -80,12 +81,12 @@ var HandleZip = /** @class */ (function () {
                         }
                         return [4 /*yield*/, zipEntry.async(fileType)];
                     case 3:
-                        data = _c.sent();
+                        data = _d.sent();
                         if (fileType == "base64") {
                             data = "data:image/" + suffix + ";base64," + data;
                         }
                         fileList[zipEntry.name] = data; // XXX: ignore EMF ArrayBuffer :/
-                        _c.label = 4;
+                        _d.label = 4;
                     case 4:
                         _i++;
                         return [3 /*break*/, 2];

package/dist/ToFortuneSheet/ImportHelper.js

@@ -46,11 +46,12 @@ var ImportHelper = function (props) {
     var setSheets = props.setSheets, setKey = props.setKey, sheetRef = props.sheetRef, config = props.config;
     var acceptTypes = "".concat(config.xlsx ? ".xlsx," : "").concat(config.csv ? ".csv" : "");
     return (react_1.default.createElement("input", { type: "file", id: "ImportHelper", accept: acceptTypes, 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*/, (0, Transform_1.transformExcelToFortune)(e, setSheets, setKey, sheetRef)];
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, (0, Transform_1.transformExcelToFortune)((_b = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0], setSheets, setKey, sheetRef.current)];
                     case 1:
-                        _a.sent();
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });

package/dist/common/Transform.d.ts

@@ -1,3 +1,3 @@
 import { IFileType } from "./ICommon";
-export declare const transformExcelToFortune: (e: any, setSheets: any, setKey: any, sheetRef: any) => Promise<void>;
+export declare const transformExcelToFortune: (file: any, setSheets: any, setKey: any, sheetRef: any) => Promise<void>;
 export declare const transformFortuneToExcel: (luckysheetRef: any, fileType?: IFileType, download?: boolean) => Promise<Blob>;

package/dist/common/Transform.js

@@ -85,40 +85,39 @@ var convertCsvToExcel = function (file) { return __awaiter(void 0, void 0, void
         }
     });
 }); };
-var transformExcelToFortune = function (e, setSheets, setKey, sheetRef) { return __awaiter(void 0, void 0, void 0, function () {
-    var file, excelFile, fileName, files, fortuneFile, lsh;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+var transformExcelToFortune = function (file, setSheets, setKey, sheetRef) { return __awaiter(void 0, void 0, void 0, function () {
+    var excelFile, fileName, files, fortuneFile, lsh;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                file = e.target.files[0];
                 fileName = file.name;
-                if (!(file.type === 'text/csv' || file.name.toLowerCase().endsWith('.csv'))) return [3 /*break*/, 2];
+                if (!(file.type === 'text/csv' || ((_b = (_a = file === null || file === void 0 ? void 0 : file.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.endsWith('.csv')))) return [3 /*break*/, 2];
                 return [4 /*yield*/, convertCsvToExcel(file)];
             case 1:
                 // convert CSV to xlsx
-                excelFile = _a.sent();
+                excelFile = _c.sent();
                 fileName = file.name.replace(/\.csv$/i, '.xlsx');
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, file.arrayBuffer()];
             case 3:
                 // process as excel file
-                excelFile = _a.sent();
-                _a.label = 4;
+                excelFile = _c.sent();
+                _c.label = 4;
             case 4: return [4 /*yield*/, new HandleZip_1.HandleZip(new File([excelFile], fileName)).unzipFile()];
             case 5:
-                files = _a.sent();
+                files = _c.sent();
                 fortuneFile = new FortuneFile_1.FortuneFile(files, fileName);
                 fortuneFile.Parse();
                 lsh = fortuneFile.serialize();
                 setSheets(lsh.sheets);
                 setKey(function (k) { return k + 1; });
                 setTimeout(function () {
-                    var _a, _b;
-                    for (var _i = 0, _c = lsh.sheets; _i < _c.length; _i++) {
-                        var sheet = _c[_i];
+                    for (var _i = 0, _a = lsh.sheets; _i < _a.length; _i++) {
+                        var sheet = _a[_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 });
+                        sheetRef.setColumnWidth((config === null || config === void 0 ? void 0 : config.columnlen) || {}, { id: sheet.id });
+                        sheetRef.setRowHeight((config === null || config === void 0 ? void 0 : config.rowlen) || {}, { id: sheet.id });
                     }
                 }, 1);
                 return [2 /*return*/];

package/dist/common/emf.js

@@ -1222,7 +1222,7 @@ exports.ToContext2D.prototype._setStyle = function (gst, ctx) {
         dsh[i] = _flt(dsh[i] * scl);
     ctx.setLineDash(dsh);
     ctx.miterLimit = gst.mlimit * scl;
-    var fn = gst.font.Tf, ln = fn.toLowerCase();
+    var fn = gst.font.Tf, ln = (fn === null || fn === void 0 ? void 0 : fn.toLowerCase()) || "";
     var p0 = ln.indexOf("bold") != -1 ? "bold " : "";
     var p1 = ln.indexOf("italic") != -1 || ln.indexOf("oblique") != -1 ? "italic " : "";
     ctx.font = p0 + p1 + gst.font.Tfs + 'px "' + fn + '"';

package/dist/common/method.js

@@ -249,30 +249,8 @@ function rgbToHex(rgb) {
     }
     return rgb;
 }
-function hexToRgb(hex) {
-    var sColor = hex.toLowerCase();
-    //十六进制颜色值的正则表达式
-    var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
-    // 如果是16进制颜色
-    if (sColor && reg.test(sColor)) {
-        if (sColor.length === 4) {
-            var sColorNew = "#";
-            for (var i = 1; i < 4; i += 1) {
-                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
-            }
-            sColor = sColorNew;
-        }
-        //处理六位的颜色值
-        var sColorChange = [];
-        for (var i = 1; i < 7; i += 2) {
-            sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
-        }
-        return "RGB(" + sColorChange.join(",") + ")";
-    }
-    return sColor;
-}
 function hexToRgbArray(hex) {
-    var sColor = hex.toLowerCase();
+    var sColor = hex === null || hex === void 0 ? void 0 : hex.toLowerCase();
     //十六进制颜色值的正则表达式
     var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
     // 如果是16进制颜色

package/package.json

@@ -3,7 +3,7 @@
   "workspaces": [
     "src/*"
   ],
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "An Excel import/export import library for FortuneSheet",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -49,5 +49,6 @@
     "prepare": "tsc",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }