From f5ce46431b079fed4746a909e7c29d93fe4d3718 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 27 Jan 2022 09:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=8D=B7=E9=94=AE?=
 =?UTF-8?q?=E4=B8=8E=E9=BB=98=E8=AE=A4=E6=8C=89=E9=94=AE=E8=A1=8C=E4=B8=BA?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md        | 4 ++++
 src/renderer/event/index.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 3a849765..25cee2de 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,7 @@
 ### 优化
 
 - 优化kw源英文与翻译歌词的匹配
+
+### 修复
+
+- 修复快捷键与默认按键行为冲突的问题，现在若将某些有默认行为的按键（如在列表中上、下箭头、Home、End等键可以使列表滚动）设置为快捷键时，将禁用其默认行为
diff --git a/src/renderer/event/index.js b/src/renderer/event/index.js
index 665a3eef..6f974efc 100644
--- a/src/renderer/event/index.js
+++ b/src/renderer/event/index.js
@@ -25,6 +25,7 @@ eventHub.on(baseName.bindKey, () => {
     eventHub.emit(baseName.key_down, { event, keys, key, type })
     // console.log(event, key)
     if (!window.isEditingHotKey && appHotKeyConfig.local.enable && appHotKeyConfig.local.keys[key]) {
+      event.preventDefault()
       if (type == 'up') return
 
       // 软件内快捷键的最小化触发时