REPORT-4634 组件叠加体验优化=>1、2 初步框架

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,12 +65,8 @@ 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);
-    }
 
     /**
      * 将值转换为文本

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()
     }
 
     /**

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;
 	}