From 940bec47ee94a75f48ecb75be3f9c6ce26bdab0c Mon Sep 17 00:00:00 2001
From: hsm-lv <lvxiaojiao@baidu.com>
Date: Wed, 4 Jan 2023 20:11:58 +0800
Subject: [PATCH] =?UTF-8?q?[amis-saas-9161]:=E4=B8=8A=E4=B8=8B=E6=96=87?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=A1=B5=E9=9D=A2=E9=9D=99=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I124b427c9b563a88658f258d65590eda88d3d4f1
---
 packages/amis-editor-core/src/manager.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/amis-editor-core/src/manager.ts b/packages/amis-editor-core/src/manager.ts
index 9e47d526e..1ea51483d 100644
--- a/packages/amis-editor-core/src/manager.ts
+++ b/packages/amis-editor-core/src/manager.ts
@@ -1865,11 +1865,9 @@ export class EditorManager {
   ) {
     originHook?.(e, component, scoped, data, broadcasts);
 
-    if (component.props.$$id) {
-      const node = this.store.getNodeById(
-        component.props.$$id,
-        component.props.type
-      );
+    const id = component.props.$$id || component.props.$$editor?.id;
+    if (id) {
+      const node = this.store.getNodeById(id, component.props.type);
       node?.info?.plugin?.rendererBeforeDispatchEvent?.(
         node,
         e,