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

Merge branch 'master' of github.com:clouDr-f2e/rubick into dev-tcsnzh

Browse Source
This commit is contained in:
tcsnzh 2021-10-02 11:27:23 +08:00
commit ef6ac06c40
9 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGELOG.md
View File

@ -1,4 +1,22 @@
变更日志
### [0.0.12](https://github.com/clouDr-f2e/rubick/compare/v0.0.11...v0.0.12) (2021-09-28)
### 重构
* 优化rubick removeFeature API
* 支持新api ([79b60b8](https://github.com/clouDr-f2e/rubick/commit/79b60b89a543773ab05392fd2b90db04ae5020ef))
### Bug 修复
* [#46]; win应用搜索出现卸载应用问题
### [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)

3
README.md
View File

@ -97,6 +97,9 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
扫码关注 Rubick 官微, 获取最新动态：
![wechat](https://z3.ax1x.com/2021/09/26/4yRpN9.jpg)
## ChangeLog
[CHANGELOG](https://github.com/clouDr-f2e/rubick/blob/master/CHANGELOG.md)

4
README.zh-CN.md
View File

@ -99,6 +99,10 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
扫码关注 Rubick 官微, 获取最新动态：
![wechat](https://z3.ax1x.com/2021/09/26/4yRpN9.jpg)
## 更新日志
[ChangeLog](https://github.com/clouDr-f2e/rubick/blob/master/CHANGELOG.md)

5
docs/docs/guide/README.md
View File

@ -54,3 +54,8 @@
如果您还需要更多功能，欢迎来这里给我们提建议：[issues](https://github.com/clouDr-f2e/rubick/issues/20)
有价值的想法我们会加入到后期的开发当中。同时也欢迎一起加入共建。
### 联系我们
扫码关注 Rubick 官微, 与我们保持联系：
![wechat](https://z3.ax1x.com/2021/09/26/4yRpN9.jpg)

2
package.json
View File

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

8
src/main/common/monitor.js
View File

@ -104,18 +104,10 @@ const touchBar = new TouchBar({
]
})
let intervalObj;
const start = (window) => {
window.on('blur', () => {
clearInterval(intervalObj);
});
window.on('focus', () => {
intervalObj = setInterval(() => {
updateData();
}, 1000);
});
updateData();
}
export default {

2
src/renderer/assets/common/win-app.js
View File

@ -47,7 +47,7 @@ function fileDisplay(filePath){
const appName = filename.split('.')[0];
const keyWords = [appName];
const appDetail = shell.readShortcutLink(filedir);
if (!appDetail.target) return;
if (!appDetail.target || appDetail.target.toLowerCase().indexOf('unin') >= 0) return;
if (isZhRegex.test(appName)) {
const py = translate(appName);

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

@ -18,15 +18,15 @@
<div class="title">快捷键(需要使用 option/ctrl/shift/command 键修饰)</div>
<div class="settings-item-li">
<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 class="settings-item-li">
<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 class="settings-item-li">
<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 class="setting-item">
@ -88,7 +88,7 @@
v-for="(item, index) in config.global"
class="value"
tabIndex=-1
@keydown="(e) => changeGlobalKey(e, index)"
@keyup="(e) => changeGlobalKey(e, index)"
>
{{ item.key }}
</div>
@ -171,7 +171,7 @@ export default {
changeGlobalKey(e, index) {
let compose;
if(e.altKey && e.keyCode !== 18){
compose = `Option+${keycodes[e.keyCode].toUpperCase()}`;
compose = `Alt+${keycodes[e.keyCode].toUpperCase()}`;
}
if(e.ctrlKey && e.keyCode !== 17){
compose = `Ctrl+${keycodes[e.keyCode].toUpperCase()}`;

7
static/preload.js
View File

@ -225,10 +225,12 @@ window.rubick = {
isDarkColors() {
return false;
},
features: [],
getFeatures() {
ipcRenderer.sendToHost('getFeatures');
return new Promise(resolve => {
ipcRenderer.on(`msg-back-getFeatures`, (e, result) => {
rubick.features = result;
resolve(result);
});
});
@ -239,6 +241,7 @@ window.rubick = {
removeFeature(code) {
ipcRenderer.sendToHost('removeFeature', {code});
return !!rubick.features.filter(fe => fe.code === code).length;
},
// 系统
shellOpenExternal(url) {
@ -253,6 +256,10 @@ window.rubick = {
return os.type() === 'Windows_NT';
},
isLinux() {
return os.type() === 'Linux';
},
shellOpenPath(path) {
shell.openPath(path)
},