diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index e28592450..440e3ded7 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -169,14 +169,15 @@ $A.execMainCacheJudge = (key) => { // 绑定截图快捷键 $A.bindScreenshotKey = (data) => { let key = ""; - if (data.screenshot_key && (data.screenshot_mate || data.screenshot_shift)) { + let screenshot_key = (data.screenshot_key || "").trim().toLowerCase() + if (screenshot_key && (data.screenshot_mate || data.screenshot_shift)) { if (data.screenshot_mate) { key = /macintosh|mac os x/i.test(navigator.userAgent) ? 'command' : 'ctrl' } if (data.screenshot_shift) { key = `${key ? `${key}+` : ''}shift` } - key = `${key}+${data.screenshot_key.toLowerCase()}` + key = `${key}+${screenshot_key.toLowerCase()}` } $A.Electron.sendMessage('bindScreenshotKey', {key}); }; diff --git a/resources/assets/js/pages/manage/setting/keyboard.vue b/resources/assets/js/pages/manage/setting/keyboard.vue index f5dc9d7cb..68e96c642 100644 --- a/resources/assets/js/pages/manage/setting/keyboard.vue +++ b/resources/assets/js/pages/manage/setting/keyboard.vue @@ -74,7 +74,7 @@ export default { onKeydown({key, keyCode}) { if (keyCode !== 8) { - key = key && key.length === 1 ? key.toUpperCase() : "" + key = key && key.length === 1 ? key.trim().toUpperCase() : "" if (key) { this.formData.screenshot_key = key }