@leankylin-sheet/core 6.0.4 → 7.0.2

package/dist/api/range.d.ts

@@ -28,5 +28,5 @@ export declare function registerExecFunctionExist(ctx: Context, sheet: {
     c: number;
 }>): void;
 export declare function setCellValuesByRange(ctx: Context, data: any[][], range: SingleRange, cellInput: HTMLDivElement | null, options?: CommonOptions, setMerge?: boolean): void;
-export declare function setCellValues(ctx: Context, data: any[], cellInput: HTMLDivElement | null): void;
+export declare function setCellValues(ctx: Context, data: any[], cellInput: HTMLDivElement | null, skipCalcDev?: boolean): void;
 export declare function setCellFormatByRange(ctx: Context, attr: keyof Cell, value: any, range: Range | SingleRange, options?: CommonOptions): void;

package/dist/events/mouse.d.ts

@@ -1,4 +1,5 @@
 import { Freezen } from "..";
+export declare const PAINT_MODEL_CURSOR = "url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M15.1004 6.5L6.90039 6.5V9.8L15.1004 9.8L15.1004 6.5ZM15.1004 5C15.9288 5 16.6004 5.67157 16.6004 6.5V9.8C16.6004 10.6284 15.9288 11.3 15.1004 11.3H6.90039C6.07196 11.3 5.40039 10.6284 5.40039 9.8V6.5C5.40039 5.67157 6.07196 5 6.90039 5H15.1004Z'/><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M17.7174 8.90039H15.3262V7.40039H18.4674C18.8816 7.40039 19.2174 7.73618 19.2174 8.15039V13.7859C19.2174 14.163 18.9374 14.4814 18.5634 14.5297L10.8174 15.5299V19.0004H9.31738V14.8705C9.31738 14.4934 9.59736 14.175 9.97134 14.1267L17.7174 13.1265V8.90039Z'/></svg>\") 6 6, pointer";
 import { Context } from "../context";
 import { Settings } from "../settings";
 import { GlobalCache } from "../types";

package/dist/index.esm.js

@@ -35760,6 +35760,7 @@ function getcellrange(ctx, txt, formulaId) {
       return true;
     });
   } else {
+    var _ctx$active_f;
     var _i = formulaId;
     if (_.isNil(_i)) {
       _i = ctx.currentSheetId;
@@ -35772,7 +35773,7 @@ function getcellrange(ctx, txt, formulaId) {
       return null;
     }
     sheettxt = luckysheetfile[index].name;
-    sheetId = luckysheetfile[index].id;
+    sheetId = ((_ctx$active_f = ctx.active_f) === null || _ctx$active_f === void 0 ? void 0 : _ctx$active_f.sheetId) || luckysheetfile[index].id;
     sheetdata = flowdata;
     rangetxt = txt;
   }
@@ -37588,7 +37589,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
   return function_str;
 }
 function rangeSetValue(ctx, cellInput, selected, fxInput) {
-  var _document$activeEleme, _ctx$active_f;
+  var _document$activeEleme, _ctx$active_f2;
   var $editor = cellInput;
   var $copyTo = fxInput;
   if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
@@ -37602,7 +37603,7 @@ 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;
+  var sheetId = ((_ctx$active_f2 = ctx.active_f) === null || _ctx$active_f2 === void 0 ? void 0 : _ctx$active_f2.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],
@@ -47632,6 +47633,9 @@ function setNextSheet(draftCtx, nextSheetId, refs) {
   draftCtx.zoomRatio = sheet.zoomRatio || 1;
   cancelActiveImgItem(draftCtx, refs.globalCache);
   cancelNormalSelected(draftCtx);
+  if (draftCtx.active_f) {
+    createRangeHightlight(draftCtx, refs.cellInput.current.innerHTML);
+  }
   if (isBack) {
     draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
     draftCtx.active_f = undefined;
@@ -49161,6 +49165,7 @@ function autoSelectionFormula(ctx, cellInput, fxInput, formula, cache) {
 }
 function cancelPaintModel(ctx) {
   var _ctx$luckysheet_copy_;
+  ctx.luckysheetPaintModelOn = false;
   if (ctx.luckysheet_copy_save === null) return;
   if (((_ctx$luckysheet_copy_ = ctx.luckysheet_copy_save) === null || _ctx$luckysheet_copy_ === void 0 ? void 0 : _ctx$luckysheet_copy_.dataSheetId) === ctx.currentSheetId) {
     ctx.luckysheet_selection_range = [];
@@ -49358,6 +49363,10 @@ function handleVerticalAlign(ctx, cellInput, value) {
 function handleFormatPainter(ctx) {
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
+  if (ctx.luckysheetPaintModelOn) {
+    cancelPaintModel(ctx);
+    return;
+  }
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {
     return;
   }
@@ -57212,6 +57221,7 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
 }
 function setCellValues(ctx, data, cellInput) {
   var _data$, _data$2;
+  var skipCalcDev = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   if (data == null) {
     throw INVALID_PARAMS;
   }
@@ -57234,7 +57244,12 @@ function setCellValues(ctx, data, cellInput) {
         c = _data$j.c,
         v = _data$j.v,
         ops = _data$j.ops;
-      setCellValue$1(ctx, r, c, v, cellInput, ops);
+      if (skipCalcDev) {
+        var _sheet = getSheet(ctx, ops || {});
+        setCellValueInBatch(ctx, _sheet, r, c, v, cellInput, []);
+      } else {
+        setCellValue$1(ctx, r, c, v, cellInput, ops);
+      }
     }
     cancelNormalSelected(ctx);
     return;
@@ -57256,7 +57271,7 @@ function setCellValues(ctx, data, cellInput) {
     }
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  if (formulaCells.length === 0 && changedData.length === 0) {
+  if (skipCalcDev || formulaCells.length === 0 && changedData.length === 0) {
     cancelNormalSelected(ctx);
     return;
   }
@@ -57475,7 +57490,7 @@ var defaultSettings = {
   defaultColWidth: 73,
   defaultRowHeight: 19,
   defaultFontSize: 10,
-  toolbarItems: ["undo", "redo", "|", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "search"],
+  toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "search"],
   cellContextMenu: function cellContextMenu() {
     return ["insert-comment", "copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"];
   },
@@ -57823,6 +57838,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
   e.stopPropagation();
 }
 
+var PAINT_MODEL_CURSOR = "url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M15.1004 6.5L6.90039 6.5V9.8L15.1004 9.8L15.1004 6.5ZM15.1004 5C15.9288 5 16.6004 5.67157 16.6004 6.5V9.8C16.6004 10.6284 15.9288 11.3 15.1004 11.3H6.90039C6.07196 11.3 5.40039 10.6284 5.40039 9.8V6.5C5.40039 5.67157 6.07196 5 6.90039 5H15.1004Z'/><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M17.7174 8.90039H15.3262V7.40039H18.4674C18.8816 7.40039 19.2174 7.73618 19.2174 8.15039V13.7859C19.2174 14.163 18.9374 14.4814 18.5634 14.5297L10.8174 15.5299V19.0004H9.31738V14.8705C9.31738 14.4934 9.59736 14.175 9.97134 14.1267L17.7174 13.1265V8.90039Z'/></svg>\") 6 6, pointer";
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
@@ -58244,8 +58260,12 @@ function handleCellDrop(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify(((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]) || null));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu;
-    box.style.cursor = (_currentCellValue$cu = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu !== void 0 ? _currentCellValue$cu : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu;
+      box.style.cursor = (_currentCellValue$cu = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu !== void 0 ? _currentCellValue$cu : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -58309,8 +58329,12 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu2;
-    box.style.cursor = (_currentCellValue$cu2 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu2 !== void 0 ? _currentCellValue$cu2 : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu2;
+      box.style.cursor = (_currentCellValue$cu2 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu2 !== void 0 ? _currentCellValue$cu2 : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -58338,6 +58362,12 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
 }
 function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var _globalCache$freezen4, _flowdata$row_index6;
+  if (ctx.luckysheetPaintModelOn) {
+    var paintBox = document.querySelector(".leankylin-cell-area");
+    if (paintBox) {
+      paintBox.style.cursor = PAINT_MODEL_CURSOR;
+    }
+  }
   var afterCellMouseMove = ctx.hooks.afterCellMouseMove;
   if (!afterCellMouseMove) {
     return;
@@ -58365,8 +58395,12 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify(((_flowdata$row_index6 = flowdata[row_index]) === null || _flowdata$row_index6 === void 0 ? void 0 : _flowdata$row_index6[col_index]) || null));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu3;
-    box.style.cursor = (_currentCellValue$cu3 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu3 !== void 0 ? _currentCellValue$cu3 : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu3;
+      box.style.cursor = (_currentCellValue$cu3 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu3 !== void 0 ? _currentCellValue$cu3 : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -61375,4 +61409,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, escapeRegExpStr, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellHyperlinkWithPayload, 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, handleDropCellDoubleClick, 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, setNextSheet, 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, PAINT_MODEL_CURSOR, 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, escapeRegExpStr, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellHyperlinkWithPayload, 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, handleDropCellDoubleClick, 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, setNextSheet, 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

@@ -35770,6 +35770,7 @@ function getcellrange(ctx, txt, formulaId) {
       return true;
     });
   } else {
+    var _ctx$active_f;
     var _i = formulaId;
     if (___default['default'].isNil(_i)) {
       _i = ctx.currentSheetId;
@@ -35782,7 +35783,7 @@ function getcellrange(ctx, txt, formulaId) {
       return null;
     }
     sheettxt = luckysheetfile[index].name;
-    sheetId = luckysheetfile[index].id;
+    sheetId = ((_ctx$active_f = ctx.active_f) === null || _ctx$active_f === void 0 ? void 0 : _ctx$active_f.sheetId) || luckysheetfile[index].id;
     sheetdata = flowdata;
     rangetxt = txt;
   }
@@ -37598,7 +37599,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
   return function_str;
 }
 function rangeSetValue(ctx, cellInput, selected, fxInput) {
-  var _document$activeEleme, _ctx$active_f;
+  var _document$activeEleme, _ctx$active_f2;
   var $editor = cellInput;
   var $copyTo = fxInput;
   if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
@@ -37612,7 +37613,7 @@ 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;
+  var sheetId = ((_ctx$active_f2 = ctx.active_f) === null || _ctx$active_f2 === void 0 ? void 0 : _ctx$active_f2.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],
@@ -47642,6 +47643,9 @@ function setNextSheet(draftCtx, nextSheetId, refs) {
   draftCtx.zoomRatio = sheet.zoomRatio || 1;
   cancelActiveImgItem(draftCtx, refs.globalCache);
   cancelNormalSelected(draftCtx);
+  if (draftCtx.active_f) {
+    createRangeHightlight(draftCtx, refs.cellInput.current.innerHTML);
+  }
   if (isBack) {
     draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
     draftCtx.active_f = undefined;
@@ -49171,6 +49175,7 @@ function autoSelectionFormula(ctx, cellInput, fxInput, formula, cache) {
 }
 function cancelPaintModel(ctx) {
   var _ctx$luckysheet_copy_;
+  ctx.luckysheetPaintModelOn = false;
   if (ctx.luckysheet_copy_save === null) return;
   if (((_ctx$luckysheet_copy_ = ctx.luckysheet_copy_save) === null || _ctx$luckysheet_copy_ === void 0 ? void 0 : _ctx$luckysheet_copy_.dataSheetId) === ctx.currentSheetId) {
     ctx.luckysheet_selection_range = [];
@@ -49368,6 +49373,10 @@ function handleVerticalAlign(ctx, cellInput, value) {
 function handleFormatPainter(ctx) {
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
+  if (ctx.luckysheetPaintModelOn) {
+    cancelPaintModel(ctx);
+    return;
+  }
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {
     return;
   }
@@ -57222,6 +57231,7 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
 }
 function setCellValues(ctx, data, cellInput) {
   var _data$, _data$2;
+  var skipCalcDev = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   if (data == null) {
     throw INVALID_PARAMS;
   }
@@ -57244,7 +57254,12 @@ function setCellValues(ctx, data, cellInput) {
         c = _data$j.c,
         v = _data$j.v,
         ops = _data$j.ops;
-      setCellValue$1(ctx, r, c, v, cellInput, ops);
+      if (skipCalcDev) {
+        var _sheet = getSheet(ctx, ops || {});
+        setCellValueInBatch(ctx, _sheet, r, c, v, cellInput, []);
+      } else {
+        setCellValue$1(ctx, r, c, v, cellInput, ops);
+      }
     }
     cancelNormalSelected(ctx);
     return;
@@ -57266,7 +57281,7 @@ function setCellValues(ctx, data, cellInput) {
     }
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  if (formulaCells.length === 0 && changedData.length === 0) {
+  if (skipCalcDev || formulaCells.length === 0 && changedData.length === 0) {
     cancelNormalSelected(ctx);
     return;
   }
@@ -57485,7 +57500,7 @@ var defaultSettings = {
   defaultColWidth: 73,
   defaultRowHeight: 19,
   defaultFontSize: 10,
-  toolbarItems: ["undo", "redo", "|", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "search"],
+  toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "search"],
   cellContextMenu: function cellContextMenu() {
     return ["insert-comment", "copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"];
   },
@@ -57833,6 +57848,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
   e.stopPropagation();
 }
 
+var PAINT_MODEL_CURSOR = "url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M15.1004 6.5L6.90039 6.5V9.8L15.1004 9.8L15.1004 6.5ZM15.1004 5C15.9288 5 16.6004 5.67157 16.6004 6.5V9.8C16.6004 10.6284 15.9288 11.3 15.1004 11.3H6.90039C6.07196 11.3 5.40039 10.6284 5.40039 9.8V6.5C5.40039 5.67157 6.07196 5 6.90039 5H15.1004Z'/><path fill='%23525C6F' stroke='%23FFFFFF' stroke-width='1.4' stroke-linejoin='round' paint-order='stroke' d='M17.7174 8.90039H15.3262V7.40039H18.4674C18.8816 7.40039 19.2174 7.73618 19.2174 8.15039V13.7859C19.2174 14.163 18.9374 14.4814 18.5634 14.5297L10.8174 15.5299V19.0004H9.31738V14.8705C9.31738 14.4934 9.59736 14.175 9.97134 14.1267L17.7174 13.1265V8.90039Z'/></svg>\") 6 6, pointer";
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
@@ -58254,8 +58270,12 @@ function handleCellDrop(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify(((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]) || null));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu;
-    box.style.cursor = (_currentCellValue$cu = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu !== void 0 ? _currentCellValue$cu : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu;
+      box.style.cursor = (_currentCellValue$cu = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu !== void 0 ? _currentCellValue$cu : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -58319,8 +58339,12 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu2;
-    box.style.cursor = (_currentCellValue$cu2 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu2 !== void 0 ? _currentCellValue$cu2 : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu2;
+      box.style.cursor = (_currentCellValue$cu2 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu2 !== void 0 ? _currentCellValue$cu2 : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -58348,6 +58372,12 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
 }
 function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var _globalCache$freezen4, _flowdata$row_index6;
+  if (ctx.luckysheetPaintModelOn) {
+    var paintBox = document.querySelector(".leankylin-cell-area");
+    if (paintBox) {
+      paintBox.style.cursor = PAINT_MODEL_CURSOR;
+    }
+  }
   var afterCellMouseMove = ctx.hooks.afterCellMouseMove;
   if (!afterCellMouseMove) {
     return;
@@ -58375,8 +58405,12 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var currentCellValue = JSON.parse(JSON.stringify(((_flowdata$row_index6 = flowdata[row_index]) === null || _flowdata$row_index6 === void 0 ? void 0 : _flowdata$row_index6[col_index]) || null));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
-    var _currentCellValue$cu3;
-    box.style.cursor = (_currentCellValue$cu3 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu3 !== void 0 ? _currentCellValue$cu3 : "default";
+    if (ctx.luckysheetPaintModelOn) {
+      box.style.cursor = PAINT_MODEL_CURSOR;
+    } else {
+      var _currentCellValue$cu3;
+      box.style.cursor = (_currentCellValue$cu3 = currentCellValue === null || currentCellValue === void 0 ? void 0 : currentCellValue.cu) !== null && _currentCellValue$cu3 !== void 0 ? _currentCellValue$cu3 : "default";
+    }
   }
   var yOut = y < 0 || y > ctx.visibledatarow[ctx.visibledatarow.length - 1];
   var xOut = x < 0 || x > ctx.visibledatacolumn[ctx.visibledatacolumn.length - 1];
@@ -61390,6 +61424,7 @@ exports.Canvas = Canvas;
 exports.FormulaCache = FormulaCache;
 exports.MAX_ZOOM_RATIO = MAX_ZOOM_RATIO;
 exports.MIN_ZOOM_RATIO = MIN_ZOOM_RATIO;
+exports.PAINT_MODEL_CURSOR = PAINT_MODEL_CURSOR;
 exports.addSheet = addSheet;
 exports.api = index;
 exports.applyLocation = applyLocation;

package/package.json

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