Merge pull request #464 from lanxiuyun/fix-feature-npm-i

fix: feature中的npm i

feature/package.json

@@ -42,7 +42,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-vue": "^7.0.0",
     "less": "^4.1.3",
-    "less-loader": "5.0.0",
+    "less-loader": "^6.2.0",
     "prettier": "^2.2.1",
     "typescript": "~4.1.5"
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

src/main/common/registerHotKey.ts

@@ -110,9 +110,14 @@ const registerHotKey = (mainWindow: BrowserWindow): void => {
       // mainWindow.show();
     });
 
-    globalShortcut.register('CommandOrControl+W', () => {
+    // 添加局部快捷键监听
-      if (mainWindow && !mainWindow.isDestroyed() && mainWindow.isFocused()) {
+    mainWindow.webContents.on('before-input-event', (event, input) => {
-        mainWindow.hide();
+      if (input.key.toLowerCase() === 'w'
+        && (input.control || input.meta) && !input.alt && !input.shift) {
+        event.preventDefault();
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.hide();
+        }
       }
     });