From 2bd63a80239f458af2ffecf97f5aef7069da1135 Mon Sep 17 00:00:00 2001 From: ruotongyu Date: Sat, 22 Jun 2024 23:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20=E6=9B=B4=E6=96=B0(shortCut.ts,?= =?UTF-8?q?=20App.tsx,=20index.tsx)=EF=BC=9A=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5=E5=92=8C=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84(Ho?= =?UTF-8?q?me/index.tsx)=EF=BC=9A=E6=9B=B4=E6=96=B0=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=E6=B3=A8=E5=86=8C=E7=9A=84=E8=B0=83=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/autoMate/src/main/shortCut.ts | 4 +--- ui/autoMate/src/renderer/src/App.tsx | 1 - ui/autoMate/src/renderer/src/layouts/Home/index.tsx | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ui/autoMate/src/main/shortCut.ts b/ui/autoMate/src/main/shortCut.ts index d2f56f3..25f0024 100644 --- a/ui/autoMate/src/main/shortCut.ts +++ b/ui/autoMate/src/main/shortCut.ts @@ -1,12 +1,10 @@ import { IpcMainInvokeEvent } from "electron" import { ipcMain } from "electron" import { getWindowByName } from "./windows" -import { findOne } from "./db/query" const { app, globalShortcut } = require('electron') ipcMain.handle("shortCut", (_event: IpcMainInvokeEvent, shortCut: string) => { - - // react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键,也用户注册过快捷键想修改成其他快捷键 + // react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键 return registerSearchShortCut(shortCut) }) diff --git a/ui/autoMate/src/renderer/src/App.tsx b/ui/autoMate/src/renderer/src/App.tsx index fe8fe06..0d63a66 100644 --- a/ui/autoMate/src/renderer/src/App.tsx +++ b/ui/autoMate/src/renderer/src/App.tsx @@ -1,7 +1,6 @@ import Result from "./components/Result" import Search from "./components/Search" import { CodeProvider } from "./context/CodeContext" -import useShortCut from "./hooks/useShortCut" import Error from "./components/Error" import { MutableRefObject, useEffect, useRef } from "react" import useIgnoreMouseEvents from "./hooks/useIgnoreMouseEvents" diff --git a/ui/autoMate/src/renderer/src/layouts/Home/index.tsx b/ui/autoMate/src/renderer/src/layouts/Home/index.tsx index 50ea240..3adccae 100644 --- a/ui/autoMate/src/renderer/src/layouts/Home/index.tsx +++ b/ui/autoMate/src/renderer/src/layouts/Home/index.tsx @@ -16,8 +16,8 @@ function Home(): JSX.Element { // window.api.openConfigWindow() }, []) // // 注册快捷键 - const shortCut = useShortCut() - shortCut.register() + const {register} = useShortCut() + register() return (