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

package/lib/api/range.js

@@ -93,6 +93,7 @@ function setSelection(ctx, range, options) {
   }
 }
 function setCellValuesByRange(ctx, data, range, cellInput, options, callAfterUpdate) {
+  var _a, _b, _c, _d, _e;
   if (options === void 0) {
     options = {};
   }
@@ -110,13 +111,32 @@ function setCellValuesByRange(ctx, data, range, cellInput, options, callAfterUpd
   if (data.length !== rowCount || data[0].length !== columnCount) {
     throw new Error("data size does not match range");
   }
+  var sheet = (0, _common.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;
       (0, _cell.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);
+  }
 }
 function setCellFormatByRange(ctx, attr, value, range, options) {
   if (options === void 0) {

package/lib/api/sheet.js

@@ -164,7 +164,7 @@ function generateCopySheetName(ctx, sheetId) {
   return sheetCopyName;
 }
 function copySheet(ctx, sheetId) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   var index = (0, _utils.getSheetIndex)(ctx, sheetId);
   var order = ctx.luckysheetfile[index].order + 1;
   var sheetName = generateCopySheetName(ctx, sheetId);
@@ -201,6 +201,34 @@ function copySheet(ctx, sheetId) {
   var sheetOrderList = {};
   sheetOrderList[newSheetId] = order;
   _2.api.setSheetOrder(ctx, sheetOrderList);
+  (0, _2.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 || (0, _common.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 (!_lodash.default.isNumber(r) || !_lodash.default.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);
+  }
 }
 function calculateSheetFromula(ctx, id) {
   var _a, _b, _c;

package/lib/events/keyboard.js

@@ -134,6 +134,9 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
+function isLegacyFormulaRangeMode(ctx) {
+  return !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true || (0, _formula.israngeseleciton)(ctx);
+}
 function handleGlobalEnter(ctx, cellInput, e, canvas) {
   var _a, _b, _c;
   if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
@@ -179,11 +182,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 && !(0, _formula.maybeRecoverDirtyRangeSelection)(ctx)) {
+    return;
+  }
+  var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaRefMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaRefMode) {
+    return;
+  }
   var idx = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   if (_lodash.default.isNil(idx)) return;
   var file = ctx.luckysheetfile[idx];
-  if (!file || !file.row || !file.column) return;
+  if (!file || _lodash.default.isNil(file.row) || _lodash.default.isNil(file.column)) return;
   var maxRow = file.row;
   var maxCol = file.column;
   var last;
@@ -334,7 +346,14 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
 }
 function handleShiftWithArrowKey(ctx, e) {
   var _a;
-  if (ctx.luckysheetCellUpdate.length > 0) {
+  if (ctx.formulaCache.rangeSelectionActive === false && !(0, _formula.maybeRecoverDirtyRangeSelection)(ctx)) {
+    return;
+  }
+  var isFormulaMode = isLegacyFormulaRangeMode(ctx);
+  if (isFormulaMode) {
+    ctx.formulaCache.rangeSelectionActive = true;
+  }
+  if (ctx.luckysheetCellUpdate.length > 0 && !isFormulaMode) {
     return;
   }
   ctx.luckysheet_shiftpositon = _lodash.default.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
@@ -358,17 +377,15 @@ function handleShiftWithArrowKey(ctx, e) {
   e.preventDefault();
 }
 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) && !_lodash.default.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 && !(0, _formula.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 = (0, _2.hideCRCount)(ctx, e.key);
   switch (e.key) {
     case "ArrowUp":
@@ -386,11 +403,12 @@ function handleArrowKey(ctx, e) {
     default:
       break;
   }
+  e.preventDefault();
 }
 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();
@@ -398,27 +416,41 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
         e.preventDefault();
         return [2];
       }
+      handledFlvShortcut = false;
       if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
         (0, _selection.textFormat)(ctx, "center");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
         (0, _selection.textFormat)(ctx, "left");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
         (0, _selection.textFormat)(ctx, "right");
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
         (0, _toolbar.handleLink)(ctx, cellInput);
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
         (0, _selection.fillDate)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
         (0, _selection.fillTime)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "KeyR") {
         (0, _selection.fillRightData)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyD") {
         (0, _selection.fillDownData)(ctx);
+        handledFlvShortcut = true;
+      }
+      if (handledFlvShortcut) {
+        (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
+        e.stopPropagation();
+        e.preventDefault();
+        return [2];
       }
       ctx.luckysheet_select_status = false;
       kcode = e.keyCode;
@@ -480,6 +512,9 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
           if (ctx.activeImg != null) {
             (0, _2.removeActiveImage)(ctx);
           } else {
+            if (ctx.formulaCache.rangeSelectionActive === true) {
+              (0, _formula.markRangeSelectionDirty)(ctx);
+            }
             (0, _selection.deleteSelectedCellText)(ctx);
           }
           (0, _refresh.jfrefreshgrid)(ctx, null, undefined);

package/lib/events/mouse.js

@@ -127,7 +127,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 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 = [];
   }
@@ -146,11 +146,11 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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 = (0, _location.rowLocation)(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -195,12 +195,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   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 || (0, _modules.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 || (0, _modules.israngeseleciton)(ctx)) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -267,7 +262,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_h = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
+      } else if (e.ctrlKey && ((_g = _lodash.default.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);
@@ -283,7 +278,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            ctx.formulaCache.functionRangeIndex = [_lodash.default.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 = [_lodash.default.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;
@@ -328,13 +323,14 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           column_focus: col_index
         };
       }
+      ctx.formulaCache.rangestart = true;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
       (0, _modules.rangeSetValue)(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
       }, fxInput);
-      ctx.formulaCache.rangestart = true;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
+      (0, _modules.rangeHightlightselected)(ctx, cellInput);
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -357,7 +353,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   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;
@@ -416,7 +412,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         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,
@@ -848,10 +844,28 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
     ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
     (0, _freeze.scrollToFrozenRowCol)(ctx, (_d = globalCache.freezen) === null || _d === void 0 ? void 0 : _d[ctx.currentSheetId]);
   } else if (ctx.formulaCache.rangestart) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _modules.rangeDrag)(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_row_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _formula.rangeDragRow)(ctx, e, cellInput, scrollX.scrollLeft, scrollY.scrollTop, container, fxInput);
   } else if (ctx.formulaCache.rangedrag_column_start) {
+    if (ctx.formulaCache.rangeSelectionActive === false && !(0, _modules.maybeRecoverDirtyRangeSelection)(ctx)) {
+      if (ctx.luckysheetCellUpdate.length > 0) {
+        (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput);
+      }
+      return;
+    }
     (0, _formula.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) {
     (0, _dropCell.onDropCellSelect)(ctx, e, scrollX, scrollY, container);
@@ -957,7 +971,7 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
   }
 }
 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();
   (0, _modules.onImageMoveEnd)(ctx, globalCache);
   (0, _modules.onImageResizeEnd)(ctx, globalCache);
@@ -970,11 +984,17 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
   (0, _hyperlink.onRangeSelectionModalMoveEnd)(globalCache);
   (0, _modules.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 ((0, _modules.getFormulaEditorOwner)(ctx) === "fx") {
       (0, _formula.handleFormulaInput)(ctx, cellInput, fxInput, 0, undefined, false);
     } else {
       (0, _formula.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) {
@@ -1016,10 +1036,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     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;
         }
@@ -1028,9 +1048,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     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);
         }
@@ -1074,10 +1094,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     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;
         }
@@ -1086,9 +1106,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     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);
         }
@@ -1105,10 +1125,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_cols_freeze_drag = false;
     var scrollLeft = ctx.scrollLeft;
     var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft - window.scrollX;
-    var _p = (0, _location.colLocation)(x, ctx.visibledatacolumn),
-      col_pre = _p[0],
-      col_curr = _p[1],
-      col_index_curr = _p[2];
+    var _o = (0, _location.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 = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1156,10 +1176,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_rows_freeze_drag = false;
     var scrollTop = ctx.scrollTop;
     var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop - window.scrollY;
-    var _q = (0, _location.rowLocation)(y, ctx.visibledatarow),
-      row_pre = _q[0],
-      row_curr = _q[1],
-      row_index_curr = _q[2];
+    var _p = (0, _location.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 = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1338,6 +1358,7 @@ function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInput, fxI
           row: rowseleted,
           column: [null, null]
         }, fxInput);
+        (0, _modules.rangeHightlightselected)(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_row_start = true;
       ctx.formulaCache.rangestart = false;
@@ -1569,6 +1590,7 @@ function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cellInput,
           row: [null, null],
           column: columnseleted
         }, fxInput);
+        (0, _modules.rangeHightlightselected)(ctx, cellInput);
       }
       ctx.formulaCache.rangedrag_column_start = true;
       ctx.formulaCache.rangestart = false;