From b446ecd4df271a066d2f7f6838bfa0a156aa9ef2 Mon Sep 17 00:00:00 2001
From: wpxp123456 <2677556700@qq.com>
Date: Wed, 10 Dec 2025 15:03:58 +0800
Subject: [PATCH] fix: optimize the behavior of editing cells in the last
 row/column of the worksheet (#6278)

---
 .../src/commands/commands/set-selection.command.ts       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/sheets-ui/src/commands/commands/set-selection.command.ts b/packages/sheets-ui/src/commands/commands/set-selection.command.ts
index c16c465498..c7186984db 100644
--- a/packages/sheets-ui/src/commands/commands/set-selection.command.ts
+++ b/packages/sheets-ui/src/commands/commands/set-selection.command.ts
@@ -269,8 +269,13 @@ export const MoveSelectionEnterAndTabCommand: ICommand<IMoveSelectionEnterAndTab
                 });
             }
 
-            // the start range is from the primary selection range
-            const next = findNextRange(startRange, direction, worksheet);
+            /**
+             * The start range is from the primary selection range.
+             * If the edited cell is the last row/column of the worksheet, and the submitted operation is Enter/Tab to move down/right, the next selected cell should still be the current cell (not move to the first row/column of the worksheet).
+             */
+            const isLastRowCell = keycode === KeyCode.ENTER && direction === Direction.DOWN && startRange.endRow === worksheet.getMaxRows() - 1;
+            const isLastColumnCell = keycode === KeyCode.TAB && direction === Direction.RIGHT && startRange.endColumn === worksheet.getMaxColumns() - 1;
+            const next = (isLastRowCell || isLastColumnCell) ? startRange : findNextRange(startRange, direction, worksheet);
             const destRange = getCellAtRowCol(next.startRow, next.startColumn, worksheet);
 
             if (Rectangle.equals(destRange, startRange)) {