@corbe30/fortune-excel 2.2.3 → 2.2.5

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={{
+            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/FortuneBase.d.ts

@@ -59,7 +59,7 @@ export declare class FortuneSheetCelldataValue implements IfortuneSheetCelldataV
     ht: number | undefined;
     mc: IfortuneSheetCelldataValueMerge | undefined;
     tr: number | undefined;
-    tb: number | undefined;
+    tb: string | undefined;
     v: string | undefined;
     m: string | undefined;
     f: string | undefined;

package/dist/ToFortuneSheet/FortuneCell.js

@@ -344,14 +344,14 @@ var FortuneSheetCelldata = /** @class */ (function (_super) {
             }
             if (wrapText != undefined) {
                 if (wrapText == "1") {
-                    cellValue.tb = 2;
+                    cellValue.tb = "2";
                 }
                 else {
-                    cellValue.tb = 1;
+                    cellValue.tb = "1";
                 }
             }
             else {
-                cellValue.tb = 1;
+                cellValue.tb = "1";
             }
             if (textRotation != undefined) {
                 // tr: number | undefined //Text rotation,0: 0、1: 45 、2: -45、3 Vertical text、4: 90 、5: -90, alignment
@@ -438,7 +438,7 @@ var FortuneSheetCelldata = /** @class */ (function (_super) {
             }
         }
         else {
-            cellValue.tb = 1;
+            cellValue.tb = "1";
         }
         if (v != null) {
             var value = v[0].value;

package/dist/ToFortuneSheet/FortuneFile.js

@@ -397,6 +397,22 @@ var FortuneFile = /** @class */ (function () {
                             if (v.mc.r !== r || v.mc.c !== c)
                                 v = { mc: v.mc };
                         }
+                        else {
+                            for (var key in sheet.config.merge) {
+                                if (sheet.config.merge.hasOwnProperty(key)) {
+                                    var range = sheet.config.merge[key];
+                                    if (r >= range.r &&
+                                        r < range.r + range.rs &&
+                                        c >= range.c &&
+                                        c < range.c + range.cs) {
+                                        v.mc = { r: range.r, c: range.c };
+                                        if (v.mc.r !== r || v.mc.c !== c)
+                                            v = { mc: v.mc };
+                                        break;
+                                    }
+                                }
+                            }
+                        }
                     }
                     sheetout.celldata.push({ r: r, c: c, v: v });
                 }

package/dist/ToFortuneSheet/IFortune.d.ts

@@ -134,7 +134,7 @@ export interface IfortuneSheetCelldataValue {
     ht: number | undefined;
     mc: IfortuneSheetCelldataValueMerge | undefined;
     tr: number | undefined;
-    tb: number | undefined;
+    tb: string | undefined;
     v: string | undefined;
     m: string | undefined;
     rt: number | undefined;

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,12 +85,11 @@ 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;
+var transformExcelToFortune = function (file, setSheets, setKey, sheetRef) { return __awaiter(void 0, void 0, void 0, function () {
+    var excelFile, fileName, files, fortuneFile, lsh;
     return __generator(this, function (_a) {
         switch (_a.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];
                 return [4 /*yield*/, convertCsvToExcel(file)];
@@ -113,12 +112,11 @@ var transformExcelToFortune = function (e, setSheets, setKey, sheetRef) { return
                 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/package.json

@@ -3,7 +3,7 @@
   "workspaces": [
     "src/*"
   ],
-  "version": "2.2.3",
+  "version": "2.2.5",
   "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"
 }