@leankylin-sheet/excel 7.0.8 → 7.0.10

package/dist/ToFortuneSheet/FortuneBase.d.ts

@@ -1,4 +1,4 @@
-import { IFortuneFile, IFortuneFileInfo, IfortuneSheet, IfortuneSheetCelldata, IfortuneSheetConfig, IfortuneSheetCelldataValue, IfortuneSheetCelldataValueMerge, IFortuneSheetCellFormat, IfortuneSheetConfigMerges, IfortuneSheetConfigMerge, IfortuneSheetborderInfoCellValue, IfortuneSheetborderInfoCellValueStyle, IfortuneSheetborderInfoCellForImp, IfortuneSheetRowAndColumnLen, IfortuneSheetRowAndColumnHidden, IfortuneSheetSelection, IfortunesheetFrozen, IfortuneSheetChart, IfortuneSheetPivotTable, IfortunesheetConditionFormat, IfortunesheetCalcChain, IFortuneInlineString, IfortuneImage, IfortuneImageBorder, IfortuneImageCrop, IfortuneImageDefault, IfortuneImages, IfortunesheetHyperlink, IfortunesheetDataVerification } from "./IFortune";
+import { IFortuneFile, IFortuneFileInfo, IfortuneSheet, IfortuneSheetCelldata, IfortuneSheetConfig, IfortuneSheetCelldataValue, IfortuneSheetCelldataValueMerge, IFortuneSheetCellFormat, IfortuneSheetConfigMerges, IfortuneSheetConfigMerge, IfortuneSheetborderInfoCellValue, IfortuneSheetborderInfoCellValueStyle, IfortuneSheetborderInfoCellForImp, IfortuneSheetRowAndColumnLen, IfortuneSheetRowAndColumnHidden, IfortuneSheetSelection, IfortunesheetFrozen, IfortuneSheetFrozen, IfortuneSheetChart, IfortuneSheetPivotTable, IfortunesheetConditionFormat, IfortunesheetCalcChain, IFortuneInlineString, IfortuneImage, IfortuneImageBorder, IfortuneImageCrop, IfortuneImageDefault, IfortuneImages, IfortunesheetHyperlink, IfortunesheetDataVerification } from "./IFortune";
 export declare class FortuneFileBase implements IFortuneFile {
     info: IFortuneFileInfo;
     sheets: IfortuneSheet[];
@@ -25,6 +25,7 @@ export declare class FortuneSheetBase implements IfortuneSheet {
     pivotTable: IfortuneSheetPivotTable;
     luckysheet_conditionformat_save: IfortunesheetConditionFormat[];
     freezen: IfortunesheetFrozen;
+    frozen: IfortuneSheetFrozen;
     calcChain: IfortunesheetCalcChain[];
     images: IfortuneImages;
     dataVerification: IfortunesheetDataVerification;

package/dist/ToFortuneSheet/IFortune.d.ts

@@ -29,6 +29,7 @@ export interface IfortuneSheet {
     pivotTable?: IfortuneSheetPivotTable;
     luckysheet_conditionformat_save?: IfortunesheetConditionFormat[];
     freezen?: IfortunesheetFrozen;
+    frozen?: IfortuneSheetFrozen;
     calcChain?: IfortunesheetCalcChain[];
     zoomRatio: number;
     showGridLines: string;
@@ -90,6 +91,13 @@ export interface IfortunesheetFrozen {
     horizen: number | undefined;
     vertical: number | undefined;
 }
+export interface IfortuneSheetFrozen {
+    type: "row" | "column" | "both" | "rangeRow" | "rangeColumn" | "rangeBoth";
+    range?: {
+        row_focus: number;
+        column_focus: number;
+    };
+}
 export interface IfortunesheetConditionFormat {
     type: string;
     cellrange: IfortuneSheetSelection[];

package/dist/index.esm.js

@@ -1909,6 +1909,7 @@ var FortuneSheetBase = /*#__PURE__*/_createClass(function FortuneSheetBase() {
   this.pivotTable = void 0;
   this.luckysheet_conditionformat_save = void 0;
   this.freezen = void 0;
+  this.frozen = void 0;
   this.calcChain = void 0;
   this.images = void 0;
   this.dataVerification = void 0;
@@ -2016,6 +2017,18 @@ var FortuneImageBase = /*#__PURE__*/_createClass(function FortuneImageBase() {
   this.type = void 0;
 });
 
+var DEFAULT_STYLE_VALUES = {
+  bg: "#FFFFFF",
+  fc: "#000000",
+  ff: "微软雅黑"
+};
+function isDefaultValue(key, value) {
+  if (value == null) {
+    return false;
+  }
+  var normalized = key === "bg" || key === "fc" ? value.toUpperCase() : value;
+  return normalized === DEFAULT_STYLE_VALUES[key];
+}
 var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
   function FortuneSheetCelldata(cell, styles, sharedStrings, mergeCells, sheetFile, ReadXml) {
     var _this;
@@ -2197,7 +2210,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
           var fillIdNum = parseInt(fillId);
           var fill = fills[fillIdNum];
           var bg = this.getBackgroundByFill(fill, clrScheme);
-          if (bg != null) {
+          if (bg != null && !isDefaultValue("bg", bg)) {
             cellValue.bg = bg;
           }
         }
@@ -2223,7 +2236,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             if (colors != null && colors.length > 0) {
               var color = colors[0];
               var fc = getColor(color, this.styles);
-              if (fc != null) {
+              if (fc != null && !isDefaultValue("fc", fc)) {
                 cellValue.fc = fc;
               }
             }
@@ -2235,7 +2248,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             }
             if (family != null && family.length > 0) {
               var _val = family[0].attributeList.val;
-              if (_val != null) {
+              if (_val != null && !isDefaultValue("ff", _val)) {
                 cellValue.ff = _val;
               }
             }
@@ -2356,28 +2369,49 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
           var diagonal = this.getBorderInfo(diagonals);
           var start = this.getBorderInfo(starts);
           var end = this.getBorderInfo(ends);
+          var skipLeft = false,
+            skipRight = false,
+            skipTop = false,
+            skipBottom = false;
+          if (this.mergeCells != null) {
+            for (var m = 0; m < this.mergeCells.length; m++) {
+              var mref = this.mergeCells[m].attributeList.ref;
+              if (mref == null) {
+                continue;
+              }
+              var mrange = getcellrange(mref);
+              if (mrange == null || this.r < mrange.row[0] || this.r > mrange.row[1] || this.c < mrange.column[0] || this.c > mrange.column[1]) {
+                continue;
+              }
+              skipLeft = this.c > mrange.column[0];
+              skipRight = this.c < mrange.column[1];
+              skipTop = this.r > mrange.row[0];
+              skipBottom = this.r < mrange.row[1];
+              break;
+            }
+          }
           var isAdd = false;
-          if (start != null && start.color != null) {
+          if (start != null && start.color != null && !skipLeft) {
             borderCellValue.l = start;
             isAdd = true;
           }
-          if (end != null && end.color != null) {
+          if (end != null && end.color != null && !skipRight) {
             borderCellValue.r = end;
             isAdd = true;
           }
-          if (left != null && left.color != null) {
+          if (left != null && left.color != null && !skipLeft) {
             borderCellValue.l = left;
             isAdd = true;
           }
-          if (right != null && right.color != null) {
+          if (right != null && right.color != null && !skipRight) {
             borderCellValue.r = right;
             isAdd = true;
           }
-          if (top != null && top.color != null) {
+          if (top != null && top.color != null && !skipTop) {
             borderCellValue.t = top;
             isAdd = true;
           }
-          if (bottom != null && bottom.color != null) {
+          if (bottom != null && bottom.color != null && !skipBottom) {
             borderCellValue.b = bottom;
             isAdd = true;
           }
@@ -2648,7 +2682,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             cellValue.ct = _cellFormat3;
           }
         } else if (t == ST_CellType["InlineString"] && v != null) {
-          cellValue.v = "'" + value;
+          cellValue.v = escapeCharacter(value);
         } else {
           value = escapeCharacter(value);
           cellValue.v = value;
@@ -2781,6 +2815,45 @@ var FortuneSheet = /*#__PURE__*/function (_FortuneSheetBase) {
         _this.luckysheet_select_save = [];
         _this.luckysheet_select_save.push(range);
       }
+      var panes = sheetView[0].getInnerElements("pane");
+      if (panes != null && panes.length > 0) {
+        var paneAttr = panes[0].attributeList;
+        if (getXmlAttibute(paneAttr, "state", "") == "frozen") {
+          var xSplit = parseInt(getXmlAttibute(paneAttr, "xSplit", "0"));
+          var ySplit = parseInt(getXmlAttibute(paneAttr, "ySplit", "0"));
+          if (isNaN(xSplit)) {
+            xSplit = 0;
+          }
+          if (isNaN(ySplit)) {
+            ySplit = 0;
+          }
+          if (xSplit > 0 && ySplit > 0) {
+            _this.frozen = {
+              type: "both",
+              range: {
+                row_focus: ySplit - 1,
+                column_focus: xSplit - 1
+              }
+            };
+          } else if (ySplit > 0) {
+            _this.frozen = {
+              type: "rangeRow",
+              range: {
+                row_focus: ySplit - 1,
+                column_focus: -1
+              }
+            };
+          } else if (xSplit > 0) {
+            _this.frozen = {
+              type: "rangeColumn",
+              range: {
+                row_focus: -1,
+                column_focus: xSplit - 1
+              }
+            };
+          }
+        }
+      }
     }
     _this.showGridLines = showGridLines;
     _this.status = tabSelected;
@@ -2878,7 +2951,6 @@ var FortuneSheet = /*#__PURE__*/function (_FortuneSheetBase) {
         _this.calcChain.push(_chain2);
       }
     }
-    _this.dataVerification = _this.generateConfigDataValidations();
     _this.hyperlink = _this.generateConfigHyperlinks();
     _this.hide = _this.hide;
     if (_this.mergeCells != null) {
@@ -4751,7 +4823,7 @@ var FortuneFile = /*#__PURE__*/function () {
       var _iterator = _createForOfIteratorHelper(this.sheets),
         _step;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _loop = function _loop() {
           var _sheet$config;
           var sheet = _step.value;
           var sheetout = {};
@@ -4814,7 +4886,7 @@ var FortuneFile = /*#__PURE__*/function () {
                 rs: rs,
                 cs: cs
               });
-              for (var i = r + 1; i < r + rs; i++) for (var j = c + 1; j < c + cs; j++) merges.set("".concat(i, "_").concat(j), {
+              for (var i = r; i < r + rs; i++) for (var j = c; j < c + cs; j++) if (i !== r || j !== c) merges.set("".concat(i, "_").concat(j), {
                 r: r,
                 c: c
               });
@@ -4822,6 +4894,7 @@ var FortuneFile = /*#__PURE__*/function () {
           }
           if (sheet.celldata != null) {
             sheetout.celldata = [];
+            var presentCells = new Set();
             var _iterator2 = _createForOfIteratorHelper(sheet.celldata),
               _step2;
             try {
@@ -4830,6 +4903,7 @@ var FortuneFile = /*#__PURE__*/function () {
                   _r = _step2$value.r,
                   _c = _step2$value.c,
                   v = _step2$value.v;
+                presentCells.add("".concat(_r, "_").concat(_c));
                 if (_typeof(v) === "object") {
                   var _v = v,
                     xv = _extends({}, (_objectDestructuringEmpty(_v), _v));
@@ -4856,6 +4930,22 @@ var FortuneFile = /*#__PURE__*/function () {
             } finally {
               _iterator2.f();
             }
+            merges.forEach(function (mergeInfo, key) {
+              if (presentCells.has(key)) {
+                return;
+              }
+              var _key$split$map = key.split("_").map(Number),
+                _key$split$map2 = _slicedToArray(_key$split$map, 2),
+                mr = _key$split$map2[0],
+                mc = _key$split$map2[1];
+              sheetout.celldata.push({
+                r: mr,
+                c: mc,
+                v: {
+                  mc: mergeInfo
+                }
+              });
+            });
           }
           if (sheet.chart != null) {
             sheetout.chart = sheet.chart;
@@ -4872,6 +4962,9 @@ var FortuneFile = /*#__PURE__*/function () {
           if (sheet.freezen != null) {
             sheetout.freezen = sheet.freezen;
           }
+          if (sheet.frozen != null) {
+            sheetout.frozen = sheet.frozen;
+          }
           if (sheet.calcChain != null) {
             sheetout.calcChain = sheet.calcChain;
           }
@@ -4888,6 +4981,9 @@ var FortuneFile = /*#__PURE__*/function () {
             sheetout.hide = sheet.hide;
           }
           FortuneOutPutFile.sheets.push(sheetout);
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _loop();
         }
       } catch (err) {
         _iterator.e(err);
@@ -6528,28 +6624,7 @@ var transformExcelToFortune = /*#__PURE__*/function () {
           setKey(function (k) {
             return k + 1;
           });
-          setTimeout(function () {
-            var _iterator = _createForOfIteratorHelper(lsh.sheets),
-              _step;
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                var _sheetRef$current, _sheetRef$current2;
-                var sheet = _step.value;
-                var config = sheet.config;
-                (_sheetRef$current = sheetRef.current) === null || _sheetRef$current === void 0 ? void 0 : _sheetRef$current.setColumnWidth((config === null || config === void 0 ? void 0 : config.columnlen) || {}, {
-                  id: sheet.id
-                });
-                (_sheetRef$current2 = sheetRef.current) === null || _sheetRef$current2 === void 0 ? void 0 : _sheetRef$current2.setRowHeight((config === null || config === void 0 ? void 0 : config.rowlen) || {}, {
-                  id: sheet.id
-                });
-              }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
-            }
-          }, 1);
-        case 12:
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -6620,7 +6695,9 @@ var importToolBarItem = function importToolBarItem() {
 var ImportHelper = function ImportHelper(props) {
   var setSheets = props.setSheets,
     setKey = props.setKey,
-    sheetRef = props.sheetRef;
+    sheetRef = props.sheetRef,
+    beforeImport = props.beforeImport,
+    afterImport = props.afterImport;
   return /*#__PURE__*/React.createElement("input", {
     type: "file",
     id: "ImportHelper",
@@ -6630,9 +6707,23 @@ var ImportHelper = function ImportHelper(props) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (!beforeImport) {
+                _context.next = 3;
+                break;
+              }
+              _context.next = 3;
+              return beforeImport();
+            case 3:
+              _context.next = 5;
               return transformExcelToFortune(e, setSheets, setKey, sheetRef);
-            case 2:
+            case 5:
+              if (!afterImport) {
+                _context.next = 8;
+                break;
+              }
+              _context.next = 8;
+              return afterImport();
+            case 8:
             case "end":
               return _context.stop();
           }

package/dist/index.js

@@ -1921,6 +1921,7 @@ var FortuneSheetBase = /*#__PURE__*/_createClass(function FortuneSheetBase() {
   this.pivotTable = void 0;
   this.luckysheet_conditionformat_save = void 0;
   this.freezen = void 0;
+  this.frozen = void 0;
   this.calcChain = void 0;
   this.images = void 0;
   this.dataVerification = void 0;
@@ -2028,6 +2029,18 @@ var FortuneImageBase = /*#__PURE__*/_createClass(function FortuneImageBase() {
   this.type = void 0;
 });
 
+var DEFAULT_STYLE_VALUES = {
+  bg: "#FFFFFF",
+  fc: "#000000",
+  ff: "微软雅黑"
+};
+function isDefaultValue(key, value) {
+  if (value == null) {
+    return false;
+  }
+  var normalized = key === "bg" || key === "fc" ? value.toUpperCase() : value;
+  return normalized === DEFAULT_STYLE_VALUES[key];
+}
 var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
   function FortuneSheetCelldata(cell, styles, sharedStrings, mergeCells, sheetFile, ReadXml) {
     var _this;
@@ -2209,7 +2222,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
           var fillIdNum = parseInt(fillId);
           var fill = fills[fillIdNum];
           var bg = this.getBackgroundByFill(fill, clrScheme);
-          if (bg != null) {
+          if (bg != null && !isDefaultValue("bg", bg)) {
             cellValue.bg = bg;
           }
         }
@@ -2235,7 +2248,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             if (colors != null && colors.length > 0) {
               var color = colors[0];
               var fc = getColor(color, this.styles);
-              if (fc != null) {
+              if (fc != null && !isDefaultValue("fc", fc)) {
                 cellValue.fc = fc;
               }
             }
@@ -2247,7 +2260,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             }
             if (family != null && family.length > 0) {
               var _val = family[0].attributeList.val;
-              if (_val != null) {
+              if (_val != null && !isDefaultValue("ff", _val)) {
                 cellValue.ff = _val;
               }
             }
@@ -2368,28 +2381,49 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
           var diagonal = this.getBorderInfo(diagonals);
           var start = this.getBorderInfo(starts);
           var end = this.getBorderInfo(ends);
+          var skipLeft = false,
+            skipRight = false,
+            skipTop = false,
+            skipBottom = false;
+          if (this.mergeCells != null) {
+            for (var m = 0; m < this.mergeCells.length; m++) {
+              var mref = this.mergeCells[m].attributeList.ref;
+              if (mref == null) {
+                continue;
+              }
+              var mrange = getcellrange(mref);
+              if (mrange == null || this.r < mrange.row[0] || this.r > mrange.row[1] || this.c < mrange.column[0] || this.c > mrange.column[1]) {
+                continue;
+              }
+              skipLeft = this.c > mrange.column[0];
+              skipRight = this.c < mrange.column[1];
+              skipTop = this.r > mrange.row[0];
+              skipBottom = this.r < mrange.row[1];
+              break;
+            }
+          }
           var isAdd = false;
-          if (start != null && start.color != null) {
+          if (start != null && start.color != null && !skipLeft) {
             borderCellValue.l = start;
             isAdd = true;
           }
-          if (end != null && end.color != null) {
+          if (end != null && end.color != null && !skipRight) {
             borderCellValue.r = end;
             isAdd = true;
           }
-          if (left != null && left.color != null) {
+          if (left != null && left.color != null && !skipLeft) {
             borderCellValue.l = left;
             isAdd = true;
           }
-          if (right != null && right.color != null) {
+          if (right != null && right.color != null && !skipRight) {
             borderCellValue.r = right;
             isAdd = true;
           }
-          if (top != null && top.color != null) {
+          if (top != null && top.color != null && !skipTop) {
             borderCellValue.t = top;
             isAdd = true;
           }
-          if (bottom != null && bottom.color != null) {
+          if (bottom != null && bottom.color != null && !skipBottom) {
             borderCellValue.b = bottom;
             isAdd = true;
           }
@@ -2660,7 +2694,7 @@ var FortuneSheetCelldata = /*#__PURE__*/function (_FortuneSheetCelldata2) {
             cellValue.ct = _cellFormat3;
           }
         } else if (t == ST_CellType["InlineString"] && v != null) {
-          cellValue.v = "'" + value;
+          cellValue.v = escapeCharacter(value);
         } else {
           value = escapeCharacter(value);
           cellValue.v = value;
@@ -2793,6 +2827,45 @@ var FortuneSheet = /*#__PURE__*/function (_FortuneSheetBase) {
         _this.luckysheet_select_save = [];
         _this.luckysheet_select_save.push(range);
       }
+      var panes = sheetView[0].getInnerElements("pane");
+      if (panes != null && panes.length > 0) {
+        var paneAttr = panes[0].attributeList;
+        if (getXmlAttibute(paneAttr, "state", "") == "frozen") {
+          var xSplit = parseInt(getXmlAttibute(paneAttr, "xSplit", "0"));
+          var ySplit = parseInt(getXmlAttibute(paneAttr, "ySplit", "0"));
+          if (isNaN(xSplit)) {
+            xSplit = 0;
+          }
+          if (isNaN(ySplit)) {
+            ySplit = 0;
+          }
+          if (xSplit > 0 && ySplit > 0) {
+            _this.frozen = {
+              type: "both",
+              range: {
+                row_focus: ySplit - 1,
+                column_focus: xSplit - 1
+              }
+            };
+          } else if (ySplit > 0) {
+            _this.frozen = {
+              type: "rangeRow",
+              range: {
+                row_focus: ySplit - 1,
+                column_focus: -1
+              }
+            };
+          } else if (xSplit > 0) {
+            _this.frozen = {
+              type: "rangeColumn",
+              range: {
+                row_focus: -1,
+                column_focus: xSplit - 1
+              }
+            };
+          }
+        }
+      }
     }
     _this.showGridLines = showGridLines;
     _this.status = tabSelected;
@@ -2890,7 +2963,6 @@ var FortuneSheet = /*#__PURE__*/function (_FortuneSheetBase) {
         _this.calcChain.push(_chain2);
       }
     }
-    _this.dataVerification = _this.generateConfigDataValidations();
     _this.hyperlink = _this.generateConfigHyperlinks();
     _this.hide = _this.hide;
     if (_this.mergeCells != null) {
@@ -4763,7 +4835,7 @@ var FortuneFile = /*#__PURE__*/function () {
       var _iterator = _createForOfIteratorHelper(this.sheets),
         _step;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _loop = function _loop() {
           var _sheet$config;
           var sheet = _step.value;
           var sheetout = {};
@@ -4826,7 +4898,7 @@ var FortuneFile = /*#__PURE__*/function () {
                 rs: rs,
                 cs: cs
               });
-              for (var i = r + 1; i < r + rs; i++) for (var j = c + 1; j < c + cs; j++) merges.set("".concat(i, "_").concat(j), {
+              for (var i = r; i < r + rs; i++) for (var j = c; j < c + cs; j++) if (i !== r || j !== c) merges.set("".concat(i, "_").concat(j), {
                 r: r,
                 c: c
               });
@@ -4834,6 +4906,7 @@ var FortuneFile = /*#__PURE__*/function () {
           }
           if (sheet.celldata != null) {
             sheetout.celldata = [];
+            var presentCells = new Set();
             var _iterator2 = _createForOfIteratorHelper(sheet.celldata),
               _step2;
             try {
@@ -4842,6 +4915,7 @@ var FortuneFile = /*#__PURE__*/function () {
                   _r = _step2$value.r,
                   _c = _step2$value.c,
                   v = _step2$value.v;
+                presentCells.add("".concat(_r, "_").concat(_c));
                 if (_typeof(v) === "object") {
                   var _v = v,
                     xv = _extends({}, (_objectDestructuringEmpty(_v), _v));
@@ -4868,6 +4942,22 @@ var FortuneFile = /*#__PURE__*/function () {
             } finally {
               _iterator2.f();
             }
+            merges.forEach(function (mergeInfo, key) {
+              if (presentCells.has(key)) {
+                return;
+              }
+              var _key$split$map = key.split("_").map(Number),
+                _key$split$map2 = _slicedToArray(_key$split$map, 2),
+                mr = _key$split$map2[0],
+                mc = _key$split$map2[1];
+              sheetout.celldata.push({
+                r: mr,
+                c: mc,
+                v: {
+                  mc: mergeInfo
+                }
+              });
+            });
           }
           if (sheet.chart != null) {
             sheetout.chart = sheet.chart;
@@ -4884,6 +4974,9 @@ var FortuneFile = /*#__PURE__*/function () {
           if (sheet.freezen != null) {
             sheetout.freezen = sheet.freezen;
           }
+          if (sheet.frozen != null) {
+            sheetout.frozen = sheet.frozen;
+          }
           if (sheet.calcChain != null) {
             sheetout.calcChain = sheet.calcChain;
           }
@@ -4900,6 +4993,9 @@ var FortuneFile = /*#__PURE__*/function () {
             sheetout.hide = sheet.hide;
           }
           FortuneOutPutFile.sheets.push(sheetout);
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _loop();
         }
       } catch (err) {
         _iterator.e(err);
@@ -6540,28 +6636,7 @@ var transformExcelToFortune = /*#__PURE__*/function () {
           setKey(function (k) {
             return k + 1;
           });
-          setTimeout(function () {
-            var _iterator = _createForOfIteratorHelper(lsh.sheets),
-              _step;
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                var _sheetRef$current, _sheetRef$current2;
-                var sheet = _step.value;
-                var config = sheet.config;
-                (_sheetRef$current = sheetRef.current) === null || _sheetRef$current === void 0 ? void 0 : _sheetRef$current.setColumnWidth((config === null || config === void 0 ? void 0 : config.columnlen) || {}, {
-                  id: sheet.id
-                });
-                (_sheetRef$current2 = sheetRef.current) === null || _sheetRef$current2 === void 0 ? void 0 : _sheetRef$current2.setRowHeight((config === null || config === void 0 ? void 0 : config.rowlen) || {}, {
-                  id: sheet.id
-                });
-              }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
-            }
-          }, 1);
-        case 12:
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -6632,7 +6707,9 @@ var importToolBarItem = function importToolBarItem() {
 var ImportHelper = function ImportHelper(props) {
   var setSheets = props.setSheets,
     setKey = props.setKey,
-    sheetRef = props.sheetRef;
+    sheetRef = props.sheetRef,
+    beforeImport = props.beforeImport,
+    afterImport = props.afterImport;
   return /*#__PURE__*/React__default['default'].createElement("input", {
     type: "file",
     id: "ImportHelper",
@@ -6642,9 +6719,23 @@ var ImportHelper = function ImportHelper(props) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (!beforeImport) {
+                _context.next = 3;
+                break;
+              }
+              _context.next = 3;
+              return beforeImport();
+            case 3:
+              _context.next = 5;
               return transformExcelToFortune(e, setSheets, setKey, sheetRef);
-            case 2:
+            case 5:
+              if (!afterImport) {
+                _context.next = 8;
+                break;
+              }
+              _context.next = 8;
+              return afterImport();
+            case 8:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/excel",
-  "version": "7.0.8",
+  "version": "7.0.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.esm.js",