@leankylin-sheet/react 5.2.13 → 5.2.15

package/dist/index.esm.js

@@ -3561,15 +3561,16 @@ var DropDownList = function DropDownList() {
 };
 
 var CellOptions = function CellOptions() {
-  var _context$cellOptions;
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context,
-    refs = _useContext.refs;
-  var cellOptions = (_context$cellOptions = context.cellOptions) !== null && _context$cellOptions !== void 0 ? _context$cellOptions : [];
+    refs = _useContext.refs,
+    settings = _useContext.settings;
+  var currentSheet = context.luckysheetfile[getSheetIndex(context, context.currentSheetId)];
+  var cellOptions = currentSheet.cellOptions;
   return /*#__PURE__*/React.createElement("div", {
     className: "leankylin-cell-option"
   }, cellOptions === null || cellOptions === void 0 ? void 0 : cellOptions.map(function (item) {
-    var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render;
+    var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render, _settings$renderCellO;
     var _colLocationByIndex = colLocationByIndex(item.c, context.visibledatacolumn),
       _colLocationByIndex2 = _slicedToArray(_colLocationByIndex, 2),
       left = _colLocationByIndex2[0],
@@ -3597,7 +3598,7 @@ var CellOptions = function CellOptions() {
         width: right - left,
         height: bottom - top
       }, otherStyles)
-    }, item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item));
+    }, (item === null || item === void 0 ? void 0 : item.render) ? item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item) : (_settings$renderCellO = settings.renderCellOptions) === null || _settings$renderCellO === void 0 ? void 0 : _settings$renderCellO.call(settings, item));
   }));
 };
 
@@ -10010,6 +10011,8 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
     setCellOptions: function setCellOptions(cellOptions) {
       return setContext(function (ctx) {
         ctx.cellOptions = cellOptions;
+        var index = getSheetIndex(ctx, context.currentSheetId);
+        ctx.luckysheetfile[index].cellOptions = cellOptions;
       });
     },
     applyOp: function applyOp(ops) {

package/dist/index.js

@@ -3571,15 +3571,16 @@ var DropDownList = function DropDownList() {
 };
 
 var CellOptions = function CellOptions() {
-  var _context$cellOptions;
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
-    refs = _useContext.refs;
-  var cellOptions = (_context$cellOptions = context.cellOptions) !== null && _context$cellOptions !== void 0 ? _context$cellOptions : [];
+    refs = _useContext.refs,
+    settings = _useContext.settings;
+  var currentSheet = context.luckysheetfile[core.getSheetIndex(context, context.currentSheetId)];
+  var cellOptions = currentSheet.cellOptions;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "leankylin-cell-option"
   }, cellOptions === null || cellOptions === void 0 ? void 0 : cellOptions.map(function (item) {
-    var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render;
+    var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render, _settings$renderCellO;
     var _colLocationByIndex = core.colLocationByIndex(item.c, context.visibledatacolumn),
       _colLocationByIndex2 = _slicedToArray(_colLocationByIndex, 2),
       left = _colLocationByIndex2[0],
@@ -3607,7 +3608,7 @@ var CellOptions = function CellOptions() {
         width: right - left,
         height: bottom - top
       }, otherStyles)
-    }, item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item));
+    }, (item === null || item === void 0 ? void 0 : item.render) ? item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item) : (_settings$renderCellO = settings.renderCellOptions) === null || _settings$renderCellO === void 0 ? void 0 : _settings$renderCellO.call(settings, item));
   }));
 };
 
@@ -10020,6 +10021,8 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
     setCellOptions: function setCellOptions(cellOptions) {
       return setContext(function (ctx) {
         ctx.cellOptions = cellOptions;
+        var index = core.getSheetIndex(ctx, context.currentSheetId);
+        ctx.luckysheetfile[index].cellOptions = cellOptions;
       });
     },
     applyOp: function applyOp(ops) {

package/dist/index.umd.js

@@ -42175,7 +42175,6 @@
    * @returns {*}
    */
   function toNumber(number) {
-    var _result;
     var result;
     if (number === true) {
       return 1;
@@ -42185,7 +42184,7 @@
     } else if (typeof number === 'string') {
       result = number.indexOf('.') > -1 ? parseFloat(number) : parseInt(number, 10);
     }
-    return (_result = result) !== null && _result !== void 0 ? _result : 0;
+    return result || 0;
   }
 
   /**
@@ -42198,7 +42197,7 @@
     return -1 * toNumber(number);
   }
   function toNumberNotNaN(number) {
-    var _result2;
+    var _result;
     var result;
     if (number === true) {
       return 1;
@@ -42211,7 +42210,7 @@
     if (isNaN(result)) {
       return 0;
     }
-    return (_result2 = result) !== null && _result2 !== void 0 ? _result2 : 0;
+    return (_result = result) !== null && _result !== void 0 ? _result : 0;
   }
 
   var ERROR$1 = 'ERROR';
@@ -42328,6 +42327,9 @@
     } else if (type === ">=") {
       return tsValue(exp1) >= tsValue(exp2);
     } else if (type === "=") {
+      if (exp1 === 0 || exp2 === 0) {
+        return (exp1 || 0) === (exp2 || 0);
+      }
       return tsValue(exp1) === tsValue(exp2);
     }
   }
@@ -42365,6 +42367,7 @@
           foundFormula = true;
           params = tsParams(symbolParts[0], params);
           result = formulajs[symbolParts[0]].apply(formulajs, _toConsumableArray$1(params));
+          result = tsResult(symbolParts[0], result);
         }
       } else {
         var length = symbolParts.length;
@@ -42423,6 +42426,17 @@
     }
     return params;
   }
+  function tsResult(fnName, result) {
+    if (fnName === 'UNIQUE') {
+      if (Array.isArray(result) && Array.isArray(result[0])) {
+        var uniResult = _toConsumableArray$1(new Set(result[0].flat()));
+        return uniResult === null || uniResult === void 0 ? void 0 : uniResult.map(function (item) {
+          return [[item]];
+        });
+      }
+    }
+    return result;
+  }
 
   var SYMBOL$5 = '>';
   function func$5(exp1, exp2) {
@@ -80577,7 +80591,12 @@
       formulaError = _ctx$formulaCache$par.error;
     if (!lodash.isNil(r) && !lodash.isNil(c)) {
       if (isrefresh) {
-        execFunctionGroup(ctx, r, c, lodash.isNil(formulaError) ? result : formulaError, id);
+        var _data$r;
+        var data = getFlowdata(ctx, id);
+        var cell = data === null || data === void 0 ? void 0 : (_data$r = data[r]) === null || _data$r === void 0 ? void 0 : _data$r[c];
+        if ((cell === null || cell === void 0 ? void 0 : cell.v) !== result) {
+          execFunctionGroup(ctx, r, c, lodash.isNil(formulaError) ? result : formulaError, id);
+        }
       }
       if (!notInsertFunc) {
         insertUpdateFunctionGroup(ctx, r, c, id);
@@ -88978,7 +88997,7 @@
             rs: rs,
             cs: cs
           };
-        } else if (index === c) {
+        } else if (index === c && cs !== 1) {
           if (direction === "lefttop") {
             merge_new["".concat(r, "_").concat(c + count)] = {
               r: r,
@@ -90872,11 +90891,6 @@
     console.time("calcTime:".concat(id));
     var index$1 = getSheetIndex(ctx, id);
     var luckysheetfile = ctx.luckysheetfile;
-    var file = luckysheetfile[index$1];
-    var calcChain = file.calcChain;
-    if (lodash.isNil(calcChain)) {
-      calcChain = [];
-    }
     if (!ctx.luckysheetfile[index$1].data) return;
     for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
       for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
@@ -90884,13 +90898,7 @@
         if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
           continue;
         }
-        var cc = {
-          r: r,
-          c: c,
-          id: id
-        };
-        calcChain.push(cc);
-        var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, undefined, true);
+        var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, false, true);
         var newV = result[1];
         if (newV === cell.v) {
           continue;
@@ -90900,12 +90908,32 @@
         });
       }
     }
-    file.calcChain = lodash.uniqBy(calcChain, function (item) {
-      return item.r + item.c + item.id;
-    });
     ctx.luckysheetfile = luckysheetfile;
     console.timeEnd("calcTime:".concat(id));
   }
+  function updateFunctionGroup(ctx) {
+    var luckysheetfile = ctx.luckysheetfile;
+    for (var index = 0; index < luckysheetfile.length; index++) {
+      var file = luckysheetfile[index];
+      var calcChain = [];
+      if (!ctx.luckysheetfile[index].data) return;
+      for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
+        for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
+          var cell = ctx.luckysheetfile[index].data[r][c];
+          if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+            continue;
+          }
+          var cc = {
+            r: r,
+            c: c,
+            id: file.id
+          };
+          calcChain.push(cc);
+        }
+      }
+      file.calcChain = calcChain;
+    }
+  }
   function parseCellReferences(expression) {
     if (typeof expression !== "string" || expression.trim() === "") {
       return [];
@@ -100599,6 +100627,7 @@
     showSheet: showSheet,
     copySheet: copySheet,
     calculateSheetFromula: calculateSheetFromula,
+    updateFunctionGroup: updateFunctionGroup,
     calculateSheetByCells: calculateSheetByCells,
     addSheet: addSheet$1,
     deleteSheet: deleteSheet$1,
@@ -100621,6 +100650,7 @@
     renderEditorSelector: undefined,
     copyRich: false,
     renderCalcInfo: undefined,
+    renderCellOptions: undefined,
     renderFreezeCol: undefined,
     renderFreezeRow: undefined,
     renderFilter: undefined,
@@ -108410,15 +108440,16 @@
   };
 
   var CellOptions = function CellOptions() {
-    var _context$cellOptions;
     var _useContext = React.useContext(WorkbookContext),
       context = _useContext.context,
-      refs = _useContext.refs;
-    var cellOptions = (_context$cellOptions = context.cellOptions) !== null && _context$cellOptions !== void 0 ? _context$cellOptions : [];
+      refs = _useContext.refs,
+      settings = _useContext.settings;
+    var currentSheet = context.luckysheetfile[getSheetIndex(context, context.currentSheetId)];
+    var cellOptions = currentSheet.cellOptions;
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: "leankylin-cell-option"
     }, cellOptions === null || cellOptions === void 0 ? void 0 : cellOptions.map(function (item) {
-      var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render;
+      var _refs$globalCache$fre, _refs$globalCache$fre2, _refs$globalCache$fre3, _refs$globalCache$fre4, _refs$globalCache$fre5, _refs$globalCache$fre6, _refs$globalCache$fre7, _refs$globalCache$fre8, _refs$globalCache$fre9, _refs$globalCache$fre10, _item$render, _settings$renderCellO;
       var _colLocationByIndex = colLocationByIndex(item.c, context.visibledatacolumn),
         _colLocationByIndex2 = _slicedToArray(_colLocationByIndex, 2),
         left = _colLocationByIndex2[0],
@@ -108446,7 +108477,7 @@
           width: right - left,
           height: bottom - top
         }, otherStyles)
-      }, item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item));
+      }, (item === null || item === void 0 ? void 0 : item.render) ? item === null || item === void 0 ? void 0 : (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, item) : (_settings$renderCellO = settings.renderCellOptions) === null || _settings$renderCellO === void 0 ? void 0 : _settings$renderCellO.call(settings, item));
     }));
   };
 
@@ -114859,6 +114890,8 @@
       setCellOptions: function setCellOptions(cellOptions) {
         return setContext(function (ctx) {
           ctx.cellOptions = cellOptions;
+          var index = getSheetIndex(ctx, context.currentSheetId);
+          ctx.luckysheetfile[index].cellOptions = cellOptions;
         });
       },
       applyOp: function applyOp(ops) {