mirror of
https://github.com/rubickCenter/rubick
synced 2025-06-08 19:54:05 +08:00
bugfix: [#52]windows alt + space 热键冲突问题
This commit is contained in:
parent
c89ecb9c66
commit
26bd47cce7
@ -18,15 +18,15 @@
|
|||||||
<div class="title">快捷键(需要使用 option/ctrl/shift/command 键修饰)</div>
|
<div class="title">快捷键(需要使用 option/ctrl/shift/command 键修饰)</div>
|
||||||
<div class="settings-item-li">
|
<div class="settings-item-li">
|
||||||
<div class="label">显示/隐藏快捷键</div>
|
<div class="label">显示/隐藏快捷键</div>
|
||||||
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'showAndHidden')">{{ config.perf.shortCut.showAndHidden }}</div>
|
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'showAndHidden')">{{ config.perf.shortCut.showAndHidden }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="settings-item-li">
|
<div class="settings-item-li">
|
||||||
<div class="label">插件分离快捷键</div>
|
<div class="label">插件分离快捷键</div>
|
||||||
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'separate')">{{ config.perf.shortCut.separate }}</div>
|
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'separate')">{{ config.perf.shortCut.separate }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="settings-item-li">
|
<div class="settings-item-li">
|
||||||
<div class="label">返回主界面</div>
|
<div class="label">返回主界面</div>
|
||||||
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'quit')">{{ config.perf.shortCut.quit }}</div>
|
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'quit')">{{ config.perf.shortCut.quit }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item">
|
||||||
@ -88,7 +88,7 @@
|
|||||||
v-for="(item, index) in config.global"
|
v-for="(item, index) in config.global"
|
||||||
class="value"
|
class="value"
|
||||||
tabIndex=-1
|
tabIndex=-1
|
||||||
@keydown="(e) => changeGlobalKey(e, index)"
|
@keyup="(e) => changeGlobalKey(e, index)"
|
||||||
>
|
>
|
||||||
{{ item.key }}
|
{{ item.key }}
|
||||||
</div>
|
</div>
|
||||||
@ -171,7 +171,7 @@ export default {
|
|||||||
changeGlobalKey(e, index) {
|
changeGlobalKey(e, index) {
|
||||||
let compose;
|
let compose;
|
||||||
if(e.altKey && e.keyCode !== 18){
|
if(e.altKey && e.keyCode !== 18){
|
||||||
compose = `Option+${keycodes[e.keyCode].toUpperCase()}`;
|
compose = `Alt+${keycodes[e.keyCode].toUpperCase()}`;
|
||||||
}
|
}
|
||||||
if(e.ctrlKey && e.keyCode !== 17){
|
if(e.ctrlKey && e.keyCode !== 17){
|
||||||
compose = `Ctrl+${keycodes[e.keyCode].toUpperCase()}`;
|
compose = `Ctrl+${keycodes[e.keyCode].toUpperCase()}`;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user