Merge pull request #1604 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '41beff1f97743eec833ff2f4b864f91f82b18aeb':
  REPORT-6645 参数面板里的bug2=>参数面板内的控件不允许调整顺序；修复一个bug
  REPORT-6645 参数面板里的bug2=>tab切换后显示不出参数；选中参数面板里的控件时，未生成参数显示不出来

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

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -725,9 +725,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();
     }

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