From 26a7a453f9ef1f6d34d386e1b83f6fc953549b8d Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 29 Nov 2017 17:16:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4634=20=E7=BB=84=E4=BB=B6=E5=8F=A0?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96=3D>1=3D>=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8E=A7=E4=BB=B6=E6=A0=91=E9=80=80=E5=87=BA=E7=BB=9D?=
 =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/ComponentTree.java          | 2 +-
 .../src/com/fr/design/mainframe/EditingMouseListener.java   | 2 +-
 designer_form/src/com/fr/design/mainframe/FormDesigner.java | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index 3aea40196b..8be8616487 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -53,7 +53,7 @@ public class ComponentTree extends JTree {
     public void setSelectionPath(TreePath path) {
         // 不管点击哪一项，都要先退出编辑状态（图表、报表块、绝对布局、tab块）
 //        getSelectionModel().setSelectionPath(path);
-        designer.stopEditing();
+        designer.stopEditing(path);
         super.setSelectionPath(path);
     }
 
diff --git a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java
index 61323f4b7e..86da3586b1 100644
--- a/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java
+++ b/designer_form/src/com/fr/design/mainframe/EditingMouseListener.java
@@ -489,7 +489,7 @@ public class EditingMouseListener extends MouseInputAdapter {
         return false;
     }
 
-    private XCreator processTopLayoutMouseClick(XCreator creator) {
+    public XCreator processTopLayoutMouseClick(XCreator creator) {
         XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(creator).getTopLayout();
         if (topLayout != null) {
             if (clickTopLayout != null && !clickTopLayout.equals(topLayout) && !isCreatorInLayout(clickTopLayout,
diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
index 6b054c4b60..5b9fea9acb 100644
--- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java
+++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
@@ -1236,8 +1236,12 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     @Override
     public void stopEditing() {
         // do nothing
+    }
+
+    public void stopEditing(TreePath path) {
+        // do nothing
         editingMouseListener.stopEditing();
-//        editingMouseListener.processTopLayoutMouseClick()
+        editingMouseListener.processTopLayoutMouseClick((XCreator) path.getLastPathComponent());
     }
 
     /**