From 0b70c36cddc7942ca896a153dee9b51e4e46256e Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 15:10:10 +0800 Subject: [PATCH 1/5] rt --- .../com/fr/design/mainframe/actions/TemplateParameterAction.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java index ee8877084..e8c780aa8 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java +++ b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java @@ -50,6 +50,7 @@ public class TemplateParameterAction extends JTemplateAction { wbTpl.addParameter(parameters[i]); } jwb.fireTargetModified(); + jwb.getFormDesign().setParameterArray(parameters); ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(parameters); } }); From fba9bd9b8a1dd0c46f14b0d53361c08fc7345d1c Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 15:12:02 +0800 Subject: [PATCH 2/5] rt --- .../fr/design/mainframe/actions/TemplateParameterAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java index e8c780aa8..5eeda6a01 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java +++ b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java @@ -38,7 +38,7 @@ public class TemplateParameterAction extends JTemplateAction { 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() { From cb12b1595d5300f1120d74ffd4be75b76cd1fd24 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 16:57:22 +0800 Subject: [PATCH 3/5] rt --- designer_form/src/com/fr/design/mainframe/FormDesigner.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java index 6312c5248..c806e59f6 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java +++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java @@ -340,6 +340,8 @@ public class FormDesigner extends TargetComponent
implements TreeSelection parameterArray = null; refreshParameter(); + //parameter多的时候，不刷新会出现横线 + refreshRoot(); //不知道为什么添加完参数后控件树只有一个label，这儿刷新一下控件树好了 EastRegionContainerPane.getInstance().refreshDownPane(); } From a6090c8cacde774ee6bc180b65e8073171d9d2d8 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 16:59:49 +0800 Subject: [PATCH 4/5] rt --- designer_form/src/com/fr/design/mainframe/FormDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java index c806e59f6..1abf7ca9e 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java +++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java @@ -340,7 +340,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection parameterArray = null; refreshParameter(); - //parameter多的时候，不刷新会出现横线 + //parameter多的时候，不刷新会出现控件边界交叉 refreshRoot(); //不知道为什么添加完参数后控件树只有一个label，这儿刷新一下控件树好了 EastRegionContainerPane.getInstance().refreshDownPane(); From d56355bd6b58d29f998336333bd57de3e64e8d7b Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 17:11:35 +0800 Subject: [PATCH 5/5] rt --- .../src/com/fr/design/designer/creator/XWParameterLayout.java | 3 --- 1 file changed, 3 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 1e59959be..9f92b9786 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/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"))