@leankylin-sheet/core 4.0.34 → 4.0.36

package/dist/context.d.ts

@@ -19,6 +19,7 @@ export type CellOptions = {
     render: any;
 }[];
 export type Context = {
+    active_f?: any;
     headerBgColor?: string;
     dragRangeSelect?: {
         top: number;

package/dist/index.esm.js

@@ -35379,6 +35379,9 @@ function valueShowEs(r, c, d) {
 }
 
 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;
@@ -36559,7 +36562,7 @@ function createRangeHightlight(ctx, inputInnerHtmlStr) {
         formulaRanges.push(_objectSpread2(_objectSpread2({
           rangeIndex: rangeIndex
         }, rect), {}, {
-          backgroundColor: colors[rangeIndex]
+          backgroundColor: getHLColor(rangeIndex)
         }));
       }
     }
@@ -36823,7 +36826,7 @@ function functionHTML(txt) {
     if (i === funcstack.length - 1) {
       if (iscelldata(_.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>");
@@ -37285,7 +37288,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
   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") {
@@ -37295,13 +37298,14 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
   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, "']"));
@@ -37309,8 +37313,8 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
       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) {
@@ -37322,6 +37326,19 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     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;
 }
@@ -40181,11 +40198,11 @@ function cancelNormalSelected(ctx) {
   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;
@@ -45437,6 +45454,8 @@ function insertRowCol(ctx, op) {
       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({
@@ -56465,7 +56484,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
     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") {
@@ -56646,8 +56665,8 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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];
@@ -56766,7 +56785,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           row_focus: row_index,
           column_focus: col_index
         };
-      } else {
+      } else if (ctx.active_f) ; else {
         ctx.formulaCache.func_selectedrange = {
           left: left,
           width: width,
@@ -60061,4 +60080,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, 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 };
+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, getHLColor, 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

@@ -35389,6 +35389,9 @@ function valueShowEs(r, c, d) {
 }
 
 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;
@@ -36569,7 +36572,7 @@ function createRangeHightlight(ctx, inputInnerHtmlStr) {
         formulaRanges.push(_objectSpread2(_objectSpread2({
           rangeIndex: rangeIndex
         }, rect), {}, {
-          backgroundColor: colors[rangeIndex]
+          backgroundColor: getHLColor(rangeIndex)
         }));
       }
     }
@@ -36833,7 +36836,7 @@ function functionHTML(txt) {
     if (i === funcstack.length - 1) {
       if (iscelldata(___default['default'].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>");
@@ -37295,7 +37298,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
   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") {
@@ -37305,13 +37308,14 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
   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, "']"));
@@ -37319,8 +37323,8 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
       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) {
@@ -37332,6 +37336,19 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     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;
 }
@@ -40191,11 +40208,11 @@ function cancelNormalSelected(ctx) {
   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;
@@ -45447,6 +45464,8 @@ function insertRowCol(ctx, op) {
       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({
@@ -56475,7 +56494,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
     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") {
@@ -56656,8 +56675,8 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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];
@@ -56776,7 +56795,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           row_focus: row_index,
           column_focus: col_index
         };
-      } else {
+      } else if (ctx.active_f) ; else {
         ctx.formulaCache.func_selectedrange = {
           left: left,
           width: width,
@@ -60180,6 +60199,7 @@ exports.getFontSet = getFontSet;
 exports.getFontStyleByCell = getFontStyleByCell;
 exports.getFrozenHandleLeft = getFrozenHandleLeft;
 exports.getFrozenHandleTop = getFrozenHandleTop;
+exports.getHLColor = getHLColor;
 exports.getHintText = getHintText;
 exports.getHistoryRules = getHistoryRules;
 exports.getInlineStringHTML = getInlineStringHTML;

package/dist/modules/cell.d.ts

@@ -12,7 +12,7 @@ export declare function mergeBorder(ctx: Context, d: CellMatrix, row_index: numb
 export declare function mergeMoveMain(ctx: Context, columnseleted: number[], rowseleted: number[], s: Partial<Selection>, top: number, height: number, left: number, width: number): (number | number[])[] | null;
 export declare function cancelFunctionrangeSelected(ctx: Context): void;
 export declare function cancelNormalSelected(ctx: Context): void;
-export declare function updateCell(ctx: Context, r: number, c: number, $input?: HTMLDivElement | null, value?: any, canvas?: CanvasRenderingContext2D): void;
+export declare function updateCell(ctx: Context, r: number, c: number, $input?: HTMLDivElement | null, value?: any, canvas?: CanvasRenderingContext2D, sheetId?: string): void;
 export declare function getOrigincell(ctx: Context, r: number, c: number, i: string): Cell | null;
 export declare function getcellFormula(ctx: Context, r: number, c: number, i: string, data?: any): any;
 export declare function getRange(ctx: Context): Range;

package/dist/modules/color.d.ts

@@ -1 +1,2 @@
 export declare const colors: string[];
+export declare function getHLColor(index: number): string;

package/package.json

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