diff --git a/ui/autoMate/src/main/code/shortCut.ts b/ui/autoMate/src/main/code/shortCut.ts index 9e6ba57..dd1427b 100644 --- a/ui/autoMate/src/main/code/shortCut.ts +++ b/ui/autoMate/src/main/code/shortCut.ts @@ -8,8 +8,9 @@ const config = { export const registerShortCut = (win: BrowserWindow) => { ipcMain.handle("shortCut", (_event: IpcMainInvokeEvent, type: 'search', shortCut: string) => { - // react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键 + // react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键,也用户注册过快捷键想修改成其他快捷键 if (config.search) globalShortcut.unregister(config.search) + config.search = shortCut switch(type){ case 'search': return registerSearchShortCut(shortCut, win) @@ -18,9 +19,10 @@ export const registerShortCut = (win: BrowserWindow) => { } function registerSearchShortCut(shortCut: string, win: BrowserWindow){ - return globalShortcut.register(shortCut, () => { + const res = globalShortcut.register(shortCut, () => { win.isVisible() ? win.hide() : win.show() }) + return res } app.on('will-quit', () => { // Unregister all shortcuts. diff --git a/ui/autoMate/src/renderer/src/components/Error.tsx b/ui/autoMate/src/renderer/src/components/Error.tsx index 25a40db..15b1194 100644 --- a/ui/autoMate/src/renderer/src/components/Error.tsx +++ b/ui/autoMate/src/renderer/src/components/Error.tsx @@ -1,7 +1,13 @@ import { useStore } from "@renderer/store/useStore" +import { useEffect } from "react" function Error(){ - const {error} = useStore() + const error = useStore(state => state.error) + const setError = useStore(state => state.setError) + useEffect(() => { + const id = setTimeout(() => setError(""), 2000) + return () => clearTimeout(id) + }, [error]) if (!error) return <>> return <>