@leankylin-sheet/core 4.0.0 → 4.0.2

package/dist/api/range.d.ts

@@ -19,4 +19,5 @@ export declare function getCellsByRange(ctx: Context, range: Selection, options?
 export declare function getHtmlByRange(ctx: Context, range: Range, options?: CommonOptions): string | null;
 export declare function setSelection(ctx: Context, range: Range, options: CommonOptions): void;
 export declare function setCellValuesByRange(ctx: Context, data: any[][], range: SingleRange, cellInput: HTMLDivElement | null, options?: CommonOptions): void;
+export declare function setCellValues(ctx: Context, data: any[], cellInput: HTMLDivElement | null, options?: CommonOptions): void;
 export declare function setCellFormatByRange(ctx: Context, attr: keyof Cell, value: any, range: Range | SingleRange, options?: CommonOptions): void;

package/dist/index.esm.js

@@ -36580,22 +36580,15 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  var result_i = 0;
   for (var _i17 = 0; _i17 < functionlist.length; _i17 += 1) {
     var item = functionlist[_i17];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
-      result_i += 1;
     } else if (_.startsWith(n, searchtxt)) {
       s.unshift(item);
-      result_i += 1;
     } else if (n.indexOf(searchtxt) > -1) {
       t.unshift(item);
-      result_i += 1;
-    }
-    if (result_i >= 10) {
-      break;
     }
   }
   var list = [].concat(f, s, t);
@@ -36693,7 +36686,7 @@ function helpFunctionExe($editer, currSelection, ctx) {
 function rangeHightlightselected(ctx, $editor) {
   var currSelection = getrangeseleciton();
   if (!currSelection) return;
-  var currText = _.trim(currSelection.textContent || "");
+  var currText = _.trimStart(currSelection.textContent || "");
   if (currText === null || currText === void 0 ? void 0 : currText.match(/^[a-zA-Z_]+$/)) {
     searchFunction(ctx, currText.toUpperCase());
     ctx.functionHint = null;
@@ -36811,7 +36804,7 @@ function functionHTML(txt) {
       } else if (matchConfig.dquote > 0) {
         function_str += "".concat(str, "</span>");
       } else if (str.indexOf("</span>") === -1 && str.length > 0) {
-        var regx = /{.*?}/;
+        var regx = /{{.*?}}/;
         if (regx.test(_.trim(str))) {
           var arraytxt = regx.exec(str)[0];
           var arraystart = str.search(regx);
@@ -36819,7 +36812,7 @@ function functionHTML(txt) {
           if (arraystart > 0) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(0, arraystart), "</span>");
           }
-          alltxt += "<span dir=\"auto\" style=\"color:#959a05\" class=\"luckysheet-formula-text-array\">".concat(arraytxt, "</span>");
+          alltxt += "<span dir=\"auto\" style=\"color:#3b82f4\" class=\"luckysheet-formula-text-var\">".concat(arraytxt, "</span>");
           if (arraystart + arraytxt.length < str.length) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(arraystart + arraytxt.length, str.length), "</span>");
           }
@@ -36857,7 +36850,9 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
   var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;
   var value = $editor.innerText;
   value = escapeScriptTag(value);
-  if (value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1)) {
+  var hasF = value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1);
+  var lastHasF = _.startsWith(value1txt, "=") && !_.startsWith(value, "=");
+  if (hasF) {
     if (!refreshRangeSelect) rangeIndexes = getRangeIndexes($editor);
     value = functionHTMLGenerate(value);
     if (!refreshRangeSelect && functionHTMLIndex < rangeIndexes.length) refreshRangeSelect = true;
@@ -36882,19 +36877,10 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
     $editor.innerHTML = value;
     if ($copyTo) $copyTo.innerHTML = value;
     functionRange(ctx, $editor, value, value1);
-    if (refreshRangeSelect) {
-      cancelFunctionrangeSelected(ctx);
-      if (kcode !== 46) {
-        createRangeHightlight(ctx, value);
-      }
-      ctx.formulaCache.rangestart = false;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
-      rangeHightlightselected(ctx, $editor);
-    }
-  } else if (_.startsWith(value1txt, "=") && !_.startsWith(value, "=")) {
+  } else if (lastHasF) {
     if ($copyTo) $copyTo.innerHTML = value;
     $editor.innerHTML = escapeHTMLTag(value);
+    ctx.formulaCache.functionRangeIndex = [0, 1];
   } else if (!_.startsWith(value1txt, "=")) {
     if (!$copyTo) return;
     if ($copyTo.id === "luckysheet-rich-text-editor") {
@@ -36905,6 +36891,18 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
       $copyTo.innerHTML = escapeHTMLTag(value);
     }
   }
+  if (hasF || lastHasF) {
+    if (refreshRangeSelect) {
+      cancelFunctionrangeSelected(ctx);
+      if (kcode !== 46) {
+        createRangeHightlight(ctx, value);
+      }
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, $editor);
+    }
+  }
 }
 function isfreezonFuc(txt) {
   var row = txt.replace(/[^0-9]/g, "");
@@ -42218,6 +42216,11 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
   }
   return "<table data-type=\"leankylin-copy-action-table\">".concat(colgroup).concat(cpdata, "</table>");
 }
+function ptToPx(pt) {
+  var ppi = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 96;
+  var px = pt * (ppi / 72);
+  return parseFloat(px.toFixed(2));
+}
 function cellAttrToDomStyle(cell, cellBorderInfo) {
   var _ref = cell || {},
     bg = _ref.bg,
@@ -42238,7 +42241,7 @@ function cellAttrToDomStyle(cell, cellBorderInfo) {
     2: "bottom"
   }[String(vt)] || "middle";
   var fontWeight = bl === 1 ? "bold" : "normal";
-  var fontSize = "".concat(parseInt(fs, 10), "px");
+  var fontSize = typeof fs === "number" ? ptToPx(fs) : "".concat(parseInt(fs, 10), "px");
   var result = {
     background: bg || "#fff",
     color: fc || "#000",
@@ -42279,6 +42282,7 @@ function copy(ctx) {
       var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
+      var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
@@ -42287,7 +42291,7 @@ function copy(ctx) {
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -51968,7 +51972,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config = this.sheetCtx.config) === null || _this$sheetCtx$config === void 0 ? void 0 : (_this$sheetCtx$config2 = _this$sheetCtx$config.rowhidden) === null || _this$sheetCtx$config2 === void 0 ? void 0 : _this$sheetCtx$config2[r]) == null) {
-          renderCtx.fillStyle = "#ffffff";
+          renderCtx.fillStyle = "#F8F9FA";
           renderCtx.fillRect(0, start_r + offsetTop + firstOffset, this.sheetCtx.rowHeaderWidth - 1, end_r - start_r + 1 + lastOffset - firstOffset);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -52061,7 +52065,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config5 = this.sheetCtx.config) === null || _this$sheetCtx$config5 === void 0 ? void 0 : (_this$sheetCtx$config6 = _this$sheetCtx$config5.colhidden) === null || _this$sheetCtx$config6 === void 0 ? void 0 : _this$sheetCtx$config6[c]) == null) {
-          renderCtx.fillStyle = "#ffffff";
+          renderCtx.fillStyle = "#F8F9FA";
           renderCtx.fillRect(start_c + offsetLeft - 1, 0, end_c - start_c, this.sheetCtx.columnHeaderHeight - 1);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -53814,10 +53818,6 @@ function createFilter(ctx) {
   if (_.size(ctx.luckysheet_select_save) > 1) {
     return;
   }
-  if (_.size(ctx.luckysheet_filter_save) > 0) {
-    clearFilter(ctx);
-    return;
-  }
   var sheetIndex = getSheetIndex(ctx, ctx.currentSheetId);
   if (sheetIndex == null || ctx.luckysheetfile[sheetIndex].isPivotTable) {
     return;
@@ -55886,6 +55886,19 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     }
   }
 }
+function setCellValues(ctx, data, cellInput) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  if (data == null) {
+    throw INVALID_PARAMS;
+  }
+  for (var j = 0; j < data.length; j += 1) {
+    var _data$j = data[j],
+      r = _data$j.r,
+      c = _data$j.c,
+      v = _data$j.v;
+    setCellValue$1(ctx, r, c, v, cellInput, options);
+  }
+}
 function setCellFormatByRange(ctx, attr, value, range) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   if (_.isPlainObject(range)) {
@@ -56010,6 +56023,7 @@ var index = /*#__PURE__*/Object.freeze({
   getHtmlByRange: getHtmlByRange,
   setSelection: setSelection,
   setCellValuesByRange: setCellValuesByRange,
+  setCellValues: setCellValues,
   setCellFormatByRange: setCellFormatByRange,
   mergeCells: mergeCells$1,
   cancelMerge: cancelMerge,
@@ -56030,8 +56044,12 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  toolbarRightRender: undefined,
+  onClickContentEditable: undefined,
+  renderCustomColor: undefined,
   renderFormulaHint: undefined,
   renderFormulaSearch: undefined,
+  renderEditorSelector: undefined,
   copyRich: false,
   renderCalcInfo: undefined,
   renderFreezeCol: undefined,
@@ -59652,14 +59670,32 @@ var getCellBorder = function getCellBorder(domStyle, row_index, col_index) {
   };
 };
 var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_index, mc) {
-  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle"], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle"], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle"], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle"]];
+  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex) {
+    return [curIndex, curIndex];
+  }], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle", function (curIndex) {
+    return [curIndex, curIndex];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle", function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }]];
   var result = [];
   for (var index = 0; index < keys.length; index += 1) {
-    var _keys$index2 = _slicedToArray(keys[index], 4),
+    var _keys$index2 = _slicedToArray(keys[index], 6),
       p = _keys$index2[0],
       w = _keys$index2[1],
       c = _keys$index2[2],
-      s = _keys$index2[3];
+      s = _keys$index2[3],
+      getRow = _keys$index2[4],
+      getColumn = _keys$index2[5];
     if (parseFloat(domStyle[w]) > 0 && domStyle[s] !== "inset") {
       var _getQKBorder = getQKBorder(domStyle[w], domStyle[s], domStyle[c]),
         _getQKBorder2 = _slicedToArray(_getQKBorder, 2),
@@ -59671,8 +59707,8 @@ var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_ind
         color: color,
         style: style,
         range: normalizeSelection(ctx, [{
-          row: [row_index, row_index + mc.rs - 1],
-          column: [col_index, col_index + mc.cs - 1]
+          row: getRow(row_index, mc.rs),
+          column: getColumn(col_index, mc.cs)
         }])
       });
     }
@@ -59719,34 +59755,73 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   var result = [];
   var borderInfo = [];
+  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 = row.querySelectorAll("td");
     if (!result[index]) {
       result[index] = [];
     }
+    var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
+      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
+      var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
         var mainCell = _objectSpread2({
           v: v || m,
-          m: m || v
+          m: m || v,
+          f: f || undefined
         }, domStyleToCellAttr(style));
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {
             rs: rowspan,
-            cs: colspan
+            cs: colspan,
+            r: index + startRow,
+            c: _colIndex
           };
-          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, cIndex + startCol, mainCell.mc)));
+          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          borderInfo.push(getCellBorder(style, index + startRow, cIndex + startCol));
+          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 + rs_index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+            if (!isFirstNoRs) {
+              if (!startOffColIndexMap[index + rs_index]) {
+                startOffColIndexMap[index + rs_index] = 0;
+              }
+              startOffColIndexMap[index + rs_index] += colspan || 1;
+            }
+          }
+        }
+        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;
       } else {
         result[index].push({
           m: m,
@@ -59760,57 +59835,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     borderInfo: borderInfo
   };
 }
-function expandMergedCells(mergedCells, startRow, startCol) {
-  if (!mergedCells || mergedCells.length === 0) {
-    return [];
-  }
-  var totalRows = mergedCells === null || mergedCells === void 0 ? void 0 : mergedCells.length;
-  var totalCols = 0;
-  for (var j = 0; j < mergedCells[0].length; j += 1) {
-    var _mergedCells$0$j, _mergedCells$0$j$mc;
-    totalCols += ((_mergedCells$0$j = mergedCells[0][j]) === null || _mergedCells$0$j === void 0 ? void 0 : (_mergedCells$0$j$mc = _mergedCells$0$j.mc) === null || _mergedCells$0$j$mc === void 0 ? void 0 : _mergedCells$0$j$mc.cs) || 1;
-  }
-  var result = Array.from({
-    length: totalRows
-  }, function () {
-    return new Array(totalCols);
-  });
-  var currentRow = 0;
-  for (var i = 0; i < mergedCells.length; i += 1) {
-    var currentCol = 0;
-    var rowHeight = 0;
-    for (var _j7 = 0; _j7 < mergedCells[i].length; _j7 += 1) {
-      var _cell$mc2, _cell$mc3;
-      var cell = mergedCells[i][_j7];
-      var rs = (cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.rs) || 1;
-      var cs = (cell === null || cell === void 0 ? void 0 : (_cell$mc3 = cell.mc) === null || _cell$mc3 === void 0 ? void 0 : _cell$mc3.cs) || 1;
-      rowHeight = Math.max(rowHeight, rs);
-      for (var r = 0; r < rs; r += 1) {
-        for (var c = 0; c < cs; c += 1) {
-          var mcR = currentRow + startRow;
-          var mcC = currentCol + startCol;
-          if (r === 0 && c === 0) {
-            result[currentRow + r][currentCol + c] = _objectSpread2({}, cell);
-            if (result[currentRow + r][currentCol + c].mc) {
-              result[currentRow + r][currentCol + c].mc.r = mcR;
-              result[currentRow + r][currentCol + c].mc.c = mcC;
-            }
-          } else {
-            result[currentRow + r][currentCol + c] = {
-              mc: {
-                r: mcR,
-                c: mcC
-              }
-            };
-          }
-        }
-      }
-      currentCol += cs;
-    }
-    currentRow += rowHeight;
-  }
-  return result;
-}
 function handlePasteByLeanklin(_x2, _x3, _x4) {
   return _handlePasteByLeanklin.apply(this, arguments);
 }
@@ -59846,7 +59870,7 @@ function _handlePasteByLeanklin() {
           }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
-          data = expandMergedCells(copyData, rows[0], columns[0]);
+          data = copyData;
           copyOne = data.length === 1 && data[0].length === 1 && !((_data$0$ = data[0][0]) === null || _data$0$ === void 0 ? void 0 : _data$0$.mc);
           pasteData = copyOne ? [] : data;
           if (copyOne) {
@@ -59897,4 +59921,4 @@ function handlePasteByClick(ctx, triggerType) {
   } else if (data.indexOf("leankylin-copy-action-image") > -1) ; else ;
 }
 
-export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, copy2, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getClipboardContent, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaDragOver, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellDrop, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePasteByLeanklin, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };
+export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, copy2, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getClipboardContent, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, getrangeseleciton, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaDragOver, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellDrop, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePasteByLeanklin, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };

package/dist/index.js

@@ -36590,22 +36590,15 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  var result_i = 0;
   for (var _i17 = 0; _i17 < functionlist.length; _i17 += 1) {
     var item = functionlist[_i17];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
-      result_i += 1;
     } else if (___default['default'].startsWith(n, searchtxt)) {
       s.unshift(item);
-      result_i += 1;
     } else if (n.indexOf(searchtxt) > -1) {
       t.unshift(item);
-      result_i += 1;
-    }
-    if (result_i >= 10) {
-      break;
     }
   }
   var list = [].concat(f, s, t);
@@ -36703,7 +36696,7 @@ function helpFunctionExe($editer, currSelection, ctx) {
 function rangeHightlightselected(ctx, $editor) {
   var currSelection = getrangeseleciton();
   if (!currSelection) return;
-  var currText = ___default['default'].trim(currSelection.textContent || "");
+  var currText = ___default['default'].trimStart(currSelection.textContent || "");
   if (currText === null || currText === void 0 ? void 0 : currText.match(/^[a-zA-Z_]+$/)) {
     searchFunction(ctx, currText.toUpperCase());
     ctx.functionHint = null;
@@ -36821,7 +36814,7 @@ function functionHTML(txt) {
       } else if (matchConfig.dquote > 0) {
         function_str += "".concat(str, "</span>");
       } else if (str.indexOf("</span>") === -1 && str.length > 0) {
-        var regx = /{.*?}/;
+        var regx = /{{.*?}}/;
         if (regx.test(___default['default'].trim(str))) {
           var arraytxt = regx.exec(str)[0];
           var arraystart = str.search(regx);
@@ -36829,7 +36822,7 @@ function functionHTML(txt) {
           if (arraystart > 0) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(0, arraystart), "</span>");
           }
-          alltxt += "<span dir=\"auto\" style=\"color:#959a05\" class=\"luckysheet-formula-text-array\">".concat(arraytxt, "</span>");
+          alltxt += "<span dir=\"auto\" style=\"color:#3b82f4\" class=\"luckysheet-formula-text-var\">".concat(arraytxt, "</span>");
           if (arraystart + arraytxt.length < str.length) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(arraystart + arraytxt.length, str.length), "</span>");
           }
@@ -36867,7 +36860,9 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
   var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;
   var value = $editor.innerText;
   value = escapeScriptTag(value);
-  if (value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1)) {
+  var hasF = value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1);
+  var lastHasF = ___default['default'].startsWith(value1txt, "=") && !___default['default'].startsWith(value, "=");
+  if (hasF) {
     if (!refreshRangeSelect) rangeIndexes = getRangeIndexes($editor);
     value = functionHTMLGenerate(value);
     if (!refreshRangeSelect && functionHTMLIndex < rangeIndexes.length) refreshRangeSelect = true;
@@ -36892,19 +36887,10 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
     $editor.innerHTML = value;
     if ($copyTo) $copyTo.innerHTML = value;
     functionRange(ctx, $editor, value, value1);
-    if (refreshRangeSelect) {
-      cancelFunctionrangeSelected(ctx);
-      if (kcode !== 46) {
-        createRangeHightlight(ctx, value);
-      }
-      ctx.formulaCache.rangestart = false;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
-      rangeHightlightselected(ctx, $editor);
-    }
-  } else if (___default['default'].startsWith(value1txt, "=") && !___default['default'].startsWith(value, "=")) {
+  } else if (lastHasF) {
     if ($copyTo) $copyTo.innerHTML = value;
     $editor.innerHTML = escapeHTMLTag(value);
+    ctx.formulaCache.functionRangeIndex = [0, 1];
   } else if (!___default['default'].startsWith(value1txt, "=")) {
     if (!$copyTo) return;
     if ($copyTo.id === "luckysheet-rich-text-editor") {
@@ -36915,6 +36901,18 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
       $copyTo.innerHTML = escapeHTMLTag(value);
     }
   }
+  if (hasF || lastHasF) {
+    if (refreshRangeSelect) {
+      cancelFunctionrangeSelected(ctx);
+      if (kcode !== 46) {
+        createRangeHightlight(ctx, value);
+      }
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, $editor);
+    }
+  }
 }
 function isfreezonFuc(txt) {
   var row = txt.replace(/[^0-9]/g, "");
@@ -42228,6 +42226,11 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
   }
   return "<table data-type=\"leankylin-copy-action-table\">".concat(colgroup).concat(cpdata, "</table>");
 }
+function ptToPx(pt) {
+  var ppi = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 96;
+  var px = pt * (ppi / 72);
+  return parseFloat(px.toFixed(2));
+}
 function cellAttrToDomStyle(cell, cellBorderInfo) {
   var _ref = cell || {},
     bg = _ref.bg,
@@ -42248,7 +42251,7 @@ function cellAttrToDomStyle(cell, cellBorderInfo) {
     2: "bottom"
   }[String(vt)] || "middle";
   var fontWeight = bl === 1 ? "bold" : "normal";
-  var fontSize = "".concat(parseInt(fs, 10), "px");
+  var fontSize = typeof fs === "number" ? ptToPx(fs) : "".concat(parseInt(fs, 10), "px");
   var result = {
     background: bg || "#fff",
     color: fc || "#000",
@@ -42289,6 +42292,7 @@ function copy(ctx) {
       var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
+      var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
@@ -42297,7 +42301,7 @@ function copy(ctx) {
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -51978,7 +51982,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config = this.sheetCtx.config) === null || _this$sheetCtx$config === void 0 ? void 0 : (_this$sheetCtx$config2 = _this$sheetCtx$config.rowhidden) === null || _this$sheetCtx$config2 === void 0 ? void 0 : _this$sheetCtx$config2[r]) == null) {
-          renderCtx.fillStyle = "#ffffff";
+          renderCtx.fillStyle = "#F8F9FA";
           renderCtx.fillRect(0, start_r + offsetTop + firstOffset, this.sheetCtx.rowHeaderWidth - 1, end_r - start_r + 1 + lastOffset - firstOffset);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -52071,7 +52075,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config5 = this.sheetCtx.config) === null || _this$sheetCtx$config5 === void 0 ? void 0 : (_this$sheetCtx$config6 = _this$sheetCtx$config5.colhidden) === null || _this$sheetCtx$config6 === void 0 ? void 0 : _this$sheetCtx$config6[c]) == null) {
-          renderCtx.fillStyle = "#ffffff";
+          renderCtx.fillStyle = "#F8F9FA";
           renderCtx.fillRect(start_c + offsetLeft - 1, 0, end_c - start_c, this.sheetCtx.columnHeaderHeight - 1);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -53824,10 +53828,6 @@ function createFilter(ctx) {
   if (___default['default'].size(ctx.luckysheet_select_save) > 1) {
     return;
   }
-  if (___default['default'].size(ctx.luckysheet_filter_save) > 0) {
-    clearFilter(ctx);
-    return;
-  }
   var sheetIndex = getSheetIndex(ctx, ctx.currentSheetId);
   if (sheetIndex == null || ctx.luckysheetfile[sheetIndex].isPivotTable) {
     return;
@@ -55896,6 +55896,19 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     }
   }
 }
+function setCellValues(ctx, data, cellInput) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  if (data == null) {
+    throw INVALID_PARAMS;
+  }
+  for (var j = 0; j < data.length; j += 1) {
+    var _data$j = data[j],
+      r = _data$j.r,
+      c = _data$j.c,
+      v = _data$j.v;
+    setCellValue$1(ctx, r, c, v, cellInput, options);
+  }
+}
 function setCellFormatByRange(ctx, attr, value, range) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   if (___default['default'].isPlainObject(range)) {
@@ -56020,6 +56033,7 @@ var index = /*#__PURE__*/Object.freeze({
   getHtmlByRange: getHtmlByRange,
   setSelection: setSelection,
   setCellValuesByRange: setCellValuesByRange,
+  setCellValues: setCellValues,
   setCellFormatByRange: setCellFormatByRange,
   mergeCells: mergeCells$1,
   cancelMerge: cancelMerge,
@@ -56040,8 +56054,12 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  toolbarRightRender: undefined,
+  onClickContentEditable: undefined,
+  renderCustomColor: undefined,
   renderFormulaHint: undefined,
   renderFormulaSearch: undefined,
+  renderEditorSelector: undefined,
   copyRich: false,
   renderCalcInfo: undefined,
   renderFreezeCol: undefined,
@@ -59662,14 +59680,32 @@ var getCellBorder = function getCellBorder(domStyle, row_index, col_index) {
   };
 };
 var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_index, mc) {
-  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle"], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle"], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle"], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle"]];
+  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex) {
+    return [curIndex, curIndex];
+  }], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle", function (curIndex) {
+    return [curIndex, curIndex];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle", function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }]];
   var result = [];
   for (var index = 0; index < keys.length; index += 1) {
-    var _keys$index2 = _slicedToArray(keys[index], 4),
+    var _keys$index2 = _slicedToArray(keys[index], 6),
       p = _keys$index2[0],
       w = _keys$index2[1],
       c = _keys$index2[2],
-      s = _keys$index2[3];
+      s = _keys$index2[3],
+      getRow = _keys$index2[4],
+      getColumn = _keys$index2[5];
     if (parseFloat(domStyle[w]) > 0 && domStyle[s] !== "inset") {
       var _getQKBorder = getQKBorder(domStyle[w], domStyle[s], domStyle[c]),
         _getQKBorder2 = _slicedToArray(_getQKBorder, 2),
@@ -59681,8 +59717,8 @@ var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_ind
         color: color,
         style: style,
         range: normalizeSelection(ctx, [{
-          row: [row_index, row_index + mc.rs - 1],
-          column: [col_index, col_index + mc.cs - 1]
+          row: getRow(row_index, mc.rs),
+          column: getColumn(col_index, mc.cs)
         }])
       });
     }
@@ -59729,34 +59765,73 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   var result = [];
   var borderInfo = [];
+  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 = row.querySelectorAll("td");
     if (!result[index]) {
       result[index] = [];
     }
+    var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
+      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
+      var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
         var mainCell = _objectSpread2({
           v: v || m,
-          m: m || v
+          m: m || v,
+          f: f || undefined
         }, domStyleToCellAttr(style));
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {
             rs: rowspan,
-            cs: colspan
+            cs: colspan,
+            r: index + startRow,
+            c: _colIndex
           };
-          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, cIndex + startCol, mainCell.mc)));
+          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          borderInfo.push(getCellBorder(style, index + startRow, cIndex + startCol));
+          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 + rs_index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+            if (!isFirstNoRs) {
+              if (!startOffColIndexMap[index + rs_index]) {
+                startOffColIndexMap[index + rs_index] = 0;
+              }
+              startOffColIndexMap[index + rs_index] += colspan || 1;
+            }
+          }
+        }
+        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;
       } else {
         result[index].push({
           m: m,
@@ -59770,57 +59845,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     borderInfo: borderInfo
   };
 }
-function expandMergedCells(mergedCells, startRow, startCol) {
-  if (!mergedCells || mergedCells.length === 0) {
-    return [];
-  }
-  var totalRows = mergedCells === null || mergedCells === void 0 ? void 0 : mergedCells.length;
-  var totalCols = 0;
-  for (var j = 0; j < mergedCells[0].length; j += 1) {
-    var _mergedCells$0$j, _mergedCells$0$j$mc;
-    totalCols += ((_mergedCells$0$j = mergedCells[0][j]) === null || _mergedCells$0$j === void 0 ? void 0 : (_mergedCells$0$j$mc = _mergedCells$0$j.mc) === null || _mergedCells$0$j$mc === void 0 ? void 0 : _mergedCells$0$j$mc.cs) || 1;
-  }
-  var result = Array.from({
-    length: totalRows
-  }, function () {
-    return new Array(totalCols);
-  });
-  var currentRow = 0;
-  for (var i = 0; i < mergedCells.length; i += 1) {
-    var currentCol = 0;
-    var rowHeight = 0;
-    for (var _j7 = 0; _j7 < mergedCells[i].length; _j7 += 1) {
-      var _cell$mc2, _cell$mc3;
-      var cell = mergedCells[i][_j7];
-      var rs = (cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.rs) || 1;
-      var cs = (cell === null || cell === void 0 ? void 0 : (_cell$mc3 = cell.mc) === null || _cell$mc3 === void 0 ? void 0 : _cell$mc3.cs) || 1;
-      rowHeight = Math.max(rowHeight, rs);
-      for (var r = 0; r < rs; r += 1) {
-        for (var c = 0; c < cs; c += 1) {
-          var mcR = currentRow + startRow;
-          var mcC = currentCol + startCol;
-          if (r === 0 && c === 0) {
-            result[currentRow + r][currentCol + c] = _objectSpread2({}, cell);
-            if (result[currentRow + r][currentCol + c].mc) {
-              result[currentRow + r][currentCol + c].mc.r = mcR;
-              result[currentRow + r][currentCol + c].mc.c = mcC;
-            }
-          } else {
-            result[currentRow + r][currentCol + c] = {
-              mc: {
-                r: mcR,
-                c: mcC
-              }
-            };
-          }
-        }
-      }
-      currentCol += cs;
-    }
-    currentRow += rowHeight;
-  }
-  return result;
-}
 function handlePasteByLeanklin(_x2, _x3, _x4) {
   return _handlePasteByLeanklin.apply(this, arguments);
 }
@@ -59856,7 +59880,7 @@ function _handlePasteByLeanklin() {
           }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
-          data = expandMergedCells(copyData, rows[0], columns[0]);
+          data = copyData;
           copyOne = data.length === 1 && data[0].length === 1 && !((_data$0$ = data[0][0]) === null || _data$0$ === void 0 ? void 0 : _data$0$.mc);
           pasteData = copyOne ? [] : data;
           if (copyOne) {
@@ -60044,6 +60068,7 @@ exports.getTypeItemHide = getTypeItemHide;
 exports.getcellFormula = getcellFormula;
 exports.getcellrange = getcellrange;
 exports.getdatabyselection = getdatabyselection;
+exports.getrangeseleciton = getrangeseleciton;
 exports.goToLink = goToLink;
 exports.groupValuesRefresh = groupValuesRefresh;
 exports.handleArrowKey = handleArrowKey;

package/dist/modules/formula.d.ts

@@ -40,6 +40,7 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
 } & Rect): void;
 export declare function createRangeHightlight(ctx: Context, inputInnerHtmlStr: string, ignoreRangeIndex?: number): void;
 export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
+export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
 export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
 export declare function functionHTMLGenerate(txt: string): string;
 export declare function handleFormulaInput(ctx: Context, $copyTo: HTMLDivElement | null | undefined, $editor: HTMLDivElement, kcode: number, preText?: string, refreshRangeSelect?: boolean): void;

package/dist/settings.d.ts

@@ -78,8 +78,12 @@ export type Hooks = {
     afterUpdateSheetName?: (id: string, oldName: string, newName: string) => void;
 };
 export type Settings = {
+    toolbarRightRender?: any;
+    onClickContentEditable?: any;
+    renderCustomColor?: any;
     renderFormulaHint?: any;
     renderFormulaSearch?: any;
+    renderEditorSelector?: any;
     copyRich?: boolean;
     renderCalcInfo?: any;
     renderFreezeCol?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "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.0",
+    "@leankylin-sheet/formula-parser": "4.0.2",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",