From cd5d1b928db04fac75ec9561a13d9895457ce819 Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Sat, 23 May 2026 12:42:08 +0800
Subject: [PATCH] feat(grid): add configurable keyboard shortcuts for copy and
 delete current row

---
 .../editor/EditorSettingsDialog.vue           | 45 ++++++++++-------
 .../src/components/editor/QueryEditor.vue     |  2 +
 apps/desktop/src/components/grid/DataGrid.vue | 50 ++++++++++++++++++-
 apps/desktop/src/i18n/locales/en.ts           |  2 +
 apps/desktop/src/i18n/locales/es.ts           |  2 +
 apps/desktop/src/i18n/locales/zh-CN.ts        |  2 +
 apps/desktop/src/lib/keyboardShortcuts.ts     |  8 +++
 apps/desktop/src/lib/shortcutRegistry.ts      | 14 ++++++
 .../dataGridRowShortcutSource.test.ts         | 12 +++++
 packages/app-tests/keyboardShortcuts.test.ts  | 10 ++++
 .../app-tests/settingsDialogLayout.test.ts    |  2 +
 packages/app-tests/settingsStore.test.ts      | 11 +++-
 12 files changed, 141 insertions(+), 19 deletions(-)
 create mode 100644 packages/app-tests/dataGridRowShortcutSource.test.ts

diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
index d66e8c14c7..bd0d970e34 100644
--- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue
+++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
@@ -3,6 +3,7 @@ import { ref, watch, shallowRef, computed } from "vue";
 import type { EditorView as EditorViewType } from "@codemirror/view";
 import { useI18n } from "vue-i18n";
 import { CircleHelp, ExternalLink, Loader2, RefreshCw, Settings } from "lucide-vue-next";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
@@ -652,7 +653,7 @@ watch(
 
 <template>
   <Dialog :open="open" @update:open="(v: boolean) => emit('update:open', v)">
-    <DialogContent class="sm:max-w-[860px] max-h-[calc(100vh-80px)] overflow-hidden">
+    <DialogContent class="sm:max-w-[860px] h-[min(660px,calc(100vh-80px))] flex flex-col overflow-hidden">
       <DialogHeader>
         <DialogTitle class="flex items-center gap-2">
           <Settings class="h-4 w-4" />
@@ -660,7 +661,7 @@ watch(
         </DialogTitle>
       </DialogHeader>
 
-      <div class="flex min-h-[520px] flex-col gap-3 overflow-hidden sm:flex-row">
+      <div class="flex min-h-0 flex-1 flex-col gap-3 overflow-hidden sm:min-h-[520px] sm:flex-row">
         <nav
           class="settingsCategoryNav flex shrink-0 gap-1 overflow-x-auto border-b pb-3 sm:w-40 sm:flex-col sm:overflow-visible sm:border-b-0 sm:border-r sm:pb-0 sm:pr-3"
         >
@@ -921,30 +922,40 @@ watch(
               </div>
             </section>
 
-            <section v-else-if="activeSettingsTab === 'shortcuts'" class="flex flex-col gap-5 py-2">
-              <div class="space-y-3">
+            <section v-else-if="activeSettingsTab === 'shortcuts'" class="flex flex-col gap-2 py-2">
+              <div class="overflow-hidden rounded-md border bg-background">
                 <div
                   v-for="definition in SHORTCUT_DEFINITIONS"
                   :key="definition.id"
-                  class="grid gap-2 rounded-md border bg-background p-3 sm:grid-cols-[minmax(0,1fr)_220px] sm:items-center"
+                  class="-mt-px grid gap-2 border-t border-border px-3 py-2 sm:first:mt-0 sm:first:border-t-0 sm:grid-cols-[minmax(0,1fr)_208px] sm:items-center"
                 >
-                  <div class="min-w-0 space-y-1">
-                    <Label>{{ t(definition.labelKey) }}</Label>
-                    <p class="text-xs text-muted-foreground">
-                      {{ t(`settings.shortcutScope${definition.scope[0].toUpperCase()}${definition.scope.slice(1)}`) }}
-                    </p>
+                  <div class="min-w-0">
+                    <div class="flex min-w-0 items-center gap-2">
+                      <Label class="min-w-0 truncate leading-none">{{ t(definition.labelKey) }}</Label>
+                      <Badge variant="outline" class="h-5 shrink-0 rounded-md px-1.5 text-[11px] text-muted-foreground">
+                        {{
+                          t(`settings.shortcutScope${definition.scope[0].toUpperCase()}${definition.scope.slice(1)}`)
+                        }}
+                      </Badge>
+                    </div>
                   </div>
-                  <div class="space-y-1.5">
+                  <div class="space-y-1">
                     <div class="flex gap-2">
                       <Input
                         :model-value="formatShortcut(editShortcuts[definition.id])"
                         readonly
                         :aria-invalid="shortcutConflicts.includes(definition.id)"
                         :placeholder="t('settings.shortcutPressShortcut')"
-                        class="font-mono"
+                        class="h-9 font-mono"
                         @keydown="(event: KeyboardEvent) => onShortcutKeydown(definition.id, event)"
                       />
-                      <Button type="button" variant="outline" class="shrink-0" @click="resetShortcut(definition.id)">
+                      <Button
+                        type="button"
+                        variant="outline"
+                        size="sm"
+                        class="h-9 shrink-0 px-3"
+                        @click="resetShortcut(definition.id)"
+                      >
                         {{ t("settings.reset") }}
                       </Button>
                     </div>
@@ -1263,7 +1274,7 @@ watch(
 
           <DialogFooter
             v-if="hasSettingsApplyFooter(activeSettingsTab as SettingsCategory)"
-            class="mx-0 mb-0 shrink-0 rounded-none border-t-0 bg-transparent px-0 pb-0 pt-3 gap-3 sm:gap-3"
+            class="mx-0 mb-0 shrink-0 rounded-none border-t border-border/60 bg-transparent px-0 pb-0 pt-3 gap-3 sm:gap-3"
           >
             <Button variant="outline" @click="resetDefaults">
               {{ t("settings.resetDefaults") }}
@@ -1279,7 +1290,7 @@ watch(
 
           <DialogFooter
             v-else-if="activeSettingsTab === 'ai'"
-            class="mx-0 mb-0 shrink-0 rounded-none border-t-0 bg-transparent px-0 pb-0 pt-3 gap-3 sm:gap-3"
+            class="mx-0 mb-0 shrink-0 rounded-none border-t border-border/60 bg-transparent px-0 pb-0 pt-3 gap-3 sm:gap-3"
           >
             <div class="flex flex-1 items-center gap-2">
               <Button
@@ -1313,7 +1324,7 @@ watch(
 
           <DialogFooter
             v-else-if="activeSettingsTab === 'security' && isWeb"
-            class="mx-0 mb-0 shrink-0 rounded-none border-t-0 bg-transparent px-0 pb-0 pt-3"
+            class="mx-0 mb-0 shrink-0 rounded-none border-t border-border/60 bg-transparent px-0 pb-0 pt-3"
           >
             <Button variant="outline" @click="emit('update:open', false)">
               {{ t("common.close") }}
@@ -1328,7 +1339,7 @@ watch(
 
           <DialogFooter
             v-else-if="activeSettingsTab === 'about'"
-            class="mx-0 mb-0 shrink-0 rounded-none border-t-0 bg-transparent px-0 pb-0 pt-3"
+            class="mx-0 mb-0 shrink-0 rounded-none border-t border-border/60 bg-transparent px-0 pb-0 pt-3"
           >
             <Button variant="outline" @click="emit('update:open', false)">
               {{ t("common.close") }}
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue
index b8ffcf5f44..83c5955aac 100644
--- a/apps/desktop/src/components/editor/QueryEditor.vue
+++ b/apps/desktop/src/components/editor/QueryEditor.vue
@@ -217,6 +217,7 @@ function runKeymapExtension(codeMirrorKeymap: (typeof import("@codemirror/view")
     },
     {
       key: shortcutToCodeMirrorKey(shortcuts.executeSql),
+      preventDefault: true,
       run: () => {
         if (view.value) emit("execute", executableSqlFromView(view.value));
         return true;
@@ -224,6 +225,7 @@ function runKeymapExtension(codeMirrorKeymap: (typeof import("@codemirror/view")
     },
     {
       key: shortcutToCodeMirrorKey(shortcuts.saveSql),
+      preventDefault: true,
       run: () => {
         emit("save");
         return true;
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index c8532073ab..b2fe0dae48 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -121,7 +121,13 @@ import {
   type DateTimeFormatterUnit,
 } from "@/lib/columnFormatter";
 import { temporalCellEditorKind, type TemporalCellEditorKind } from "@/lib/dataGridTemporalEditor";
-import { isCancelSearchShortcut, isFocusSearchShortcut, isToggleTransposeShortcut } from "@/lib/keyboardShortcuts";
+import {
+  isCancelSearchShortcut,
+  isCopyCurrentRowShortcut,
+  isDeleteCurrentRowShortcut,
+  isFocusSearchShortcut,
+  isToggleTransposeShortcut,
+} from "@/lib/keyboardShortcuts";
 import { dataGridHeaderContentWidth, scrollbarGutterWidth } from "@/lib/dataGridScrollGutter";
 import { dataGridSaveActionMode, dataGridSaveToolbarState } from "@/lib/dataGridSaveUi";
 import { appendColumnValueFilterCondition, buildColumnValueFilterCondition } from "@/lib/dataGridColumnFilter";
@@ -2441,6 +2447,40 @@ function editSelectedCell(): boolean {
   return true;
 }
 
+function selectedOrCurrentRowIds(): number[] {
+  const affected = affectedRowIds();
+  if (affected.length > 0) return affected;
+  const position = currentSelectedCellPosition();
+  if (!position) return [];
+  const item = displayItems.value[position.rowIndex];
+  return item ? [item.id] : [];
+}
+
+function copyCurrentRow(): boolean {
+  const rowIds = selectedOrCurrentRowIds();
+  if (rowIds.length === 0) return false;
+  if (rowIds.length === 1) {
+    cloneRow(rowIds[0]);
+    return true;
+  }
+  cloneRows(rowIds);
+  return true;
+}
+
+function deleteCurrentRow(): boolean {
+  const rowIds = selectedOrCurrentRowIds();
+  if (rowIds.length === 0) return false;
+
+  const deletableRowIds = rowIds.filter((rowId) => canDeleteRowItem(getRowItem(rowId)));
+  if (deletableRowIds.length === 0) return false;
+  if (deletableRowIds.length === 1) {
+    requestDeleteRow(deletableRowIds[0]);
+    return true;
+  }
+  requestDeleteRows(deletableRowIds);
+  return true;
+}
+
 function commitGridEdit() {
   commitEdit();
   nextTick(() => gridRef.value?.focus({ preventScroll: true }));
@@ -2453,6 +2493,14 @@ async function onGridKeydown(event: KeyboardEvent) {
     return;
   }
   if (eventTargetAllowsNativeClipboard(event)) return;
+  if (isCopyCurrentRowShortcut(event, settingsStore.editorSettings.shortcuts) && copyCurrentRow()) {
+    event.preventDefault();
+    return;
+  }
+  if (isDeleteCurrentRowShortcut(event, settingsStore.editorSettings.shortcuts) && deleteCurrentRow()) {
+    event.preventDefault();
+    return;
+  }
   if (isToggleTransposeShortcut(event, settingsStore.editorSettings.shortcuts) && toggleKeyboardTranspose()) {
     event.preventDefault();
     return;
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 7eaeae6204..bef3dc9e3f 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1255,6 +1255,8 @@ export default {
     redisScanPageSizeOption: "{count} keys",
     shortcutExecuteSql: "Execute SQL",
     shortcutSaveSql: "Save SQL",
+    shortcutCopyCurrentRow: "Copy current data row",
+    shortcutDeleteCurrentRow: "Delete current data row",
     shortcutNewQuery: "New query",
     shortcutCloseTab: "Close tab",
     shortcutFocusSearch: "Focus search",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 21fbd2b3a6..3b9bb26497 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -1154,6 +1154,8 @@ export default {
     redisScanPageSizeOption: "{count} claves",
     shortcutExecuteSql: "Ejecutar SQL",
     shortcutSaveSql: "Guardar SQL",
+    shortcutCopyCurrentRow: "Copiar fila de datos actual",
+    shortcutDeleteCurrentRow: "Eliminar fila de datos actual",
     shortcutNewQuery: "Nueva consulta",
     shortcutCloseTab: "Cerrar pestaña",
     shortcutFocusSearch: "Enfocar búsqueda",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index ff83c247fa..9c554337ab 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1230,6 +1230,8 @@ export default {
     redisScanPageSizeOption: "{count} 个 Key",
     shortcutExecuteSql: "执行 SQL",
     shortcutSaveSql: "保存 SQL",
+    shortcutCopyCurrentRow: "复制当前数据行",
+    shortcutDeleteCurrentRow: "删除当前数据行",
     shortcutNewQuery: "新建查询",
     shortcutCloseTab: "关闭标签页",
     shortcutFocusSearch: "聚焦搜索",
diff --git a/apps/desktop/src/lib/keyboardShortcuts.ts b/apps/desktop/src/lib/keyboardShortcuts.ts
index 608475d293..b7f7d1ca8d 100644
--- a/apps/desktop/src/lib/keyboardShortcuts.ts
+++ b/apps/desktop/src/lib/keyboardShortcuts.ts
@@ -102,6 +102,14 @@ export function isObjectSourceSaveShortcutTarget(
   return !!target?.closest("[data-object-source-editor], [data-object-source-preview]");
 }
 
+export function isCopyCurrentRowShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
+  return matchesShortcut(event, actionShortcut("copyCurrentRow", shortcuts));
+}
+
+export function isDeleteCurrentRowShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
+  return matchesShortcut(event, actionShortcut("deleteCurrentRow", shortcuts));
+}
+
 export function isCancelSearchShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
   return matchesShortcut(event, actionShortcut("cancelSearch", shortcuts));
 }
diff --git a/apps/desktop/src/lib/shortcutRegistry.ts b/apps/desktop/src/lib/shortcutRegistry.ts
index 491096cce6..21859ef31f 100644
--- a/apps/desktop/src/lib/shortcutRegistry.ts
+++ b/apps/desktop/src/lib/shortcutRegistry.ts
@@ -1,6 +1,8 @@
 export type ShortcutActionId =
   | "executeSql"
   | "saveSql"
+  | "copyCurrentRow"
+  | "deleteCurrentRow"
   | "newQuery"
   | "closeTab"
   | "focusSearch"
@@ -32,6 +34,18 @@ export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
     scope: "editor",
     defaultShortcut: "Mod+S",
   },
+  {
+    id: "copyCurrentRow",
+    labelKey: "settings.shortcutCopyCurrentRow",
+    scope: "grid",
+    defaultShortcut: "Mod+D",
+  },
+  {
+    id: "deleteCurrentRow",
+    labelKey: "settings.shortcutDeleteCurrentRow",
+    scope: "grid",
+    defaultShortcut: "Delete",
+  },
   {
     id: "newQuery",
     labelKey: "settings.shortcutNewQuery",
diff --git a/packages/app-tests/dataGridRowShortcutSource.test.ts b/packages/app-tests/dataGridRowShortcutSource.test.ts
new file mode 100644
index 0000000000..7e705949cd
--- /dev/null
+++ b/packages/app-tests/dataGridRowShortcutSource.test.ts
@@ -0,0 +1,12 @@
+import { readFileSync } from "node:fs";
+import { strict as assert } from "node:assert";
+import test from "node:test";
+
+const source = readFileSync("apps/desktop/src/components/grid/DataGrid.vue", "utf8");
+
+test("data grid wires copy and delete row shortcuts", () => {
+  assert.match(source, /isCopyCurrentRowShortcut/);
+  assert.match(source, /isDeleteCurrentRowShortcut/);
+  assert.match(source, /copyCurrentRow\(\)/);
+  assert.match(source, /deleteCurrentRow\(\)/);
+});
diff --git a/packages/app-tests/keyboardShortcuts.test.ts b/packages/app-tests/keyboardShortcuts.test.ts
index aa036b467e..9c004d066f 100644
--- a/packages/app-tests/keyboardShortcuts.test.ts
+++ b/packages/app-tests/keyboardShortcuts.test.ts
@@ -10,6 +10,8 @@ import {
   isObjectSourceSaveShortcutTarget,
   isRefreshDataShortcut,
   isSaveShortcut,
+  isCopyCurrentRowShortcut,
+  isDeleteCurrentRowShortcut,
   isToggleTransposeShortcut,
 } from "../../apps/desktop/src/lib/keyboardShortcuts.ts";
 import { shortcutToCodeMirrorKey } from "../../apps/desktop/src/lib/shortcutRegistry.ts";
@@ -112,6 +114,14 @@ test("matches Cmd+S for saving", () => {
   assert.equal(isSaveShortcut({ key: "s", metaKey: true }), true);
 });
 
+test("matches Mod+D for copying current row", () => {
+  assert.equal(isCopyCurrentRowShortcut({ key: "d", metaKey: true }), true);
+});
+
+test("matches Delete for deleting current row", () => {
+  assert.equal(isDeleteCurrentRowShortcut({ key: "Delete" }), true);
+});
+
 test("matches Ctrl+S for saving", () => {
   assert.equal(isSaveShortcut({ key: "S", ctrlKey: true }), true);
 });
diff --git a/packages/app-tests/settingsDialogLayout.test.ts b/packages/app-tests/settingsDialogLayout.test.ts
index 0fe0e89d52..5e28432bf5 100644
--- a/packages/app-tests/settingsDialogLayout.test.ts
+++ b/packages/app-tests/settingsDialogLayout.test.ts
@@ -36,6 +36,8 @@ test("settings dialog has a shortcuts category", () => {
   assert.match(source, /activeSettingsTab === ['"]shortcuts['"]/);
   assert.match(source, /SHORTCUT_DEFINITIONS/);
   assert.match(shortcutSource, /settings\.shortcutToggleTranspose/);
+  assert.match(shortcutSource, /settings\.shortcutCopyCurrentRow/);
+  assert.match(shortcutSource, /settings\.shortcutDeleteCurrentRow/);
 });
 
 test("settings editor theme preview can follow app appearance", () => {
diff --git a/packages/app-tests/settingsStore.test.ts b/packages/app-tests/settingsStore.test.ts
index 55f8825072..886d2a8f50 100644
--- a/packages/app-tests/settingsStore.test.ts
+++ b/packages/app-tests/settingsStore.test.ts
@@ -36,6 +36,8 @@ test("defaults shortcut settings", () => {
 
   assert.equal(settings.shortcuts.executeSql, "Mod+Enter");
   assert.equal(settings.shortcuts.saveSql, "Mod+S");
+  assert.equal(settings.shortcuts.copyCurrentRow, "Mod+D");
+  assert.equal(settings.shortcuts.deleteCurrentRow, "Delete");
   assert.equal(settings.shortcuts.newQuery, "Mod+T");
   assert.equal(settings.shortcuts.focusSearch, "Mod+F");
   assert.equal(settings.shortcuts.refreshData, "F5");
@@ -44,10 +46,17 @@ test("defaults shortcut settings", () => {
 
 test("keeps saved shortcut overrides", () => {
   const settings = normalizeEditorSettings({
-    shortcuts: { executeSql: "Shift+Mod+Enter", newQuery: "Shift+Mod+N" } as any,
+    shortcuts: {
+      executeSql: "Shift+Mod+Enter",
+      copyCurrentRow: "Alt+Shift+D",
+      deleteCurrentRow: "Backspace",
+      newQuery: "Shift+Mod+N",
+    } as any,
   });
 
   assert.equal(settings.shortcuts.executeSql, "Shift+Mod+Enter");
+  assert.equal(settings.shortcuts.copyCurrentRow, "Alt+Shift+D");
+  assert.equal(settings.shortcuts.deleteCurrentRow, "Backspace");
   assert.equal(settings.shortcuts.newQuery, "Shift+Mod+N");
   assert.equal(settings.shortcuts.saveSql, "Mod+S");
 });