yexuejc007/rubick
1
0
Fork 0
mirror of https://github.com/rubickCenter/rubick synced 2025-06-23 04:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rubick-2.0'

Browse Source
This commit is contained in:
muwoo 2021-09-27 11:47:29 +08:00
commit 7064f504de
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,4 +1,12 @@
变更日志 变更日志
### [0.0.11](https://github.com/clouDr-f2e/rubick/compare/v0.0.10...v0.0.11) (2021-09-27)
### 文档
* 增加 changelog 功能 ([c89ecb9](https://github.com/clouDr-f2e/rubick/commit/c89ecb9c66607f5d390c564d753bc30bd180bf91))
* 增加 changelog 功能 ([0a1ba91](https://github.com/clouDr-f2e/rubick/commit/0a1ba91792dcf71c64896d9ec26b266e2c9b0355))
### [0.0.10](https://github.com/clouDr-f2e/rubick/compare/v0.0.9...v0.0.10) (2021-09-23) ### [0.0.10](https://github.com/clouDr-f2e/rubick/compare/v0.0.9...v0.0.10) (2021-09-23)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "rubick2", "name": "rubick2",
"version": "0.0.10", "version": "0.0.11",
"author": "muwoo <2424880409@qq.com>", "author": "muwoo <2424880409@qq.com>",
"description": "An electron-vue project", "description": "An electron-vue project",
"license": null, "license": null,

10
src/renderer/pages/search/subpages/settings.vue
View File

@ -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()}`;