@leankylin-sheet/react 4.0.40 → 4.0.42

package/dist/index.umd.js

@@ -32440,6 +32440,7 @@
   var ERROR_NUM = 'NUM';
   var ERROR_REF = 'REF';
   var ERROR_VALUE = 'VALUE';
+  var errors_formula_map = _defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1({}, ERROR, formulajs.utils.errors.error), ERROR_DIV_ZERO, formulajs.utils.errors.div0), ERROR_NAME, formulajs.utils.errors.name), ERROR_NOT_AVAILABLE, formulajs.utils.errors.na), ERROR_NULL, formulajs.utils.errors.nil), ERROR_NUM, formulajs.utils.errors.num), ERROR_REF, formulajs.utils.errors.ref), ERROR_VALUE, formulajs.utils.errors.value);
   var errors = _defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1({}, ERROR, '#ERROR!'), ERROR_DIV_ZERO, '#DIV/0!'), ERROR_NAME, '#NAME?'), ERROR_NOT_AVAILABLE, '#N/A'), ERROR_NULL, '#NULL!'), ERROR_NUM, '#NUM!'), ERROR_REF, '#REF!'), ERROR_VALUE, '#VALUE!');
 
   /**
@@ -32532,13 +32533,23 @@
   function func$4(symbol) {
     return function __formulaFunction() {
       symbol = symbol.toUpperCase();
+      for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
+        _params[_key] = arguments[_key];
+      }
+      var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
+        if (errors_formula_map[item]) {
+          return errors_formula_map[item];
+        } else {
+          return item;
+        }
+      });
       var symbolParts = symbol.split('.');
       var foundFormula = false;
       var result;
       if (symbolParts.length === 1) {
         if (formulajs$1[symbolParts[0]]) {
           foundFormula = true;
-          result = formulajs$1[symbolParts[0]].apply(formulajs$1, arguments);
+          result = formulajs$1[symbolParts[0]].apply(formulajs$1, _toConsumableArray$1(params));
         }
       } else {
         var length = symbolParts.length;
@@ -32554,7 +32565,7 @@
         }
         if (nestedFormula) {
           foundFormula = true;
-          result = nestedFormula.apply(void 0, arguments);
+          result = nestedFormula.apply(void 0, _toConsumableArray$1(params));
         }
       }
       if (!foundFormula) {
@@ -34276,6 +34287,9 @@
             result = "";
           } else {
             result = this.parser.parse(expression);
+            // if(result === 'DIV/0'){
+            //   result= '0'
+            // }
           }
         } catch (ex) {
           var message = error$1(ex.message);
@@ -44674,6 +44688,18 @@
       text: "Number",
       value: "##0.00",
       example: "1000.12"
+    }, {
+      text: "thousand",
+      value: "leanky_n",
+      example: "12,345"
+    }, {
+      text: "thousand-2",
+      value: "leanky_n2",
+      example: "12,345.67"
+    }, {
+      text: "thousand-4",
+      value: "leanky_n4",
+      example: "12,345.6789"
     }, {
       text: "Percent",
       value: "#0.00%",
@@ -44966,11 +44992,11 @@
       columnOverLimit: "1000 column limit exceeded"
     },
     comment: {
-      insert: "Insert",
-      edit: "Edit",
-      delete: "Delete",
-      showOne: "Show/Hide",
-      showAll: "Show/Hide All"
+      insert: "Insert Comment",
+      edit: "Edit Comment",
+      delete: "Delete Comment",
+      showOne: "Show/Hide Comment",
+      showAll: "Show/Hide All Comment"
     },
     screenshot: {
       screenshotTipNoSelection: "Please select the scope of the screenshot",
@@ -55206,6 +55232,18 @@
       text: "数字",
       value: "##0.00",
       example: "1000.12"
+    }, {
+      text: "千分符整数",
+      value: "leanky_n",
+      example: "12,345"
+    }, {
+      text: "千分符2位小数",
+      value: "leanky_n2",
+      example: "12,345.67"
+    }, {
+      text: "千分符4位小数",
+      value: "leanky_n4",
+      example: "12,345.6789"
     }, {
       text: "百分比",
       value: "#0.00%",
@@ -55530,11 +55568,11 @@
       columnOverLimit: "超出1000列限制"
     },
     comment: {
-      insert: "新建批注",
-      edit: "编辑批注",
-      delete: "删除",
-      showOne: "显示/隐藏批注",
-      showAll: "显示/隐藏所有批注"
+      insert: "新建说明",
+      edit: "编辑说明",
+      delete: "删除说明",
+      showOne: "显示/隐藏说明",
+      showAll: "显示/隐藏所有说明"
     },
     screenshot: {
       screenshotTipNoSelection: "请框选需要截图的范围",
@@ -69422,16 +69460,22 @@
     }
     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) + '%';
       }
@@ -69909,6 +69953,9 @@
   }
 
   var colors = ["#c1232b", "#27727b", "#fcce10", "#e87c25", "#b5c334", "#fe8463", "#9bca63", "#fad860", "#f3a43b", "#60c0dd", "#d7504b", "#c6e579", "#f4e001", "#f0805a", "#26c0c0", "#c12e34", "#e6b600", "#0098d9", "#2b821d", "#005eaa", "#339ca8", "#cda819", "#32a487", "#3fb1e3", "#6be6c1", "#626c91", "#a0a7e6", "#c4ebad", "#96dee8"];
+  function getHLColor(index) {
+    return colors[index % colors.length];
+  }
 
   function mousePosition(x, y, ctx) {
     var newX = x - ctx.rowHeaderWidth;
@@ -71089,7 +71136,7 @@
           formulaRanges.push(_objectSpread2$1(_objectSpread2$1({
             rangeIndex: rangeIndex
           }, rect), {}, {
-            backgroundColor: colors[rangeIndex]
+            backgroundColor: getHLColor(rangeIndex)
           }));
         }
       }
@@ -71353,7 +71400,7 @@
       if (i === funcstack.length - 1) {
         if (iscelldata(lodash.trim(str))) {
           var rangeIndex = rangeIndexes.length > functionHTMLIndex ? rangeIndexes[functionHTMLIndex] : functionHTMLIndex;
-          function_str += "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(rangeIndex, "\" dir=\"auto\" style=\"color:").concat(colors[rangeIndex], ";\">").concat(str, "</span>");
+          function_str += "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(rangeIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(rangeIndex), ";\">").concat(str, "</span>");
           functionHTMLIndex += 1;
         } else if (matchConfig.dquote > 0) {
           function_str += "".concat(str, "</span>");
@@ -71815,7 +71862,7 @@
     return function_str;
   }
   function rangeSetValue(ctx, cellInput, selected, fxInput) {
-    var _document$activeEleme;
+    var _document$activeEleme, _ctx$active_f;
     var $editor = cellInput;
     var $copyTo = fxInput;
     if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
@@ -71825,13 +71872,14 @@
     var range = "";
     var rf = selected.row[0];
     var cf = selected.column[0];
+    var sheetId = ((_ctx$active_f = ctx.active_f) === null || _ctx$active_f === void 0 ? void 0 : _ctx$active_f.sheetId) || ctx.formulaCache.rangetosheet;
     if (ctx.config.merge != null && "".concat(rf, "_").concat(cf) in ctx.config.merge) {
       range = getRangetxt(ctx, ctx.currentSheetId, {
         column: [cf, cf],
         row: [rf, rf]
-      }, ctx.formulaCache.rangetosheet);
+      }, sheetId);
     } else {
-      range = getRangetxt(ctx, ctx.currentSheetId, selected, ctx.formulaCache.rangetosheet);
+      range = getRangetxt(ctx, ctx.currentSheetId, selected, sheetId);
     }
     if (!israngeseleciton(ctx) && (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start)) {
       var span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
@@ -71839,8 +71887,8 @@
         span.innerHTML = range;
         setCaretPosition(ctx, span, 0, range.length);
       }
-    } else {
-      var function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(colors[functionHTMLIndex], ";\">").concat(range, "</span>");
+    } else if (ctx.active_f) {
+      var function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
       var newEle = parseElement(function_str);
       var refEle = ctx.formulaCache.rangeSetValueTo;
       if (refEle && refEle.parentNode) {
@@ -71852,6 +71900,19 @@
       var _span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
       setCaretPosition(ctx, _span, 0, range.length);
       functionHTMLIndex += 1;
+    } else {
+      var _function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
+      var _newEle = parseElement(_function_str);
+      var _refEle = ctx.formulaCache.rangeSetValueTo;
+      if (_refEle && _refEle.parentNode) {
+        _refEle.parentNode.insertBefore(_newEle, _refEle.nextSibling);
+      } else {
+        $editor.appendChild(_newEle);
+      }
+      ctx.formulaCache.rangechangeindex = functionHTMLIndex;
+      var _span2 = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
+      setCaretPosition(ctx, _span2, 0, range.length);
+      functionHTMLIndex += 1;
     }
     if ($copyTo) $copyTo.innerHTML = $editor.innerHTML;
   }
@@ -72174,6 +72235,20 @@
     };
     while (i < funcstack.length) {
       var s = funcstack[i];
+      var nextS = funcstack[i + 1];
+      if (s === "{" && nextS === "{") {
+        var nextI = funcstack === null || funcstack === void 0 ? void 0 : funcstack.findIndex(function (__, index) {
+          if (i < index && funcstack[index] === "}" && funcstack[index + 1] === "}") {
+            return true;
+          }
+          return false;
+        });
+        if (nextI !== -1) {
+          function_str += txt.substring(i, nextI + 2);
+          i = nextI + 2;
+          continue;
+        }
+      }
       if (s === "(" && matchConfig.dquote === 0) {
         matchConfig.bracket += 1;
         if (str.length > 0) {
@@ -74647,11 +74722,11 @@
     ctx.formulaCache.rangedrag_column_start = false;
     ctx.formulaCache.rangedrag_row_start = false;
   }
-  function updateCell(ctx, r, c, $input, value, canvas) {
+  function updateCell(ctx, r, c, $input, value, canvas, sheetId) {
     var _inputText, _curv, _ctx$hooks$beforeUpda, _ctx$hooks, _curv2;
     var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
     var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
-    var flowdata = getFlowdata(ctx);
+    var flowdata = getFlowdata(ctx, sheetId);
     if (!flowdata) return;
     var index = getSheetIndex(ctx, ctx.currentSheetId);
     var dataVerification = ctx.luckysheetfile[index].dataVerification;
@@ -79805,7 +79880,19 @@
         ctx.luckysheet_select_save = range;
       }
     }
+    file.luckysheet_select_save = undefined;
+    ctx.luckysheet_select_save = undefined;
     refreshLocalMergeData(merge_new, file);
+    if (ctx.hooks.rowColChange) {
+      ctx.hooks.rowColChange({
+        action: "add",
+        type: type,
+        index: index,
+        count: count,
+        direction: direction,
+        id: id
+      });
+    }
   }
   function deleteRowCol(ctx, op) {
     var type = op.type;
@@ -80537,6 +80624,15 @@
     if (file.id === ctx.currentSheetId) {
       ctx.config = cfg;
     }
+    if (ctx.hooks.rowColChange) {
+      ctx.hooks.rowColChange({
+        action: "delete",
+        type: type,
+        index: start,
+        count: end - start + 1,
+        id: id
+      });
+    }
   }
   function hideSelected(ctx, type) {
     if (!ctx.luckysheet_select_save || ctx.luckysheet_select_save.length > 1) return "noMulti";
@@ -85696,7 +85792,6 @@
             if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
               var f = "=".concat(functionCopy(ctx, cell.f, "down", j - apply_str_r + 1));
               var v = execfunction(ctx, f, j, i);
-              execFunctionGroup(ctx, j, i, v[1], undefined, d);
               var _v = _slicedToArray$2(v, 3);
               cell.v = _v[1];
               cell.f = _v[2];
@@ -85778,7 +85873,6 @@
             if ((_cell === null || _cell === void 0 ? void 0 : _cell.f) != null) {
               var _f = "=".concat(functionCopy(ctx, _cell.f, "up", apply_end_r - _j + 1));
               var _v2 = execfunction(ctx, _f, _j, i);
-              execFunctionGroup(ctx, _j, i, _v2[1], undefined, d);
               var _v3 = _slicedToArray$2(_v2, 3);
               _cell.v = _v3[1];
               _cell.f = _v3[2];
@@ -85859,7 +85953,6 @@
             if ((_cell2 === null || _cell2 === void 0 ? void 0 : _cell2.f) != null) {
               var _f2 = "=".concat(functionCopy(ctx, _cell2.f, "right", _j2 - apply_str_c + 1));
               var _v4 = execfunction(ctx, _f2, _i23, _j2);
-              execFunctionGroup(ctx, _j2, _i23, _v4[1], undefined, d);
               var _v5 = _slicedToArray$2(_v4, 3);
               _cell2.v = _v5[1];
               _cell2.f = _v5[2];
@@ -85934,7 +86027,6 @@
             if ((_cell3 === null || _cell3 === void 0 ? void 0 : _cell3.f) != null) {
               var _f3 = "=".concat(functionCopy(ctx, _cell3.f, "left", apply_end_c - _j3 + 1));
               var _v6 = execfunction(ctx, _f3, _i23, _j3);
-              execFunctionGroup(ctx, _j3, _i23, _v6[1], undefined, d);
               var _v7 = _slicedToArray$2(_v6, 3);
               _cell3.v = _v7[1];
               _cell3.f = _v7[2];
@@ -86005,28 +86097,6 @@
         }
       }
     }
-    var cdformat = file.luckysheet_conditionformat_save;
-    if (cdformat != null && cdformat.length > 0) {
-      for (var _i24 = 0; _i24 < cdformat.length; _i24 += 1) {
-        var cdformat_cellrange = cdformat[_i24].cellrange;
-        var emptyRange = [];
-        for (var _j4 = 0; _j4 < cdformat_cellrange.length; _j4 += 1) {
-          var range = CFSplitRange(cdformat_cellrange[_j4], {
-            row: copyRange.row,
-            column: copyRange.column
-          }, {
-            row: applyRange.row,
-            column: applyRange.column
-          }, "operatePart");
-          if (range.length > 0) {
-            emptyRange = emptyRange.concat(range);
-          }
-        }
-        if (emptyRange.length > 0) {
-          cdformat[_i24].cellrange.push(applyRange);
-        }
-      }
-    }
     jfrefreshgrid(ctx, d, ctx.luckysheet_select_save);
   }
   function onDropCellSelectEnd(ctx, e, container) {
@@ -90695,7 +90765,7 @@
       ctx.luckysheet_selection_range = [];
     }
     var allowEdit = isAllowEdit(ctx);
-    if (ctx.luckysheetCellUpdate.length > 0 && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowDown" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
+    if ((ctx.luckysheetCellUpdate.length > 0 || ctx.active_f) && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowDown" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
       return;
     }
     if (kstr === "Enter") {
@@ -90876,8 +90946,8 @@
       if (isInSelection) return;
     }
     ctx.luckysheet_scroll_status = true;
-    if (ctx.luckysheetCellUpdate.length > 0) {
-      if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
+    if (ctx.luckysheetCellUpdate.length > 0 || ctx.active_f) {
+      if (ctx.active_f || ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
         var _$last;
         var rowseleted = [row_index, row_index_ed];
         var columnseleted = [col_index, col_index_ed];
@@ -90996,7 +91066,7 @@
             row_focus: row_index,
             column_focus: col_index
           };
-        } else {
+        } else if (ctx.active_f) ; else {
           ctx.formulaCache.func_selectedrange = {
             left: left,
             width: width,
@@ -92780,18 +92850,28 @@
     var result = [];
     var borderInfo = [];
     var merge = {};
-    var startOffColIndexMap = {};
     for (var index = 0; index < (rows === null || rows === void 0 ? void 0 : rows.length); index += 1) {
       var row = rows[index];
-      var isFirstNoRs = false;
       var cells = Array.from(row.querySelectorAll("td")).slice(0, currentColLen);
       if (!result[index]) {
         result[index] = [];
       }
+      if (copyRich) {
+        for (var _offIndex = 0; _offIndex < result[index].length; _offIndex++) {
+          var offNumber = result[index][_offIndex];
+          if (offNumber === null || offNumber === void 0 ? void 0 : offNumber._mc) {
+            cells.splice(_offIndex, 0, null);
+          }
+        }
+      }
       var offsetColIndex = 0;
       for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
-        var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
+        var _colIndex = startCol + offsetColIndex;
         var cell = cells[cIndex];
+        if (cell === null) {
+          offsetColIndex++;
+          continue;
+        }
         var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
         var v = cell.getAttribute("x:num");
         var f = cell.getAttribute("f");
@@ -92818,40 +92898,31 @@
             merge["".concat(index + startRow, "_").concat(_colIndex)] = mainCell.mc;
             borderInfo.push.apply(borderInfo, _toConsumableArray$2(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
           } else {
-            isFirstNoRs = true;
             borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
           }
-          result[index].push(mainCell);
-          if (rowspan > 1) {
-            for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
-              if (!result[index + rs_index]) {
-                result[index + rs_index] = [];
+          result[index][offsetColIndex] = mainCell;
+          if (rowspan > 1 || colspan > 1) {
+            for (var rs_index = 0; rs_index < rowspan; rs_index += 1) {
+              var nextR = index + rs_index;
+              if (!result[nextR]) {
+                result[nextR] = [];
               }
-              result[index + rs_index].push({
-                mc: {
-                  r: index + startRow,
-                  c: _colIndex
-                }
-              });
-              if (!isFirstNoRs) {
-                if (!startOffColIndexMap[index + rs_index]) {
-                  startOffColIndexMap[index + rs_index] = 0;
+              for (var _cIndex = 0; _cIndex < colspan; _cIndex++) {
+                if (rs_index === 0 && _cIndex === 0) {
+                  continue;
                 }
-                startOffColIndexMap[index + rs_index] += colspan || 1;
+                var nextC = offsetColIndex + _cIndex;
+                result[nextR][nextC] = {
+                  _mc: true,
+                  mc: {
+                    r: index + startRow,
+                    c: _colIndex
+                  }
+                };
               }
             }
           }
-          if (colspan > 1) {
-            for (var cs_index = 1; cs_index < colspan; cs_index += 1) {
-              result[index].push({
-                mc: {
-                  r: index + startRow,
-                  c: _colIndex
-                }
-              });
-            }
-          }
-          offsetColIndex += colspan || 1;
+          offsetColIndex = (colspan || 1) + offsetColIndex;
         } else {
           var item = f ? {
             f: f
@@ -92864,7 +92935,14 @@
       }
     }
     return {
-      data: result,
+      data: result === null || result === void 0 ? void 0 : result.map(function (item) {
+        return item === null || item === void 0 ? void 0 : item.map(function (cell) {
+          if (cell === null || cell === void 0 ? void 0 : cell._mc) {
+            delete cell._mc;
+          }
+          return cell;
+        });
+      }),
       borderInfo: borderInfo,
       merge: merge
     };
@@ -101878,7 +101956,7 @@
         }
         var _update = ((_luckysheetCellUpdate = luckysheetCellUpdate) === null || _luckysheetCellUpdate === void 0 ? void 0 : _luckysheetCellUpdate.length) > 0 ? luckysheetCellUpdate : draftCtx.luckysheetCellUpdate;
         if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) {
-          updateCell(draftCtx, _update[0], _update[1], refs.cellInput.current, undefined, refs.canvas.current.getContext("2d"));
+          updateCell(draftCtx, _update[0], _update[1], refs.cellInput.current, undefined, refs.canvas.current.getContext("2d"), sheetId);
         }
         draftCtx.dataVerificationDropDownList = false;
         draftCtx.currentSheetId = sheet.id;