@leankylin-sheet/core 4.0.39 → 4.0.41

package/dist/index.esm.js

@@ -34892,16 +34892,22 @@ var make_ssf = function make_ssf(SSF) {
   }
   function format(fmt, v, o) {
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
-      if (isNaN(v) || Infinity == v || -Infinity == v) {
+      if (Number.isNaN(v) || Infinity == v || -Infinity == v || v === null || v === '' || v === undefined) {
         return '';
       }
+      if (isNaN(v)) {
+        return v;
+      }
       var precision = fmt.replace('leanky_n', '');
       return numberThousands(v, ',', precision);
     }
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_p')) {
-      if (isNaN(v) || Infinity == v || -Infinity == v) {
+      if (Number.isNaN(v) || Infinity == v || -Infinity == v || v === null || v === '' || v === undefined) {
         return '';
       }
+      if (isNaN(v)) {
+        return v;
+      }
       var _precision = fmt.replace('leanky_p', '');
       return numberThousands(v * 100, ',', _precision) + '%';
     }
@@ -35447,7 +35453,7 @@ for (var i = 0; i < operatorArr.length; i += 1) {
 var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
 var quotedSheetName = "'(?:(?!').|'')*'";
 var sheetNameRegexp = "(".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
-var rowColumnRegexp = "[$]?[A-Za-z]+[$]?[0-9]+";
+var rowColumnRegexp = "[$]?[A-Za-z]+[$]?[0-9]*";
 var rowColumnWithSheetName = "(?:".concat(sheetNameRegexp, ")?(").concat(rowColumnRegexp, ")");
 var LABEL_EXTRACT_REGEXP = new RegExp("^".concat(rowColumnWithSheetName, "(?:[:]").concat(rowColumnWithSheetName, ")?$"));
 var FormulaCache = /*#__PURE__*/function () {
@@ -35503,16 +35509,20 @@ var FormulaCache = /*#__PURE__*/function () {
       var endRow = endCellCoord.row.index;
       var startCol = startCellCoord.column.index;
       var endCol = endCellCoord.column.index;
-      var emptyRow = startRow === -1 || endRow === -1;
-      var emptyCol = startCol === -1 || endCol === -1;
-      if (emptyRow) {
-        var _flowdata$length;
+      var emptyRow = startRow === -1 && endRow === -1;
+      var emptyCol = startCol === -1 && endCol === -1;
+      if (startRow === -1) {
         startRow = 0;
+      }
+      if (endRow === -1) {
+        var _flowdata$length;
         endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
       }
-      if (emptyCol) {
-        var _flowdata$0$length;
+      if (startCol === -1) {
         startCol = 0;
+      }
+      if (endCol === -1) {
+        var _flowdata$0$length;
         endCol = (_flowdata$0$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata[0].length) !== null && _flowdata$0$length !== void 0 ? _flowdata$0$length : 0;
       }
       if (emptyRow && emptyCol) throw Error(ERROR_REF);
@@ -36181,7 +36191,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var cellCache = [[{
       v: undefined
     }]];
-    setCellValue(ctx, 0, 0, cellCache, value);
+    setCellValue(ctx, 0, 0, cellCache, value, true);
     var _cellCache$ = _slicedToArray(cellCache[0], 1);
     ctx.formulaCache.execFunctionGlobalData["".concat(origin_r, "_").concat(origin_c, "_").concat(id)] = _cellCache$[0];
   }
@@ -36241,6 +36251,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
     var calc_funcStr = getcellFormula(ctx, formulaCell.r, formulaCell.c, formulaCell.id);
+    console.log("calc_funcStr", key, calc_funcStr);
     if (_.isNil(calc_funcStr)) {
       return 1; // continue
     }
@@ -39825,50 +39836,8 @@ function getCellValue(r, c, data, attr) {
   }
   return retv;
 }
-function setCellValue(ctx, r, c, d, v) {
+function setVUpdateStr(cell, vupdateStr, d, r, c, vupdate) {
   var _cell$ct, _cell$ct2, _cell$ct3, _cell$ct4, _cell$ct5, _cell$ct6;
-  if (_.isNil(d)) {
-    d = getFlowdata(ctx);
-  }
-  if (!d) return;
-  var cell = d[r][c];
-  var vupdate;
-  if (_.isPlainObject(v)) {
-    if (_.isNil(cell)) {
-      cell = v;
-    } else {
-      if (!_.isNil(v.f)) {
-        cell.f = v.f;
-      } else if ("f" in cell) {
-        delete cell.f;
-      }
-      if (!_.isNil(v.ct)) {
-        cell.ct = v.ct;
-      }
-    }
-    if (_.isPlainObject(v.v)) {
-      vupdate = v.v.v;
-    } else {
-      vupdate = v.v;
-    }
-  } else {
-    vupdate = v;
-  }
-  if (isRealNull(vupdate)) {
-    if (_.isPlainObject(cell)) {
-      delete cell.m;
-      delete cell.v;
-    } else {
-      cell = null;
-    }
-    d[r][c] = cell;
-    return;
-  }
-  if (isRealNull(cell) || (_.isString(cell) || _.isNumber(cell)) && cell === v) {
-    cell = {};
-  }
-  if (!cell) return;
-  var vupdateStr = vupdate.toString();
   if (vupdateStr.substr(0, 1) === "'") {
     cell.m = vupdateStr.substr(1);
     cell.ct = {
@@ -40004,7 +39973,67 @@ function setCellValue(ctx, r, c, d, v) {
       }
     }
   }
-  d[r][c] = cell;
+  if (d[r]) {
+    d[r][c] = cell;
+  }
+}
+function setCellValue(ctx, r, c, d, v, isCache) {
+  if (_.isNil(d)) {
+    d = getFlowdata(ctx);
+  }
+  if (!d) return;
+  var cell = d[r][c];
+  var vupdate;
+  if (_.isPlainObject(v)) {
+    if (_.isNil(cell)) {
+      cell = v;
+    } else {
+      if (!_.isNil(v.f)) {
+        cell.f = v.f;
+      } else if ("f" in cell) {
+        delete cell.f;
+      }
+      if (!_.isNil(v.ct)) {
+        cell.ct = v.ct;
+      }
+    }
+    if (_.isPlainObject(v.v)) {
+      vupdate = v.v.v;
+    } else {
+      vupdate = v.v;
+    }
+  } else {
+    vupdate = v;
+  }
+  if (isRealNull(vupdate)) {
+    if (_.isPlainObject(cell)) {
+      delete cell.m;
+      delete cell.v;
+    } else {
+      cell = null;
+    }
+    d[r][c] = cell;
+    return;
+  }
+  if (isRealNull(cell) || (_.isString(cell) || _.isNumber(cell)) && cell === v) {
+    cell = {};
+  }
+  if (!cell) return;
+  if (Array.isArray(vupdate) && !isCache) {
+    for (var rIndex = 0; rIndex < vupdate.length; rIndex++) {
+      var _vupdate$rIndex;
+      var row = (_vupdate$rIndex = vupdate[rIndex]) !== null && _vupdate$rIndex !== void 0 ? _vupdate$rIndex : "";
+      for (var cIndex = 0; cIndex < row.length; cIndex++) {
+        var vUpdateCell = row[cIndex] || "";
+        var vupdateStr = vUpdateCell.toString();
+        var _cell = _objectSpread2({}, cell || {});
+        setVUpdateStr(_cell, vupdateStr, d, r + rIndex, c + cIndex, vUpdateCell);
+      }
+    }
+  } else {
+    var _vupdateStr = vupdate.toString();
+    setVUpdateStr(cell, _vupdateStr, d, r, c, vupdate);
+  }
 }
 function getRealCellValue(r, c, data, attr) {
   var value = getCellValue(r, c, data, "m");

package/dist/index.js

@@ -34902,16 +34902,22 @@ var make_ssf = function make_ssf(SSF) {
   }
   function format(fmt, v, o) {
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
-      if (isNaN(v) || Infinity == v || -Infinity == v) {
+      if (Number.isNaN(v) || Infinity == v || -Infinity == v || v === null || v === '' || v === undefined) {
         return '';
       }
+      if (isNaN(v)) {
+        return v;
+      }
       var precision = fmt.replace('leanky_n', '');
       return numberThousands(v, ',', precision);
     }
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_p')) {
-      if (isNaN(v) || Infinity == v || -Infinity == v) {
+      if (Number.isNaN(v) || Infinity == v || -Infinity == v || v === null || v === '' || v === undefined) {
         return '';
       }
+      if (isNaN(v)) {
+        return v;
+      }
       var _precision = fmt.replace('leanky_p', '');
       return numberThousands(v * 100, ',', _precision) + '%';
     }
@@ -35457,7 +35463,7 @@ for (var i = 0; i < operatorArr.length; i += 1) {
 var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
 var quotedSheetName = "'(?:(?!').|'')*'";
 var sheetNameRegexp = "(".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
-var rowColumnRegexp = "[$]?[A-Za-z]+[$]?[0-9]+";
+var rowColumnRegexp = "[$]?[A-Za-z]+[$]?[0-9]*";
 var rowColumnWithSheetName = "(?:".concat(sheetNameRegexp, ")?(").concat(rowColumnRegexp, ")");
 var LABEL_EXTRACT_REGEXP = new RegExp("^".concat(rowColumnWithSheetName, "(?:[:]").concat(rowColumnWithSheetName, ")?$"));
 var FormulaCache = /*#__PURE__*/function () {
@@ -35513,16 +35519,20 @@ var FormulaCache = /*#__PURE__*/function () {
       var endRow = endCellCoord.row.index;
       var startCol = startCellCoord.column.index;
       var endCol = endCellCoord.column.index;
-      var emptyRow = startRow === -1 || endRow === -1;
-      var emptyCol = startCol === -1 || endCol === -1;
-      if (emptyRow) {
-        var _flowdata$length;
+      var emptyRow = startRow === -1 && endRow === -1;
+      var emptyCol = startCol === -1 && endCol === -1;
+      if (startRow === -1) {
         startRow = 0;
+      }
+      if (endRow === -1) {
+        var _flowdata$length;
         endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
       }
-      if (emptyCol) {
-        var _flowdata$0$length;
+      if (startCol === -1) {
         startCol = 0;
+      }
+      if (endCol === -1) {
+        var _flowdata$0$length;
         endCol = (_flowdata$0$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata[0].length) !== null && _flowdata$0$length !== void 0 ? _flowdata$0$length : 0;
       }
       if (emptyRow && emptyCol) throw Error(formulaParser.ERROR_REF);
@@ -36191,7 +36201,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var cellCache = [[{
       v: undefined
     }]];
-    setCellValue(ctx, 0, 0, cellCache, value);
+    setCellValue(ctx, 0, 0, cellCache, value, true);
     var _cellCache$ = _slicedToArray(cellCache[0], 1);
     ctx.formulaCache.execFunctionGlobalData["".concat(origin_r, "_").concat(origin_c, "_").concat(id)] = _cellCache$[0];
   }
@@ -36251,6 +36261,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
     var calc_funcStr = getcellFormula(ctx, formulaCell.r, formulaCell.c, formulaCell.id);
+    console.log("calc_funcStr", key, calc_funcStr);
     if (___default['default'].isNil(calc_funcStr)) {
       return 1; // continue
     }
@@ -39835,50 +39846,8 @@ function getCellValue(r, c, data, attr) {
   }
   return retv;
 }
-function setCellValue(ctx, r, c, d, v) {
+function setVUpdateStr(cell, vupdateStr, d, r, c, vupdate) {
   var _cell$ct, _cell$ct2, _cell$ct3, _cell$ct4, _cell$ct5, _cell$ct6;
-  if (___default['default'].isNil(d)) {
-    d = getFlowdata(ctx);
-  }
-  if (!d) return;
-  var cell = d[r][c];
-  var vupdate;
-  if (___default['default'].isPlainObject(v)) {
-    if (___default['default'].isNil(cell)) {
-      cell = v;
-    } else {
-      if (!___default['default'].isNil(v.f)) {
-        cell.f = v.f;
-      } else if ("f" in cell) {
-        delete cell.f;
-      }
-      if (!___default['default'].isNil(v.ct)) {
-        cell.ct = v.ct;
-      }
-    }
-    if (___default['default'].isPlainObject(v.v)) {
-      vupdate = v.v.v;
-    } else {
-      vupdate = v.v;
-    }
-  } else {
-    vupdate = v;
-  }
-  if (isRealNull(vupdate)) {
-    if (___default['default'].isPlainObject(cell)) {
-      delete cell.m;
-      delete cell.v;
-    } else {
-      cell = null;
-    }
-    d[r][c] = cell;
-    return;
-  }
-  if (isRealNull(cell) || (___default['default'].isString(cell) || ___default['default'].isNumber(cell)) && cell === v) {
-    cell = {};
-  }
-  if (!cell) return;
-  var vupdateStr = vupdate.toString();
   if (vupdateStr.substr(0, 1) === "'") {
     cell.m = vupdateStr.substr(1);
     cell.ct = {
@@ -40014,7 +39983,67 @@ function setCellValue(ctx, r, c, d, v) {
       }
     }
   }
-  d[r][c] = cell;
+  if (d[r]) {
+    d[r][c] = cell;
+  }
+}
+function setCellValue(ctx, r, c, d, v, isCache) {
+  if (___default['default'].isNil(d)) {
+    d = getFlowdata(ctx);
+  }
+  if (!d) return;
+  var cell = d[r][c];
+  var vupdate;
+  if (___default['default'].isPlainObject(v)) {
+    if (___default['default'].isNil(cell)) {
+      cell = v;
+    } else {
+      if (!___default['default'].isNil(v.f)) {
+        cell.f = v.f;
+      } else if ("f" in cell) {
+        delete cell.f;
+      }
+      if (!___default['default'].isNil(v.ct)) {
+        cell.ct = v.ct;
+      }
+    }
+    if (___default['default'].isPlainObject(v.v)) {
+      vupdate = v.v.v;
+    } else {
+      vupdate = v.v;
+    }
+  } else {
+    vupdate = v;
+  }
+  if (isRealNull(vupdate)) {
+    if (___default['default'].isPlainObject(cell)) {
+      delete cell.m;
+      delete cell.v;
+    } else {
+      cell = null;
+    }
+    d[r][c] = cell;
+    return;
+  }
+  if (isRealNull(cell) || (___default['default'].isString(cell) || ___default['default'].isNumber(cell)) && cell === v) {
+    cell = {};
+  }
+  if (!cell) return;
+  if (Array.isArray(vupdate) && !isCache) {
+    for (var rIndex = 0; rIndex < vupdate.length; rIndex++) {
+      var _vupdate$rIndex;
+      var row = (_vupdate$rIndex = vupdate[rIndex]) !== null && _vupdate$rIndex !== void 0 ? _vupdate$rIndex : "";
+      for (var cIndex = 0; cIndex < row.length; cIndex++) {
+        var vUpdateCell = row[cIndex] || "";
+        var vupdateStr = vUpdateCell.toString();
+        var _cell = _objectSpread2({}, cell || {});
+        setVUpdateStr(_cell, vupdateStr, d, r + rIndex, c + cIndex, vUpdateCell);
+      }
+    }
+  } else {
+    var _vupdateStr = vupdate.toString();
+    setVUpdateStr(cell, _vupdateStr, d, r, c, vupdate);
+  }
 }
 function getRealCellValue(r, c, data, attr) {
   var value = getCellValue(r, c, data, "m");

package/dist/modules/cell.d.ts

@@ -3,7 +3,7 @@ import { Cell, CellMatrix, Range, Selection, SingleRange } from "../types";
 export declare function normalizedCellAttr(cell: Cell, attr: keyof Cell, defaultFontSize?: number): any;
 export declare function normalizedAttr(data: CellMatrix, r: number, c: number, attr: keyof Cell): any;
 export declare function getCellValue(r: number, c: number, data: CellMatrix, attr?: keyof Cell): any;
-export declare function setCellValue(ctx: Context, r: number, c: number, d: CellMatrix | null | undefined, v: any): void;
+export declare function setCellValue(ctx: Context, r: number, c: number, d: CellMatrix | null | undefined, v: any, isCache?: boolean): void;
 export declare function getRealCellValue(r: number, c: number, data: CellMatrix, attr?: keyof Cell): any;
 export declare function mergeBorder(ctx: Context, d: CellMatrix, row_index: number, col_index: number): {
     row: number[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.39",
+  "version": "4.0.41",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "4.0.39",
+    "@leankylin-sheet/formula-parser": "4.0.41",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",