From 6e021637523b0c4190c44b893c1832ce2778fc97 Mon Sep 17 00:00:00 2001 From: sovlookup Date: Sun, 26 Sep 2021 10:25:40 +0800 Subject: [PATCH 1/8] add wechat qrcode --- README.md | 3 +++ README.zh-CN.md | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index e444ec7..89e7f21 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/README.zh-CN.md b/README.zh-CN.md index 5ccf924..6dd43c6 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -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) From 243c954ab6962616f6339236d073075ceed3a7ff Mon Sep 17 00:00:00 2001 From: sovlookup Date: Sun, 26 Sep 2021 10:33:17 +0800 Subject: [PATCH 2/8] add wechat qrcode --- docs/docs/guide/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/docs/guide/README.md b/docs/docs/guide/README.md index 563a973..33025ce 100644 --- a/docs/docs/guide/README.md +++ b/docs/docs/guide/README.md @@ -54,3 +54,8 @@ 如果您还需要更多功能，欢迎来这里给我们提建议：[issues](https://github.com/clouDr-f2e/rubick/issues/20) 有价值的想法我们会加入到后期的开发当中。同时也欢迎一起加入共建。 +### 联系我们 + +扫码关注 Rubick 官微, 与我们保持联系： + +![wechat](https://z3.ax1x.com/2021/09/26/4yRpN9.jpg) \ No newline at end of file From 26bd47cce7229a9e11afef4d7c94d6a5ef1836ba Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Mon, 27 Sep 2021 11:47:04 +0800 Subject: [PATCH 3/8] =?UTF-8?q?bugfix:=20[#52]windows=20alt=20+=20space=20?= =?UTF-8?q?=E7=83=AD=E9=94=AE=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/pages/search/subpages/settings.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer/pages/search/subpages/settings.vue b/src/renderer/pages/search/subpages/settings.vue index b450d6b..0a2fc79 100644 --- a/src/renderer/pages/search/subpages/settings.vue +++ b/src/renderer/pages/search/subpages/settings.vue @@ -18,15 +18,15 @@
快捷键(需要使用 option/ctrl/shift/command 键修饰)
显示/隐藏快捷键
-
{{ config.perf.shortCut.showAndHidden }}
+
{{ config.perf.shortCut.showAndHidden }}
插件分离快捷键
-
{{ config.perf.shortCut.separate }}
+
{{ config.perf.shortCut.separate }}
返回主界面
-
{{ config.perf.shortCut.quit }}
+
{{ config.perf.shortCut.quit }}
@@ -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 }}
@@ -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()}`; From 96f2f6278750207553533d9bd9f9b7131cfbf7de Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Mon, 27 Sep 2021 11:47:10 +0800 Subject: [PATCH 4/8] chore(release): 0.0.11 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8ffd2d..6b7014d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/package.json b/package.json index 8e9af1b..5c33fc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubick2", - "version": "0.0.10", + "version": "0.0.11", "author": "muwoo <2424880409@qq.com>", "description": "An electron-vue project", "license": null, From 79b60b89a543773ab05392fd2b90db04ae5020ef Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Mon, 27 Sep 2021 19:07:49 +0800 Subject: [PATCH 5/8] =?UTF-8?q?ref:=20=E6=94=AF=E6=8C=81=E6=96=B0api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/preload.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/preload.js b/static/preload.js index 7a81156..0f794d8 100644 --- a/static/preload.js +++ b/static/preload.js @@ -239,6 +239,7 @@ window.rubick = { removeFeature(code) { ipcRenderer.sendToHost('removeFeature', {code}); + return true; }, // 系统 shellOpenExternal(url) { @@ -253,6 +254,10 @@ window.rubick = { return os.type() === 'Windows_NT'; }, + isLinux() { + return os.type() === 'Linux'; + }, + shellOpenPath(path) { shell.openPath(path) }, From 50452bc36bb1aa704610294fb309310afafac54d Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Tue, 28 Sep 2021 11:25:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?bugfix:=20[48];=20win=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=87=BA=E7=8E=B0=E5=8D=B8=E8=BD=BD=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=82=20ref:=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96rubick=20removeFeature=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/common/monitor.js | 10 +--------- src/renderer/assets/common/win-app.js | 2 +- static/preload.js | 4 +++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/common/monitor.js b/src/main/common/monitor.js index 8ef56a0..caeca36 100644 --- a/src/main/common/monitor.js +++ b/src/main/common/monitor.js @@ -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(); }); - updateData(); } export default { diff --git a/src/renderer/assets/common/win-app.js b/src/renderer/assets/common/win-app.js index 32abdc1..22e9966 100644 --- a/src/renderer/assets/common/win-app.js +++ b/src/renderer/assets/common/win-app.js @@ -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); diff --git a/static/preload.js b/static/preload.js index 0f794d8..029d478 100644 --- a/static/preload.js +++ b/static/preload.js @@ -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,7 +241,7 @@ window.rubick = { removeFeature(code) { ipcRenderer.sendToHost('removeFeature', {code}); - return true; + return !!rubick.features.filter(fe => fe.code === code).length; }, // 系统 shellOpenExternal(url) { From c3fdbbc3a8abb5946ea4994c954413985b4cc5a0 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Tue, 28 Sep 2021 11:28:49 +0800 Subject: [PATCH 7/8] chore(release): 0.0.12 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b7014d..d4f8c8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ 变更日志 +### [0.0.12](https://github.com/clouDr-f2e/rubick/compare/v0.0.11...v0.0.12) (2021-09-28) + + +### 重构 + +* 支持新api ([79b60b8](https://github.com/clouDr-f2e/rubick/commit/79b60b89a543773ab05392fd2b90db04ae5020ef)) + ### [0.0.11](https://github.com/clouDr-f2e/rubick/compare/v0.0.10...v0.0.11) (2021-09-27) diff --git a/package.json b/package.json index 5c33fc2..f3af12c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubick2", - "version": "0.0.11", + "version": "0.0.12", "author": "muwoo <2424880409@qq.com>", "description": "An electron-vue project", "license": null, From 80476aadf73f08860b77129ee1b57e694730ac10 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Tue, 28 Sep 2021 11:31:44 +0800 Subject: [PATCH 8/8] changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f8c8c..f266db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,12 @@ ### 重构 - +* 优化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)