新增：分离窗口快捷键

Author: modstart

electron/mapi/manager/config/config.ts

@@ -13,7 +13,7 @@ import {ManagerHotkey} from "../hotkey";
 import {MemoryCacheUtil} from "../../../lib/util";
 import {ManagerPlugin} from "../plugin";
 import {ManagerSystem} from "../system";
-import {isWin} from "../../../lib/env";
+import {isLinux, isMac, isWin} from "../../../lib/env";
 
 const defaultConfig: ConfigRecord = {
     mainTrigger: {
@@ -24,10 +24,18 @@ const defaultConfig: ConfigRecord = {
         shiftKey: false,
         times: 1,
     },
+    detachWindowTrigger: {
+        key: 'D',
+        altKey: false,
+        ctrlKey: !isMac,
+        metaKey: isMac,
+        shiftKey: false,
+        times: 1,
+    },
     fastPanelTrigger: {
         type: 'Ctrl',
         times: 1,
-    }
+    },
     // fastPanelTriggerButton: {
     //     button: HotkeyMouseButtonEnum.RIGHT,
     //     type: 'longPress',
@@ -86,17 +94,17 @@ export const ManagerConfig = {
             ...config
         }
         await KVDBMain.putForce(CommonConfig.dbSystem, doc)
-        let changed = false
+        let hotkeyChanged = false
         if (this.configOld) {
-            if (!changed && JSON.stringify(this.configOld.mainTrigger) !== JSON.stringify(config.mainTrigger)) {
-                changed = true
-            }
-            if (!changed && JSON.stringify(this.configOld.fastPanelTrigger) !== JSON.stringify(config.fastPanelTrigger)) {
-                changed = true
+            for (const k of ['mainTrigger', 'fastPanelTrigger']) {
+                if (JSON.stringify(this.configOld[k]) !== JSON.stringify(config[k])) {
+                    hotkeyChanged = true
+                    break
+                }
             }
         }
         MemoryCacheUtil.forget('Config')
-        if (changed) {
+        if (hotkeyChanged) {
             ManagerHotkey.configInit().then()
         }
     },

electron/mapi/manager/hotkey/index.ts

@@ -252,16 +252,18 @@ export const ManagerHotkey = {
         this.keyConfigs = []
 
         const config = await ManagerConfig.get()
-        if (config.mainTrigger) {
-            this.keyConfigs.push({
-                name: 'mainTrigger',
-                keycode: keyToKeyCode(config.mainTrigger.key),
-                altKey: config.mainTrigger.altKey,
-                ctrlKey: config.mainTrigger.ctrlKey,
-                metaKey: config.mainTrigger.metaKey,
-                shiftKey: config.mainTrigger.shiftKey,
-                times: config.mainTrigger.times,
-            })
+        for (const k of ['mainTrigger']) {
+            if (config[k]) {
+                this.keyConfigs.push({
+                    name: k,
+                    keycode: keyToKeyCode(config[k].key),
+                    altKey: config[k].altKey,
+                    ctrlKey: config[k].ctrlKey,
+                    metaKey: config[k].metaKey,
+                    shiftKey: config[k].shiftKey,
+                    times: config[k].times,
+                })
+            }
         }
         this.keySimpleConfigs = []
         if (config.fastPanelTrigger) {

electron/mapi/manager/window/index.ts

@@ -322,6 +322,7 @@ export const ManagerWindow = {
                     state: pluginState,
                     param: pluginParam
                 })
+                AppRuntime.mainWindow.focus()
                 resolve(undefined)
             })
         })

src/App.vue

@@ -47,13 +47,14 @@ window.__page.onPluginInit((data: {
         alwaysOnTop: boolean
     }
 }) => {
-    // console.log('main.onPluginInit', data)
+    console.log('main.onPluginInit', data)
     manager.setActivePlugin(data.plugin)
     manager.setSubInput({
         placeholder: '',
         isFocus: false,
     })
     manager.setSubInputValue('')
+    mainSearch.value?.focus()
 })
 window.__page.onPluginAlreadyOpened(() => {
     // console.log('main.onPluginAlreadyOpened')
@@ -97,7 +98,38 @@ window.__page.onSetSubInputValue((value: string) => {
     manager.setSubInputValue(value);
 })
 
+let detachHotKey: any = null
+let detachHotkeyExpire = 0
+let detachHotkeyTimes = 0
 window.addEventListener('keydown', (e) => {
+    if (!detachHotKey) {
+        detachHotKey = manager.configGet('detachWindowTrigger', null)
+    }
+    // console.log('keydown', detachHotKey.value, detachHotkeyExpire)
+    // {"key":"D","altKey":false,"ctrlKey":false,"metaKey":true,"shiftKey":false,"times":1}
+    if (detachHotKey && detachHotKey.value) {
+        // console.log('detachHotkeyExpire', detachHotKey.value.key, detachHotkeyExpire)
+        if (
+            detachHotKey.value.key === e.key.toUpperCase()
+            && detachHotKey.value.altKey === e.altKey
+            && detachHotKey.value.ctrlKey === e.ctrlKey
+            && detachHotKey.value.metaKey === e.metaKey
+            && detachHotKey.value.shiftKey === e.shiftKey
+        ) {
+            if (!detachHotkeyExpire || Date.now() > detachHotkeyExpire) {
+                detachHotkeyExpire = Date.now() + 500
+                detachHotkeyTimes = 1
+            } else {
+                detachHotkeyTimes++
+            }
+            if (detachHotkeyTimes >= detachHotKey.value.times) {
+                detachHotkeyExpire = 0
+                detachHotkeyTimes = 0
+                manager.detachPlugin()
+                return
+            }
+        }
+    }
     if (!manager.activePlugin) {
         mainSearch.value?.onKeyDown(e)
     }

src/pages/Main/MainSearch.vue

@@ -164,6 +164,10 @@ const onShow = () => {
     mainInput.value.focus();
 };
 
+const focus = () => {
+    mainInput.value.focus();
+};
+
 const onKeyDown = (e: KeyboardEvent) => {
     // ignore input event for fire twice
     if (!!(e.target && ((e.target as any).tagName === 'INPUT'))) {
@@ -196,6 +200,7 @@ const onFocus = () => {
 defineExpose({
     onShow,
     onKeyDown,
+    focus,
 });
 
 </script>

src/pages/System/SystemSetting.vue

@@ -107,6 +107,15 @@ const onManagerConfigChange = async (key: string, value: any) => {
                                   @change="onManagerConfigChange('autoLaunchEnable',$event)"/>
                     </div>
                 </div>
+                <div class="flex items-center mb-6">
+                    <div class="flex-grow">
+                        分离窗口快捷键
+                    </div>
+                    <div>
+                        <HotkeyInput :value="manager.configGet('detachWindowTrigger',null)"
+                                     @change="manager.onConfigChange('detachWindowTrigger',$event)"/>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

src/types/Manager.ts

@@ -2,6 +2,7 @@ import {HotkeyKeyItem, HotkeyKeySimpleItem,} from "../../electron/mapi/keys/type
 
 export type ConfigRecord = {
     mainTrigger: HotkeyKeyItem,
+    detachWindowTrigger: HotkeyKeyItem,
     fastPanelTrigger: HotkeyKeySimpleItem,
 }