@fileverse-dev/fortune-core 1.3.10 → 1.3.11-input-ref-1

package/es/api/range.js

@@ -78,6 +78,7 @@ export function setSelection(ctx, range, options) {
   }
 }
 export function setCellValuesByRange(ctx, data, range, cellInput, options, callAfterUpdate) {
+  var _a, _b, _c, _d, _e;
   if (options === void 0) {
     options = {};
   }
@@ -95,13 +96,32 @@ export function setCellValuesByRange(ctx, data, range, cellInput, options, callA
   if (data.length !== rowCount || data[0].length !== columnCount) {
     throw new Error("data size does not match range");
   }
+  var sheet = getSheet(ctx, options);
+  var sheetId = sheet.id || ctx.currentSheetId;
+  var cellChanges = [];
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
       var row = range.row[0] + i;
       var column = range.column[0] + j;
       setCellValue(ctx, row, column, data[i][j], cellInput, options, callAfterUpdate);
+      if (((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) && sheet.data) {
+        cellChanges.push({
+          sheetId: sheetId,
+          path: ["celldata"],
+          value: {
+            r: row,
+            c: column,
+            v: (_d = (_c = (_b = sheet.data) === null || _b === void 0 ? void 0 : _b[row]) === null || _c === void 0 ? void 0 : _c[column]) !== null && _d !== void 0 ? _d : null
+          },
+          key: "".concat(row, "_").concat(column),
+          type: "update"
+        });
+      }
     }
   }
+  if (cellChanges.length > 0 && ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
+  }
 }
 export function setCellFormatByRange(ctx, attr, value, range, options) {
   if (options === void 0) {

package/es/api/sheet.js

@@ -13,7 +13,7 @@ import _ from "lodash";
 import { v4 as uuidv4 } from "uuid";
 import { dataToCelldata, getSheet } from "./common";
 import { getSheetIndex } from "../utils";
-import { api, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
+import { api, changeSheet, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
 function isCellReferenced(formulaString, cell) {
   function colToNumber(col) {
     var num = 0;
@@ -146,7 +146,7 @@ function generateCopySheetName(ctx, sheetId) {
   return sheetCopyName;
 }
 export function copySheet(ctx, sheetId) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   var index = getSheetIndex(ctx, sheetId);
   var order = ctx.luckysheetfile[index].order + 1;
   var sheetName = generateCopySheetName(ctx, sheetId);
@@ -183,6 +183,34 @@ export function copySheet(ctx, sheetId) {
   var sheetOrderList = {};
   sheetOrderList[newSheetId] = order;
   api.setSheetOrder(ctx, sheetOrderList);
+  changeSheet(ctx, newSheetId, undefined, true, true);
+  if ((_d = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _d === void 0 ? void 0 : _d.updateAllCell) {
+    ctx.hooks.updateAllCell(newSheetId);
+  } else if ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc) {
+    var changes_1 = [];
+    var celldata = newSheet.celldata || dataToCelldata(newSheet.data);
+    if (Array.isArray(celldata)) {
+      celldata.forEach(function (d) {
+        var _a;
+        if (d == null) return;
+        var r = d.r;
+        var c = d.c;
+        if (!_.isNumber(r) || !_.isNumber(c)) return;
+        changes_1.push({
+          sheetId: newSheetId,
+          path: ["celldata"],
+          key: "".concat(r, "_").concat(c),
+          value: {
+            r: r,
+            c: c,
+            v: (_a = d.v) !== null && _a !== void 0 ? _a : null
+          },
+          type: d.v == null ? "delete" : "update"
+        });
+      });
+    }
+    if (changes_1.length > 0) ctx.hooks.updateCellYdoc(changes_1);
+  }
 }
 export function calculateSheetFromula(ctx, id) {
   var _a, _b, _c;

package/es/events/keyboard.js

@@ -117,13 +117,16 @@ import _ from "lodash";
 import { hideCRCount, removeActiveImage } from "..";
 import { getFlowdata } from "../context";
 import { updateCell, cancelNormalSelected } from "../modules/cell";
-import { handleFormulaInput } from "../modules/formula";
+import { handleFormulaInput, israngeseleciton, maybeRecoverDirtyRangeSelection, markRangeSelectionDirty } from "../modules/formula";
 import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, fillRightData, fillDownData, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
 import { cancelPaintModel, handleBold, handleItalic, handleUnderline, handleLink } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
 import { jfrefreshgrid } from "../modules/refresh";
+function isLegacyFormulaRangeMode(ctx) {
+  return !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true || israngeseleciton(ctx);
+}
 export function handleGlobalEnter(ctx, cellInput, e, canvas) {
   var _a, _b, _c;
   if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
@@ -169,11 +172,20 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   return colDelta === 0 ? r : c;
 }
 function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  if (ctx.luckysheetCellUpdate.length > 0) return;
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
+  }
+  var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaRefMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaRefMode) {
+    return;
+  }
   var idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
   var file = ctx.luckysheetfile[idx];
-  if (!file || !file.row || !file.column) return;
+  if (!file || _.isNil(file.row) || _.isNil(file.column)) return;
   var maxRow = file.row;
   var maxCol = file.column;
   var last;
@@ -324,7 +336,14 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
 }
 function handleShiftWithArrowKey(ctx, e) {
   var _a;
-  if (ctx.luckysheetCellUpdate.length > 0) {
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
+  }
+  var isFormulaMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaMode) {
     return;
   }
   ctx.luckysheet_shiftpositon = _.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
@@ -348,17 +367,15 @@ function handleShiftWithArrowKey(ctx, e) {
   e.preventDefault();
 }
 export function handleArrowKey(ctx, e) {
-  var _a, _b;
-  if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {
-    var parser = new DOMParser();
-    var doc = parser.parseFromString("<div>".concat((_a = document.getElementById("luckysheet-rich-text-editor")) === null || _a === void 0 ? void 0 : _a.innerHTML, "</div>"), "text/html");
-    var spans = doc.querySelectorAll("span");
-    var lastSpan = spans[spans.length - 1];
-    var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
-    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes('"')) || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) || /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-      return;
-    }
+  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+    return;
   }
+  var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaRefMode) ctx.formulaCache.rangeSelectionActive = true;
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaRefMode) {
+    return;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {}
   var moveCount = hideCRCount(ctx, e.key);
   switch (e.key) {
     case "ArrowUp":
@@ -376,11 +393,12 @@ export function handleArrowKey(ctx, e) {
     default:
       break;
   }
+  e.preventDefault();
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a, _b, _c;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
+    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
     return __generator(this, function (_d) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
@@ -388,27 +406,41 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         e.preventDefault();
         return [2];
       }
+      handledFlvShortcut = false;
       if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
         textFormat(ctx, "center");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
         textFormat(ctx, "left");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
         textFormat(ctx, "right");
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
         handleLink(ctx, cellInput);
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
         fillDate(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
         fillTime(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "KeyR") {
         fillRightData(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyD") {
         fillDownData(ctx);
+        handledFlvShortcut = true;
+      }
+      if (handledFlvShortcut) {
+        jfrefreshgrid(ctx, null, undefined);
+        e.stopPropagation();
+        e.preventDefault();
+        return [2];
       }
       ctx.luckysheet_select_status = false;
       kcode = e.keyCode;
@@ -470,6 +502,9 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           if (ctx.activeImg != null) {
             removeActiveImage(ctx);
           } else {
+            if (ctx.formulaCache.rangeSelectionActive === true) {
+              markRangeSelectionDirty(ctx);
+            }
             deleteSelectedCellText(ctx);
           }
           jfrefreshgrid(ctx, null, undefined);

package/es/events/mouse.js

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
+import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, maybeRecoverDirtyRangeSelection, rangeHightlightselected, rangeSetValue, getFormulaEditorOwner, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
 import { getFrozenHandleLeft, getFrozenHandleTop, scrollToFrozenRowCol } from "../modules/freeze";
 import { cancelFunctionrangeSelected, mergeBorder, mergeMoveMain, updateCell, luckysheetUpdateCell } from "../modules/cell";
 import { colLocation, colLocationByIndex, rowLocation, rowLocationByIndex } from "../modules/location";
@@ -106,7 +106,7 @@ export function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
   var _a, _b;
-  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
   if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
     ctx.defaultCandidates = [];
   }
@@ -125,11 +125,11 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     return;
   }
   var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
-  var _q = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
-    x = _q.x,
-    y = _q.y,
-    inHorizontalFreeze = _q.inHorizontalFreeze,
-    inVerticalFreeze = _q.inVerticalFreeze;
+  var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _p.x,
+    y = _p.y,
+    inHorizontalFreeze = _p.inHorizontalFreeze,
+    inVerticalFreeze = _p.inVerticalFreeze;
   var row_location = rowLocation(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -174,12 +174,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
-    var parser = new DOMParser();
-    var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
-    var spans = doc.querySelectorAll("span");
-    var firstSpan = spans[0];
-    var lastSpan = spans[spans.length - 1];
-    if ((ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) && lastSpan && ctx.luckysheetCellUpdate.length === 2) {
+    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -246,7 +241,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_h = _.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
+      } else if (e.ctrlKey && ((_g = _.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
         var vText = cellInput.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
@@ -262,7 +257,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            ctx.formulaCache.functionRangeIndex = [_.indexOf((_l = (_k = (_j = currSelection.anchorNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.parentNode) === null || _l === void 0 ? void 0 : _l.childNodes, (_m = currSelection.anchorNode) === null || _m === void 0 ? void 0 : _m.parentNode), currSelection.anchorOffset];
+            ctx.formulaCache.functionRangeIndex = [_.indexOf((_k = (_j = (_h = currSelection.anchorNode) === null || _h === void 0 ? void 0 : _h.parentNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.childNodes, (_l = currSelection.anchorNode) === null || _l === void 0 ? void 0 : _l.parentNode), currSelection.anchorOffset];
           } else {
             var textRange = document.selection.createRange();
             ctx.formulaCache.functionRangeIndex = textRange;
@@ -307,13 +302,14 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
           column_focus: col_index
         };
       }
+      ctx.formulaCache.rangestart = true;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
       rangeSetValue(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
       }, fxInput);
-      ctx.formulaCache.rangestart = true;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, cellInput);
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -336,7 +332,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   if (ctx.luckysheet_select_status) {
     if (e.shiftKey) {
-      var last = (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o[ctx.luckysheet_select_save.length - 1];
+      var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
       if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
         var top_2 = 0;
         var height = 0;
@@ -395,7 +391,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
       }
     } else if (e.ctrlKey || e.metaKey) {
-      (_p = ctx.luckysheet_select_save) === null || _p === void 0 ? void 0 : _p.push({
+      (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
         left: col_pre,
         width: col - col_pre - 1,
         top: row_pre,
@@ -827,10 +823,28 @@ export function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, co
     ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
     scrollToFrozenRowCol(ctx, (_d = globalCache.freezen) === null || _d === void 0 ? void 0 : _d[ctx.currentSheetId]);
   } else if (ctx.formulaCache.rangestart) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     rangeDrag(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_row_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     rangeDragRow(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_column_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     rangeDragColumn(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.luckysheet_rows_selected_status) {} else if (ctx.luckysheet_cols_selected_status) {} else if (ctx.luckysheet_cell_selected_move) {} else if (ctx.luckysheet_cell_selected_extend) {
     onDropCellSelect(ctx, e, scrollX, scrollY, container);
@@ -936,7 +950,7 @@ export function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX,
   }
 }
 export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollbarY, container, cellInput, fxInput) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var rect = container.getBoundingClientRect();
   onImageMoveEnd(ctx, globalCache);
   onImageResizeEnd(ctx, globalCache);
@@ -949,11 +963,17 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
   onRangeSelectionModalMoveEnd(globalCache);
   onCellsMoveEnd(ctx, globalCache, e, scrollbarX, scrollbarY, container);
   if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start) {
-    if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
+    if (getFormulaEditorOwner(ctx) === "fx") {
       handleFormulaInput(ctx, cellInput, fxInput, 0, undefined, false);
     } else {
       handleFormulaInput(ctx, fxInput, cellInput, 0, undefined, false);
     }
+    ctx.luckysheet_select_status = false;
+    ctx.luckysheet_scroll_status = false;
+    ctx.luckysheet_rows_selected_status = false;
+    ctx.luckysheet_cols_selected_status = false;
+    e.preventDefault();
+    return;
   }
   if (ctx.luckysheet_select_status) {
     if (ctx.luckysheetPaintModelOn) {
@@ -995,10 +1015,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     cfg_1.customHeight[ctx.luckysheet_rows_change_size_start[1]] = 1;
     var changeRowIndex_1 = ctx.luckysheet_rows_change_size_start[1];
     var changeRowSelected_1 = false;
-    if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
-      (_e = (_d = ctx.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d.filter(function (select) {
+    if (((_b = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
+      (_d = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c.filter(function (select) {
         return select.row_select;
-      })) === null || _e === void 0 ? void 0 : _e.some(function (select) {
+      })) === null || _d === void 0 ? void 0 : _d.some(function (select) {
         if (changeRowIndex_1 >= select.row[0] && changeRowIndex_1 <= select.row[1]) {
           changeRowSelected_1 = true;
         }
@@ -1007,9 +1027,9 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     }
     if (changeRowSelected_1) {
       cfg_1.rowlen || (cfg_1.rowlen = {});
-      (_g = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f.filter(function (select) {
+      (_f = (_e = ctx.luckysheet_select_save) === null || _e === void 0 ? void 0 : _e.filter(function (select) {
         return select.row_select;
-      })) === null || _g === void 0 ? void 0 : _g.forEach(function (select) {
+      })) === null || _f === void 0 ? void 0 : _f.forEach(function (select) {
         for (var r = select.row[0]; r <= select.row[1]; r += 1) {
           cfg_1.rowlen[r] = Math.ceil(size_1 / ctx.zoomRatio);
         }
@@ -1053,10 +1073,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     cfg_2.customWidth[ctx.luckysheet_cols_change_size_start[1]] = 1;
     var changeColumnIndex_1 = ctx.luckysheet_cols_change_size_start[1];
     var changeColumnSelected_1 = false;
-    if (((_j = (_h = ctx.luckysheet_select_save) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0) > 0) {
-      (_l = (_k = ctx.luckysheet_select_save) === null || _k === void 0 ? void 0 : _k.filter(function (select) {
+    if (((_h = (_g = ctx.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0) > 0) {
+      (_k = (_j = ctx.luckysheet_select_save) === null || _j === void 0 ? void 0 : _j.filter(function (select) {
         return select.column_select;
-      })) === null || _l === void 0 ? void 0 : _l.some(function (select) {
+      })) === null || _k === void 0 ? void 0 : _k.some(function (select) {
         if (changeColumnIndex_1 >= select.column[0] && changeColumnIndex_1 <= select.column[1]) {
           changeColumnSelected_1 = true;
         }
@@ -1065,9 +1085,9 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     }
     if (changeColumnSelected_1) {
       cfg_2.columnlen || (cfg_2.columnlen = {});
-      (_o = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m.filter(function (select) {
+      (_m = (_l = ctx.luckysheet_select_save) === null || _l === void 0 ? void 0 : _l.filter(function (select) {
         return select.column_select;
-      })) === null || _o === void 0 ? void 0 : _o.forEach(function (select) {
+      })) === null || _m === void 0 ? void 0 : _m.forEach(function (select) {
         for (var r = select.column[0]; r <= select.column[1]; r += 1) {
           cfg_2.columnlen[r] = Math.ceil(size_2 / ctx.zoomRatio);
         }
@@ -1084,10 +1104,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     ctx.luckysheet_cols_freeze_drag = false;
     var scrollLeft = ctx.scrollLeft;
     var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft - window.scrollX;
-    var _p = colLocation(x, ctx.visibledatacolumn),
-      col_pre = _p[0],
-      col_curr = _p[1],
-      col_index_curr = _p[2];
+    var _o = colLocation(x, ctx.visibledatacolumn),
+      col_pre = _o[0],
+      col_curr = _o[1],
+      col_index_curr = _o[2];
     var col_index = x > (col_curr + col_pre) / 2 ? col_index_curr : col_index_curr - 1;
     var idx = getSheetIndex(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1135,10 +1155,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     ctx.luckysheet_rows_freeze_drag = false;
     var scrollTop = ctx.scrollTop;
     var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop - window.scrollY;
-    var _q = rowLocation(y, ctx.visibledatarow),
-      row_pre = _q[0],
-      row_curr = _q[1],
-      row_index_curr = _q[2];
+    var _p = rowLocation(y, ctx.visibledatarow),
+      row_pre = _p[0],
+      row_curr = _p[1],
+      row_index_curr = _p[2];
     var row_index = y > (row_curr + row_pre) / 2 ? row_index_curr : row_index_curr - 1;
     var idx = getSheetIndex(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1317,6 +1337,7 @@ export function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInp
           row: rowseleted,
           column: [null, null]
         }, fxInput);
+        rangeHightlightselected(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_row_start = true;
       ctx.formulaCache.rangestart = false;
@@ -1548,6 +1569,7 @@ export function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cell
           row: [null, null],
           column: columnseleted
         }, fxInput);
+        rangeHightlightselected(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_column_start = true;
       ctx.formulaCache.rangestart = false;