github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 19:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 客户端提交截图空格报错的问题

Browse Source
This commit is contained in:
kuaifan 2022-12-07 21:43:52 +08:00
parent f4a7b8e2bb
commit 4b90086e5a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/app.js vendored
View File

@ -169,14 +169,15 @@ $A.execMainCacheJudge = (key) => {
// 绑定截图快捷键 // 绑定截图快捷键
$A.bindScreenshotKey = (data) => { $A.bindScreenshotKey = (data) => {
let key = ""; 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) { if (data.screenshot_mate) {
key = /macintosh|mac os x/i.test(navigator.userAgent) ? 'command' : 'ctrl' key = /macintosh|mac os x/i.test(navigator.userAgent) ? 'command' : 'ctrl'
} }
if (data.screenshot_shift) { if (data.screenshot_shift) {
key = `${key ? `${key}+` : ''}shift` key = `${key ? `${key}+` : ''}shift`
} }
key = `${key}+${data.screenshot_key.toLowerCase()}` key = `${key}+${screenshot_key.toLowerCase()}`
} }
$A.Electron.sendMessage('bindScreenshotKey', {key}); $A.Electron.sendMessage('bindScreenshotKey', {key});
}; };

2
resources/assets/js/pages/manage/setting/keyboard.vue
View File

@ -74,7 +74,7 @@ export default {
onKeydown({key, keyCode}) { onKeydown({key, keyCode}) {
if (keyCode !== 8) { if (keyCode !== 8) {
key = key && key.length === 1 ? key.toUpperCase() : "" key = key && key.length === 1 ? key.trim().toUpperCase() : ""
if (key) { if (key) {
this.formData.screenshot_key = key this.formData.screenshot_key = key
} }