From 0bab0307f728fbcef16c22435df4c94af1c81794 Mon Sep 17 00:00:00 2001
From: "wanying.jwy" <wanying.jwy@alibaba-inc.com>
Date: Mon, 14 Sep 2020 10:42:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E4=BD=BF=E7=94=A8=20l?=
 =?UTF-8?q?ive=20=E6=A8=A1=E5=BC=8F=E4=BD=9C=E4=B8=BA=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E9=99=90=E5=88=B6=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=20Page=20=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/designer/src/builtin-simulator/host.ts | 5 ++---
 packages/designer/src/designer/designer.ts      | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 9ac333465..399f63724 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -332,9 +332,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
             if (isMulti && !isRootNode(node) && selection.has(id)) {
               selection.remove(id);
             } else {
-              // TODO: 加个开关控制（yiyi）
-              // 如果选中的为 Page 节点，则默认选中第一个子节点
-              if (node.isPage() && node.getChildren()?.notEmpty()) {
+              // TODO: 避免选中 Page 组件，默认选中第一个子节点；新增规则 或 判断 Live 模式
+              if (node.isPage() && node.getChildren()?.notEmpty() && this.designMode === 'live') {
                 const firstChildId = node
                   .getChildren()
                   ?.get(0)
diff --git a/packages/designer/src/designer/designer.ts b/packages/designer/src/designer/designer.ts
index 0071bb007..9ab682b4f 100644
--- a/packages/designer/src/designer/designer.ts
+++ b/packages/designer/src/designer/designer.ts
@@ -178,8 +178,8 @@ export class Designer {
         selectionDispose = undefined;
       }
       const currentSelection = this.currentSelection;
-      // TODO: yiyi 加开关控制，避免选中 Page 组件，默认选中第一个子节点
-      if (currentSelection && currentSelection.selected.length === 0) {
+      // TODO: 避免选中 Page 组件，默认选中第一个子节点；新增规则 或 判断 Live 模式
+      if (currentSelection && currentSelection.selected.length === 0 && this.simulatorProps?.designMode === 'live') {
         const rootNodeChildrens = this.currentDocument.getRoot().getChildren().children;
         if (rootNodeChildrens.length > 0) {
           currentSelection.select(rootNodeChildrens[0].id);