From 8fad9d5bd02802f6d21db402763b4dd9eff87a36 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 12:51:35 +0800 Subject: [PATCH 1/5] rt --- .../actions/report/ReportParameterAction.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/designer/src/com/fr/design/actions/report/ReportParameterAction.java b/designer/src/com/fr/design/actions/report/ReportParameterAction.java index 61507ebfea..d11b41da62 100644 --- a/designer/src/com/fr/design/actions/report/ReportParameterAction.java +++ b/designer/src/com/fr/design/actions/report/ReportParameterAction.java @@ -3,21 +3,21 @@ */ package com.fr.design.actions.report; -import java.awt.event.ActionEvent; - -import javax.swing.SwingUtilities; - import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.design.actions.JWorkBookAction; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.KeySetUtils; import com.fr.design.parameter.ParameterArrayPane; -import com.fr.design.dialog.BasicDialog; -import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.parameter.ParameterPropertyPane; import com.fr.main.TemplateWorkBook; import com.fr.main.parameter.ReportParameterAttr; +import javax.swing.*; +import java.awt.event.ActionEvent; + /** * Report Parameter */ @@ -61,7 +61,7 @@ public class ReportParameterAction extends JWorkBookAction { } jwb.fireTargetModified(); jwb.updateReportParameterAttr(); - jwb.populateReportParameterAttr(); + ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(parameters); } }); parameterArrayDialog.setVisible(true); From 4b43ed96c52e4d5457750ada0d7d40f330c0b7fb Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 12:53:01 +0800 Subject: [PATCH 2/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 199f0bc6ab..b4933f22da 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java +++ b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java @@ -49,6 +49,7 @@ public class TemplateParameterAction extends JTemplateAction { wbTpl.addParameter(parameters[i]); } jwb.fireTargetModified(); + jwb.test(parameters); } }); parameterArrayDialog.setVisible(true); From 6cac742394e7cefa893719cbc57a0a04e0520461 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 12:55:06 +0800 Subject: [PATCH 3/5] rt --- .../com/fr/design/actions/report/ReportParameterAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/actions/report/ReportParameterAction.java b/designer/src/com/fr/design/actions/report/ReportParameterAction.java index d11b41da62..5efc98ea99 100644 --- a/designer/src/com/fr/design/actions/report/ReportParameterAction.java +++ b/designer/src/com/fr/design/actions/report/ReportParameterAction.java @@ -11,7 +11,6 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.KeySetUtils; import com.fr.design.parameter.ParameterArrayPane; -import com.fr.design.parameter.ParameterPropertyPane; import com.fr.main.TemplateWorkBook; import com.fr.main.parameter.ReportParameterAttr; @@ -61,7 +60,7 @@ public class ReportParameterAction extends JWorkBookAction { } jwb.fireTargetModified(); jwb.updateReportParameterAttr(); - ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(parameters); + jwb.populateReportParameterAttr(); } }); parameterArrayDialog.setVisible(true); From 12200b967a3b8dd4d00966a7f3143329f2e45bc3 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 13:49:44 +0800 Subject: [PATCH 4/5] rt --- .../design/actions/report/ReportParameterAction.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/actions/report/ReportParameterAction.java b/designer/src/com/fr/design/actions/report/ReportParameterAction.java index 5efc98ea99..61507ebfea 100644 --- a/designer/src/com/fr/design/actions/report/ReportParameterAction.java +++ b/designer/src/com/fr/design/actions/report/ReportParameterAction.java @@ -3,20 +3,21 @@ */ package com.fr.design.actions.report; +import java.awt.event.ActionEvent; + +import javax.swing.SwingUtilities; + import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.design.actions.JWorkBookAction; -import com.fr.design.dialog.BasicDialog; -import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.KeySetUtils; import com.fr.design.parameter.ParameterArrayPane; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.DialogActionAdapter; import com.fr.main.TemplateWorkBook; import com.fr.main.parameter.ReportParameterAttr; -import javax.swing.*; -import java.awt.event.ActionEvent; - /** * Report Parameter */ From 2c0ed8294e89bedcdd4cd47c2b7571e49d590946 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Mon, 20 Jun 2016 13:50:21 +0800 Subject: [PATCH 5/5] rt --- .../fr/design/mainframe/actions/TemplateParameterAction.java | 3 ++- 1 file changed, 2 insertions(+), 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 b4933f22da..ee8877084f 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java +++ b/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.*; @@ -49,7 +50,7 @@ public class TemplateParameterAction extends JTemplateAction { wbTpl.addParameter(parameters[i]); } jwb.fireTargetModified(); - jwb.test(parameters); + ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(parameters); } }); parameterArrayDialog.setVisible(true);