From 7fa7f4dab6f1ef2c47427ba60a58dc12263bb0ae Mon Sep 17 00:00:00 2001 From: yvan Date: Sat, 7 Jun 2025 13:04:33 +0800 Subject: [PATCH] refactor(editor): update click handlers to accept event and hotkey parameters --- src/editor/ModelMainInit.ts | 4 ++-- src/editor/menus/EditMenu.ts | 4 ++-- src/runtime/DefineMenu.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/editor/ModelMainInit.ts b/src/editor/ModelMainInit.ts index e91c2c3..1b88ef0 100644 --- a/src/editor/ModelMainInit.ts +++ b/src/editor/ModelMainInit.ts @@ -49,7 +49,7 @@ export function ModelMainMounted() { menu.tip = shortKey hotkeys(shortKey, (event) => { event.preventDefault() - menu.click() + menu.click(event, shortKey) }) // console.log('hotkeys', menu.tip, menu.click) } @@ -62,4 +62,4 @@ export function ModelMainMounted() { export function ModelMainUnmounted() { // 移除所有的热键绑定 unbind all hotkeys.unbind() -} \ No newline at end of file +} diff --git a/src/editor/menus/EditMenu.ts b/src/editor/menus/EditMenu.ts index bad759a..70ac02c 100644 --- a/src/editor/menus/EditMenu.ts +++ b/src/editor/menus/EditMenu.ts @@ -69,8 +69,8 @@ export default defineMenu((menus) => { children: [ { name: 'edit_property_esc', label: '取消', order: 1, tip: 'key-esc', - click() { - escByKeyboard() + click(e) { + escByKeyboard(e) } }, { diff --git a/src/runtime/DefineMenu.ts b/src/runtime/DefineMenu.ts index 8e16e2c..0dda8fd 100644 --- a/src/runtime/DefineMenu.ts +++ b/src/runtime/DefineMenu.ts @@ -8,7 +8,7 @@ export interface MenuOption { tip?: string disabled?: boolean | (() => boolean) divided?: boolean, - click?: () => void + click?: (e: Event, hotKey: string) => void children?: MenuOption[] } @@ -100,4 +100,4 @@ export function defineMenu(func: (menus: Menus) => void): MenuDefineResult { func(_menus) } } -} \ No newline at end of file +}