From 2ee3cd1b465eea4c9d47afe88f36f0e5b2c7eddb Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Thu, 18 Jan 2018 14:48:18 +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=3D>tab=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=90=8E=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B=E9=80=89=E4=B8=AD=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=8E=A7=E4=BB=B6=E6=97=B6=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_form/src/com/fr/design/mainframe/JForm.java          | 2 --
 .../src/com/fr/design/parameter/ParameterPropertyPane.java    | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index 30f3f5ca07..1f5c17e8cf 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -725,9 +725,7 @@ 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);
         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 d166871779..663b7c7620 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;
@@ -112,8 +113,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;
         }