From 28f4aec50da9efa273a7767fabe69d25c4f9826f Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Mon, 18 May 2026 16:20:19 +0800
Subject: [PATCH] fix(shortcuts): refresh data with F5

---
 apps/desktop/src/App.vue                           |  7 +++++++
 apps/desktop/src/components/layout/ContentArea.vue |  8 +++++++-
 apps/desktop/src/i18n/locales/en.ts                |  1 +
 apps/desktop/src/i18n/locales/es.ts                |  1 +
 apps/desktop/src/i18n/locales/zh-CN.ts             |  1 +
 apps/desktop/src/lib/keyboardShortcuts.ts          |  4 ++++
 apps/desktop/src/lib/shortcutRegistry.ts           |  8 +++++++-
 packages/app-tests/keyboardShortcuts.test.ts       | 13 +++++++++++++
 packages/app-tests/settingsStore.test.ts           |  1 +
 9 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index 34bafd8f0c..54fc0bf19e 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -43,6 +43,7 @@ import {
   isExecuteSqlShortcut,
   isFocusSearchShortcut,
   isObjectSourceSaveShortcutTarget,
+  isRefreshDataShortcut,
   isSaveShortcut,
 } from "@/lib/keyboardShortcuts";
 import { isPreviewTab } from "@/lib/tabPresentation";
@@ -562,6 +563,12 @@ function handleKeydown(e: KeyboardEvent) {
     }
     return;
   }
+  if (isRefreshDataShortcut(e, shortcuts)) {
+    e.preventDefault();
+    e.stopPropagation();
+    contentAreaRef.value?.refreshData();
+    return;
+  }
   if (isCloseTabShortcut(e, shortcuts)) {
     e.preventDefault();
     if (showDriverStore.value) {
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index c83a101c5d..0f3498a4b6 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -198,7 +198,13 @@ function focusSearch(): boolean {
   return dataGridRef.value?.focusSearch() ?? false;
 }
 
-defineExpose({ focusSearch });
+function refreshData(): boolean {
+  if (!dataGridRef.value) return false;
+  void dataGridRef.value.onToolbarRefresh();
+  return true;
+}
+
+defineExpose({ focusSearch, refreshData });
 </script>
 
 <template>
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 282b126536..33db7afbae 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1141,6 +1141,7 @@ export default {
     shortcutSaveSql: "Save SQL",
     shortcutCloseTab: "Close tab",
     shortcutFocusSearch: "Focus search",
+    shortcutRefreshData: "Refresh data",
     shortcutCancelSearch: "Cancel search",
     shortcutScopeGlobal: "Global",
     shortcutScopeEditor: "SQL editor",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 1b7d2e35b2..647c3e0ab7 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -1046,6 +1046,7 @@ export default {
     shortcutSaveSql: "Guardar SQL",
     shortcutCloseTab: "Cerrar pestaña",
     shortcutFocusSearch: "Enfocar búsqueda",
+    shortcutRefreshData: "Actualizar datos",
     shortcutCancelSearch: "Cancelar búsqueda",
     shortcutScopeGlobal: "Global",
     shortcutScopeEditor: "Editor SQL",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index e113ce2e99..2f03f27549 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1118,6 +1118,7 @@ export default {
     shortcutSaveSql: "保存 SQL",
     shortcutCloseTab: "关闭标签页",
     shortcutFocusSearch: "聚焦搜索",
+    shortcutRefreshData: "刷新数据",
     shortcutCancelSearch: "取消搜索",
     shortcutScopeGlobal: "全局",
     shortcutScopeEditor: "SQL 编辑器",
diff --git a/apps/desktop/src/lib/keyboardShortcuts.ts b/apps/desktop/src/lib/keyboardShortcuts.ts
index 486cd87574..e2c53f9b0d 100644
--- a/apps/desktop/src/lib/keyboardShortcuts.ts
+++ b/apps/desktop/src/lib/keyboardShortcuts.ts
@@ -80,6 +80,10 @@ export function isFocusSearchShortcut(event: ShortcutLikeEvent, shortcuts?: Part
   return matchesShortcut(event, actionShortcut("focusSearch", shortcuts));
 }
 
+export function isRefreshDataShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
+  return matchesShortcut(event, actionShortcut("refreshData", shortcuts));
+}
+
 export function isSaveShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
   return matchesShortcut(event, actionShortcut("saveSql", shortcuts));
 }
diff --git a/apps/desktop/src/lib/shortcutRegistry.ts b/apps/desktop/src/lib/shortcutRegistry.ts
index ff1fea9c4f..426c24b893 100644
--- a/apps/desktop/src/lib/shortcutRegistry.ts
+++ b/apps/desktop/src/lib/shortcutRegistry.ts
@@ -1,4 +1,4 @@
-export type ShortcutActionId = "executeSql" | "saveSql" | "closeTab" | "focusSearch" | "cancelSearch";
+export type ShortcutActionId = "executeSql" | "saveSql" | "closeTab" | "focusSearch" | "refreshData" | "cancelSearch";
 
 export type ShortcutScope = "global" | "editor" | "search";
 
@@ -36,6 +36,12 @@ export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
     scope: "global",
     defaultShortcut: "Mod+F",
   },
+  {
+    id: "refreshData",
+    labelKey: "settings.shortcutRefreshData",
+    scope: "global",
+    defaultShortcut: "F5",
+  },
   {
     id: "cancelSearch",
     labelKey: "settings.shortcutCancelSearch",
diff --git a/packages/app-tests/keyboardShortcuts.test.ts b/packages/app-tests/keyboardShortcuts.test.ts
index bd9f1834f0..27f20a15ac 100644
--- a/packages/app-tests/keyboardShortcuts.test.ts
+++ b/packages/app-tests/keyboardShortcuts.test.ts
@@ -7,6 +7,7 @@ import {
   isExecuteSqlShortcut,
   isFocusSearchShortcut,
   isObjectSourceSaveShortcutTarget,
+  isRefreshDataShortcut,
   isSaveShortcut,
 } from "../../apps/desktop/src/lib/keyboardShortcuts.ts";
 import { shortcutToCodeMirrorKey } from "../../apps/desktop/src/lib/shortcutRegistry.ts";
@@ -67,6 +68,18 @@ test("matches Cmd+F for focusing search", () => {
   assert.equal(isFocusSearchShortcut({ key: "F", metaKey: true }), true);
 });
 
+test("matches F5 for refreshing data", () => {
+  assert.equal(isRefreshDataShortcut({ key: "F5" }), true);
+});
+
+test("matches custom shortcut settings for refreshing data", () => {
+  assert.equal(isRefreshDataShortcut({ key: "F5" }, { refreshData: "Shift+Mod+R" } as any), false);
+  assert.equal(
+    isRefreshDataShortcut({ key: "r", metaKey: true, shiftKey: true } as any, { refreshData: "Shift+Mod+R" } as any),
+    true,
+  );
+});
+
 test("ignores focus search shortcut while composing", () => {
   assert.equal(isFocusSearchShortcut({ key: "f", ctrlKey: true, isComposing: true }), false);
 });
diff --git a/packages/app-tests/settingsStore.test.ts b/packages/app-tests/settingsStore.test.ts
index 3e88a39d95..c32bf7ad8a 100644
--- a/packages/app-tests/settingsStore.test.ts
+++ b/packages/app-tests/settingsStore.test.ts
@@ -22,6 +22,7 @@ test("defaults shortcut settings", () => {
   assert.equal(settings.shortcuts.executeSql, "Mod+Enter");
   assert.equal(settings.shortcuts.saveSql, "Mod+S");
   assert.equal(settings.shortcuts.focusSearch, "Mod+F");
+  assert.equal(settings.shortcuts.refreshData, "F5");
 });
 
 test("keeps saved shortcut overrides", () => {