From 677cb9a4f134b295101ee3b3c6f7b32f9e8dff1d Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 2 Jan 2018 21:20:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6270=20=E5=8F=82=E6=95=B0=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E9=87=8C=E7=9A=84=E7=9B=B8=E5=85=B3bug=3D>2=20frm?=
 =?UTF-8?q?=E9=87=8C=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=90=8E=EF=BC=8C=E5=8F=B3=E4=BE=A7=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=91=E6=B2=A1=E6=9C=89=E5=AE=9E=E6=97=B6=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E5=88=B0para=EF=BC=9B=E8=80=8C=E4=B8=94=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=96=E8=80=85=E5=88=A0=E9=99=A4=E4=BA=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=8F=82=E6=95=B0=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=80=89=E4=B8=ADpara?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/FormHierarchyTreePane.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
index 212fe33897..e908bb9f0d 100644
--- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -96,8 +96,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		formDesigner.addDesignerEditListener(new DesignerEditListener() {
 			@Override
 			public void fireCreatorModified(DesignerEvent evt) {
-				componentTree.setAndScrollSelectionPath(componentTree.getSelectedTreePath());
-                componentTree.refreshUI();
+				refreshComponentTree();
 			}
 		});
 
@@ -110,6 +109,21 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		}
 
 		add(getWidgetPane(), BorderLayout.CENTER);
+
+		try {
+			// 这里要刷新一下，否则控件树中没有任何一个控件处于选中状态
+			refreshComponentTree();
+		} catch (Throwable th) {
+			// do nothing
+		}
+	}
+
+	private void refreshComponentTree() {
+		if (DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {  // 还在初始化状态
+			return;
+		}
+		componentTree.setAndScrollSelectionPath(componentTree.getSelectedTreePath());
+		componentTree.refreshUI();
 	}
 
 	private JPanel getWidgetPane() {