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) {