From e7a7b85f259846a2693748cf85d532b3aae38e5d Mon Sep 17 00:00:00 2001
From: Li Kui <90845831+likui628@users.noreply.github.com>
Date: Sat, 6 Jul 2024 17:11:29 +0800
Subject: [PATCH 1/2] fix: fix preferences locale wrong

---
 packages/locales/src/langs/en-US.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/locales/src/langs/en-US.yaml b/packages/locales/src/langs/en-US.yaml
index e20eedf2..45084689 100644
--- a/packages/locales/src/langs/en-US.yaml
+++ b/packages/locales/src/langs/en-US.yaml
@@ -242,8 +242,8 @@ preferences:
     mode-auto-scroll: Scroll hide/display
   footer:
     title: Footer
-    visible: Fixed at the bottom
-    fixed: Display Footer
+    visible: Display Footer
+    fixed: Fixed at the bottom
   copyright:
     title: Copyright
     enable: Enable CopyRight

From f7ed8b31997b780ec01cbb24b4f90ea6e7a8e1ea Mon Sep 17 00:00:00 2001
From: Li Kui <90845831+likui628@users.noreply.github.com>
Date: Sat, 6 Jul 2024 18:13:52 +0800
Subject: [PATCH 2/2] fix: prevent default searching in browser

---
 .../src/global-search/global-search.vue       | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/packages/business/widgets/src/global-search/global-search.vue b/packages/business/widgets/src/global-search/global-search.vue
index da2a24b4..1ab34cf4 100644
--- a/packages/business/widgets/src/global-search/global-search.vue
+++ b/packages/business/widgets/src/global-search/global-search.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@vben/types';
 
-import { ref } from 'vue';
+import { onMounted, onUnmounted, ref, watch } from 'vue';
 
 import { $t } from '@vben/locales';
 import {
@@ -46,15 +46,37 @@ function handleClose() {
   keyword.value = '';
 }
 
-if (props.enableShortcutKey) {
-  const keys = useMagicKeys();
-  const cmd = isWindowsOs() ? keys['ctrl+k'] : keys['cmd+k'];
-  whenever(cmd, () => {
-    if (props.enableShortcutKey) {
-      open.value = true;
-    }
+const keys = useMagicKeys();
+const cmd = isWindowsOs() ? keys['ctrl+k'] : keys['cmd+k'];
+whenever(cmd, () => {
+  if (props.enableShortcutKey) {
+    open.value = true;
+  }
+});
+
+const preventDefaultBrowserSearchHotKey = (event: KeyboardEvent) => {
+  if (event.key.toLowerCase() === 'k' && (event.metaKey || event.ctrlKey)) {
+    event.preventDefault();
+  }
+};
+
+const toggleKeydownListener = () => {
+  if (props.enableShortcutKey) {
+    window.addEventListener('keydown', preventDefaultBrowserSearchHotKey);
+  } else {
+    window.removeEventListener('keydown', preventDefaultBrowserSearchHotKey);
+  }
+};
+
+watch(() => props.enableShortcutKey, toggleKeydownListener);
+
+onMounted(() => {
+  toggleKeydownListener();
+
+  onUnmounted(() => {
+    window.removeEventListener('keydown', preventDefaultBrowserSearchHotKey);
   });
-}
+});
 </script>
 
 <template>