From 643a6bb051afc33e86a3f89281ead14993d13764 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 5 Jun 2018 12:06:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6645=20=E5=8F=82=E6=95=B0=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E9=87=8C=E7=9A=84bug2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XWParameterLayout.java   |  5 +++++
 designer-form/src/com/fr/design/mainframe/JForm.java |  3 +--
 .../fr/design/parameter/ParameterPropertyPane.java   | 12 +++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/designer-form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer-form/src/com/fr/design/designer/creator/XWParameterLayout.java
index 84011c9c4..a397996a3 100644
--- a/designer-form/src/com/fr/design/designer/creator/XWParameterLayout.java
+++ b/designer-form/src/com/fr/design/designer/creator/XWParameterLayout.java
@@ -232,4 +232,9 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
+    @Override
+    public boolean supportInnerOrderChangeActions() {
+        return false;
+    }
+
 }
\ No newline at end of file
diff --git a/designer-form/src/com/fr/design/mainframe/JForm.java b/designer-form/src/com/fr/design/mainframe/JForm.java
index 2a660d52d..341f9d560 100644
--- a/designer-form/src/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/com/fr/design/mainframe/JForm.java
@@ -741,9 +741,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.FORM);
         EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(WidgetPropertyPane.getInstance(formDesign));
         ParameterPropertyPane parameterPropertyPane = ParameterPropertyPane.getInstance(formDesign);
-        parameterPropertyPane.setAddParaPaneVisible(false, this);
+        parameterPropertyPane.refreshState(this);
         EastRegionContainerPane.getInstance().addParameterPane(parameterPropertyPane);
-        EastRegionContainerPane.getInstance().setParameterHeight(parameterPropertyPane.getPreferredSize().height);
 
         refreshWidgetLibPane();
     }
diff --git a/designer-form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer-form/src/com/fr/design/parameter/ParameterPropertyPane.java
index df55a5ab6..b8bfe4e0b 100644
--- a/designer-form/src/com/fr/design/parameter/ParameterPropertyPane.java
+++ b/designer-form/src/com/fr/design/parameter/ParameterPropertyPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.parameter;
 
 import com.fr.design.constants.UIConstants;
+import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.ibutton.UIButton;
@@ -79,7 +80,7 @@ public class ParameterPropertyPane extends JPanel{
             }
         };
         JPanel scrollPaneWrapperInner = new JPanel(new BorderLayout());
-        scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, PADDING_MIDDLE, PADDING_SMALL));
+        scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, PADDING_MIDDLE, PADDING_MIDDLE, PADDING_SMALL));
         scrollPaneWrapperInner.add(basicScrollPane, BorderLayout.CENTER);
         addParaPane = new JPanel(new BorderLayout());
         addParaPane.add(scrollPaneWrapperInner, BorderLayout.CENTER);
@@ -87,8 +88,8 @@ public class ParameterPropertyPane extends JPanel{
 
         initParameterListener();
         this.setLayout(new BorderLayout(0, 6));
-        this.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, 0, PADDING_MIDDLE, 0));
-        this.add(addParaPane, BorderLayout.CENTER);
+		this.setBorder(BorderFactory.createEmptyBorder(0, 0, PADDING_MIDDLE, 0));
+		this.add(addParaPane, BorderLayout.NORTH);
     }
 
     // 显示或隐藏添加参数面板
@@ -119,8 +120,9 @@ public class ParameterPropertyPane extends JPanel{
         // 表单中，只有添加并选中参数面板时，才显示
 		boolean hideInJForm;
         try {
+			XCreator creator = (XCreator) FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent();
             hideInJForm = jt instanceof JForm &&
-                    !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout);
+					!(creator instanceof XWParameterLayout || creator.getParent() instanceof XWParameterLayout);
         } catch (NullPointerException ex) {
             hideInJForm = true;
         }
@@ -139,7 +141,7 @@ public class ParameterPropertyPane extends JPanel{
 		if (formHierarchyTreePaneWrapper == null) {
 			formHierarchyTreePaneWrapper = new JPanel(new BorderLayout());
 			formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, 0));
-			this.add(formHierarchyTreePaneWrapper, BorderLayout.SOUTH);
+			this.add(formHierarchyTreePaneWrapper, BorderLayout.CENTER);
 		}
 		formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance());
 		formHierarchyTreePaneWrapper.add(FormHierarchyTreePane.getInstance(editor), BorderLayout.CENTER);