From 0d68bd0b6cc98e1f4cbeabbd8424caf9b5dbf72c Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 12 Sep 2017 14:04:31 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4421=20=E4=BB=A5=E4=B8=8B=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=9C=AA=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/parameter/ParameterPropertyPane.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
index 51d73b90d..629af593f 100644
--- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
+++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
@@ -1,10 +1,13 @@
 package com.fr.design.parameter;
 
 import com.fr.design.constants.UIConstants;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
+import com.fr.design.mainframe.JForm;
 
 import javax.swing.*;
 import java.awt.*;
@@ -86,7 +89,10 @@ public class ParameterPropertyPane extends JPanel{
         if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
             return;
         }
-        if (isVisible && toolbarPane.hasSelectedLabelItem()) {
+        // 表单中，只有添加并选中参数面板时，才显示
+		boolean hideInJForm = DesignerContext.getDesignerFrame().getSelectedJTemplate() instanceof JForm &&
+                !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout);
+        if (isVisible && toolbarPane.hasSelectedLabelItem() && !hideInJForm) {
             addParaPane.setVisible(true);
             this.setPreferredSize(null);
         } else {