From 6f5d11cf7762b6bb0d519209840e0c92d1c6f297 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Tue, 28 Jul 2020 20:24:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0try=20catch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/editor-core/src/hotkey.ts | 36 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/editor-core/src/hotkey.ts b/packages/editor-core/src/hotkey.ts index 50cca63ca..f991aaeab 100644 --- a/packages/editor-core/src/hotkey.ts +++ b/packages/editor-core/src/hotkey.ts @@ -328,23 +328,27 @@ function getKeyInfo(combination: string, action?: string): KeyInfo { * convention - prevent default and stop propogation on the event */ function fireCallback(callback: HotkeyCallback, e: KeyboardEvent, combo?: string, sequence?: string): void { - const editor = globalContext.get(Editor); - const designer = editor.get('designer'); - const node = designer?.currentSelection?.getNodes()?.[0]; - const npm = node?.componentMeta?.npm; - const selected = - [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; - if (callback(e, combo) === false) { - e.preventDefault(); - e.stopPropagation(); + try { + const editor = globalContext.get(Editor); + const designer = editor.get('designer'); + const node = designer?.currentSelection?.getNodes()?.[0]; + const npm = node?.componentMeta?.npm; + const selected = + [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; + if (callback(e, combo) === false) { + e.preventDefault(); + e.stopPropagation(); + } + editor?.emit('hotkey.callback.call', { + callback, + e, + combo, + sequence, + selected, + }); + } catch(err) { + console.error(err.message); } - editor?.emit('hotkey.callback.call', { - callback, - e, - combo, - sequence, - selected, - }); } export class Hotkey {