From bb5e192dcde9c064717c64b01cc1ad598112f371 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 7 Apr 2022 19:50:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E5=A4=8D=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/services/editor.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/services/editor.ts b/packages/editor/src/services/editor.ts
index 3376ee0a..eec65cc9 100644
--- a/packages/editor/src/services/editor.ts
+++ b/packages/editor/src/services/editor.ts
@@ -339,9 +339,10 @@ class Editor extends BaseService {
 
     if (`${newConfig.id}` === `${this.get('node').id}`) {
       this.set('node', newConfig);
-      this.get<StageCore | null>('stage')?.update({ config: cloneDeep(newConfig), root: this.get('root') });
     }
 
+    this.get<StageCore | null>('stage')?.update({ config: cloneDeep(newConfig), root: this.get('root') });
+
     if (newConfig.type === NodeType.PAGE) {
       this.set('page', newConfig);
     }
@@ -520,7 +521,11 @@ class Editor extends BaseService {
     this.isHistoryStateChange = true;
     await this.update(value.data);
     this.set('modifiedNodeIds', value.modifiedNodeIds);
-    setTimeout(() => value.nodeId && this.select(value.nodeId), 0);
+    setTimeout(async () => {
+      if (!value.nodeId) return;
+      await this.select(value.nodeId);
+      this.get<StageCore | null>('stage')?.select(value.nodeId);
+    }, 0);
   }
 
   private async toggleFixedPosition(dist: MNode, src: MNode, root: MApp) {