From 852c2f8e2eec98a543c13abea06aa2f223936f5b Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 2 Jan 2018 17:24:40 +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>1=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E9=99=90=E9=AB=98=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/EastRegionContainerPane.java   |  3 ---
 .../fr/design/parameter/ParameterPropertyPane.java  | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 5c37e53202..0c9d536d99 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -499,7 +499,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private boolean isEnabled = true;  // 是否可用
         private Set<PropertyMode> visibleModes;
         private Set<PropertyMode> enableModes;
-        private static final int MAX_PARA_HEIGHT = 240;
 
         // 完整icon路径为 ICON_BASE_DIR + btnIconName + iconSuffix
         private static final String ICON_BASE_DIR = "/com/fr/design/images/buttonicon/propertiestab/";
@@ -621,8 +620,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
         public void replaceHeaderPane(JComponent pane) {
             contentArea.remove(headerPane);
-            int height = Math.min(pane.getPreferredSize().height, MAX_PARA_HEIGHT);
-            pane.setPreferredSize(new Dimension(pane.getPreferredSize().width, height));
             headerPane = pane;
             contentArea.add(headerPane, BorderLayout.NORTH);
 
diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
index 6ce5a2ff9e..052f7cc2f5 100644
--- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
+++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
@@ -26,6 +26,7 @@ public class ParameterPropertyPane extends JPanel{
     private static final int PADDING_SMALL = 5;
     private static final int PADDING_MIDDLE = 10;
     private static final int PADDING_LARGE = 15;
+    private static final int ADD_PARA_PANE_MAX_HEIGHT = 95;
 
 	public static final ParameterPropertyPane getInstance() {
 		if (THIS == null) {
@@ -86,6 +87,7 @@ public class ParameterPropertyPane extends JPanel{
     // 显示或隐藏添加参数面板
 	public void refreshState(JTemplate jt) {
 		setAddParaPaneVisible(toolbarPane.hasSelectedLabelItem(), jt);
+        updateAddParaPaneSize();
 	}
 
 	// 显示或隐藏添加参数面板
@@ -93,6 +95,16 @@ public class ParameterPropertyPane extends JPanel{
 		refreshState(DesignerContext.getDesignerFrame().getSelectedJTemplate());
 	}
 
+    private void updateAddParaPaneSize() {
+        if (!addParaPane.isVisible()) {
+            return;
+        }
+        addParaPane.setPreferredSize(null);
+        int height = Math.min(addParaPane.getPreferredSize().height, ADD_PARA_PANE_MAX_HEIGHT);
+        addParaPane.setPreferredSize(new Dimension(addParaPane.getPreferredSize().width, height));
+        repaintContainer();
+    }
+
     public void setAddParaPaneVisible(boolean isVisible, JTemplate jt) {
         if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
             return;
@@ -112,7 +124,6 @@ public class ParameterPropertyPane extends JPanel{
             addParaPane.setVisible(false);
             this.setPreferredSize(new Dimension(getWidth(), formHierarchyTreePaneWrapper.getPreferredSize().height + UIConstants.GAP_NORMAL));
         }
-        repaintContainer();
     }
 	
 	private void setEditor(FormDesigner editor) {