修复设置快捷键时的处理逻辑问题

publish/changeLog.md

@@ -11,6 +11,7 @@
 
 - 修复若配置了`http_proxy`环境变量时，会意外使用此代理配置的问题
 - 修复多选后切换列表后不会清空多选内容的问题
+- 修复设置快捷键时的处理逻辑问题
 
 ### 文档
 

src/renderer/event/index.js

@@ -24,8 +24,10 @@ eventHub.on(baseName.bindKey, () => {
     // console.log(`key_${key}_${type}`)
     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()
+    // console.log(key, eventKey, type, event, keys)
+    if (window.isEditingHotKey) return
+    if (appHotKeyConfig.local.enable && appHotKeyConfig.local.keys[key]) {
+      event?.preventDefault()
       if (type == 'up') return
 
       // 软件内快捷键的最小化触发时

src/renderer/utils/keyBind.js

@@ -107,7 +107,7 @@ const unbindKey = () => {
 const clearDownKeys = () => {
   let keys = Array.from(downKeys)
   for (let i = keys.length - 1; i > -1; i--) {
-    handleSendEvent(keys[i], 'up')
+    handleSendEvent(keys[i], keys[i], 'up', null, [keys[i]])
   }
   downKeys.clear()
 }

src/renderer/views/setting/components/SettingHotKey.vue

@@ -102,13 +102,14 @@ export default {
       })
     }
 
-    const handleHotKeyBlur = async(event, info, type) => {
+    const handleHotKeyBlur = (event, info, type) => {
+      setTimeout(async() => {
         await hotKeySetEnable(true)
         window.isEditingHotKey = false
         isEditHotKey = false
         const prevInput = hotKeyTargetInput
         hotKeyTargetInput = null
-      if (prevInput.value == t('setting__hot_key_tip_input')) {
+        if (prevInput?.value == t('setting__hot_key_tip_input')) {
           prevInput.value = newHotKey ? formatHotKeyName(newHotKey) : ''
           return
         }
@@ -161,6 +162,7 @@ export default {
         }
         await handleHotKeySaveConfig()
         await getHotKeyStatus()
+      })
     }
 
     const handleKeyDown = ({ event, keys, key, type }) => {