From a98c5002ed0322635032b4f31ff38581fa107037 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 29 Nov 2017 16:16:14 +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=E3=80=812=20?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/ComponentTree.java  | 17 ++++++++++-------
 .../com/fr/design/mainframe/FormDesigner.java   |  2 ++
 .../design/mainframe/FormHierarchyTreePane.java | 15 +++++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index 1ceab13c0..3aea40196 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -1,6 +1,6 @@
 package com.fr.design.mainframe;
 
-import java.awt.Component;
+import java.awt.*;
 import java.util.ArrayList;
 
 import javax.swing.DropMode;
@@ -12,6 +12,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
 import com.fr.design.designer.treeview.ComponentTreeModel;
+import com.fr.design.gui.itree.UITreeUI;
 import com.fr.stable.StringUtils;
 
 public class ComponentTree extends JTree {
@@ -31,6 +32,7 @@ public class ComponentTree extends JTree {
         this.refreshTreeRoot();
         addTreeSelectionListener(designer);
         setEditable(true);
+        setUI(new UITreeUI());
     }
 
     public FormDesigner getDesigner() {
@@ -48,7 +50,12 @@ public class ComponentTree extends JTree {
         this.setModel(model);
     }
 
-
+    public void setSelectionPath(TreePath path) {
+        // 不管点击哪一项，都要先退出编辑状态（图表、报表块、绝对布局、tab块）
+//        getSelectionModel().setSelectionPath(path);
+        designer.stopEditing();
+        super.setSelectionPath(path);
+    }
 
 
     /**
@@ -58,11 +65,7 @@ public class ComponentTree extends JTree {
      */
     @Override
     public boolean isPathEditable(TreePath path) {
-        Object object = path.getLastPathComponent();
-        if (object == designer.getRootComponent()) {
-            return false;
-        }
-        return super.isPathEditable(path);
+        return false;
     }
 
     /**
diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
index aa2d4db1a..6b054c4b6 100644
--- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java
+++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
@@ -1236,6 +1236,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     @Override
     public void stopEditing() {
         // do nothing
+        editingMouseListener.stopEditing();
+//        editingMouseListener.processTopLayoutMouseClick()
     }
 
     /**
diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
index 3d7a3ec50..603ef966b 100644
--- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -13,6 +13,7 @@ import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.mainframe.widget.UITreeComboBox;
@@ -43,7 +44,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 
 	private ShortCut4JControlPane[] shorts;
 	private ComponentTree componentTree;
-	private UITreeComboBox treeComboBox;
+//	private UITreeComboBox treeComboBox;
     private ChangeNameAction changeVarNameAction;
 
 	public static FormHierarchyTreePane getInstance() {
@@ -96,9 +97,9 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		if(this.componentTree != null) {
 			this.componentTree.removeAll();
 		}
-		if(this.treeComboBox != null) {
-			this.treeComboBox.removeAll();
-		}
+//		if(this.treeComboBox != null) {
+//			this.treeComboBox.removeAll();
+//		}
 		if (formDesigner == null) {
 			clearDockingView();
 			return;
@@ -129,8 +130,10 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		headPane.add(getToolBarPane(), BorderLayout.EAST);
 
 		widgetPane.add(headPane, BorderLayout.CENTER);
-		treeComboBox = new UITreeComboBox(componentTree);
-		widgetPane.add(treeComboBox, BorderLayout.SOUTH);
+		UIScrollPane scrollPane = new UIScrollPane(componentTree);
+		scrollPane.setPreferredSize(new Dimension(210, 170));
+//		treeComboBox = new UITreeComboBox(componentTree);
+		widgetPane.add(scrollPane, BorderLayout.SOUTH);
 		return widgetPane;
 	}