Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev

designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java

@@ -56,9 +56,6 @@ public class XWParameterLayout extends XWAbsoluteLayout {
                         .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class)
                         .setRendererClass(BackgroundRenderer.class).setI18NName(Inter.getLocText("Background"))
-                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),        
-                new CRPropertyDescriptor("display", this.data.getClass()).setEditorClass(BooleanEditor.class)
-                        .setI18NName(Inter.getLocText("ParameterD-Show_Parameter_Window"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class)
                         .setI18NName(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery"))

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

@@ -340,6 +340,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
 
         parameterArray = null;
         refreshParameter();
+        //parameter多的时候，不刷新会出现控件边界交叉
+        refreshRoot();
         //不知道为什么添加完参数后控件树只有一个label，这儿刷新一下控件树好了
         EastRegionContainerPane.getInstance().refreshDownPane();
     }

designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java

@@ -8,6 +8,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.parameter.ParameterArrayPane;
+import com.fr.design.parameter.ParameterPropertyPane;
 import com.fr.form.main.Form;
 
 import javax.swing.*;
@@ -37,7 +38,7 @@ public class TemplateParameterAction extends JTemplateAction<JForm> {
         BasicDialog parameterArrayDialog = parameterArrayPane.showWindow(SwingUtilities.getWindowAncestor(jwb));
         parameterArrayDialog.setModal(true);
 
-        final Parameter[] copyTemplateParameters = (Parameter[]) wbTpl.getTemplateParameters();
+        final Parameter[] copyTemplateParameters = wbTpl.getTemplateParameters();
         parameterArrayPane.populate(copyTemplateParameters);
         parameterArrayDialog.addDialogActionListener(new DialogActionAdapter() {
 
@@ -49,6 +50,8 @@ public class TemplateParameterAction extends JTemplateAction<JForm> {
                     wbTpl.addParameter(parameters[i]);
                 }
                 jwb.fireTargetModified();
+                jwb.getFormDesign().setParameterArray(parameters);
+                ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(parameters);
             }
         });
         parameterArrayDialog.setVisible(true);