From 0d600d921356e52d0e63004e28b932925e0745a5 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Thu, 21 Apr 2016 19:55:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frpane/ReportletParameterViewPane.java | 33 ++++++++++++------- .../itableeditorpane/ParameterTableModel.java | 30 +++++++++++++---- .../hyperlink/ReportletHyperlinkPane.java | 10 ++++-- .../fr/design/hyperlink/WebHyperlinkPane.java | 10 ++++-- .../design/javascript/JavaScriptImplPane.java | 12 +++++-- .../javascript/ParameterJavaScriptPane.java | 10 ++++-- .../impl/ChartHyperPopAttrPane.java | 23 ++++++------- .../impl/ChartHyperPoplinkPane.java | 12 +++++-- .../impl/ChartHyperRelateCellLinkPane.java | 10 ++++-- .../impl/ChartHyperRelateFloatLinkPane.java | 10 ++++-- .../impl/FormHyperlinkPane.java | 15 ++++++--- .../mainframe/chart/ChartHyperEditPane.java | 5 +-- 12 files changed, 127 insertions(+), 53 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java b/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java index 23e241d6b..a9cea2cf1 100644 --- a/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java +++ b/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java @@ -3,22 +3,23 @@ */ package com.fr.design.gui.frpane; -import java.awt.BorderLayout; -import java.util.List; - -import javax.swing.event.TableModelListener; - import com.fr.base.Parameter; import com.fr.base.core.KV; +import com.fr.design.dialog.BasicPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; +import javax.swing.event.TableModelListener; +import java.awt.*; +import java.util.List; + /** * Defin hyperlink. * in fact,this is a TablEditorPane @@ -28,18 +29,26 @@ import com.fr.stable.ParameterProvider; public class ReportletParameterViewPane extends BasicPane { private UITableEditorPane editorPane; - public ReportletParameterViewPane() { - this.initComponent(null, ParameterTableModel.NO_CHART_USE); + this(null, ParameterTableModel.NO_CHART_USE); } // kunsnat: 控制是否用Chart的热点链接actions public ReportletParameterViewPane(int useParaType) { - this.initComponent(null, useParaType); + this(null, useParaType); } public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType) { - this.initComponent(actions, useParaType); + this(actions, useParaType, ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType), + ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType)); + } + + public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + this(null, useParaType, valueEditorPane, valueRenderPane); + } + + public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane); } /** @@ -47,11 +56,11 @@ public class ReportletParameterViewPane extends BasicPane { * @param actions Chart的热点链接actions * @param useParaType 类型 */ - public void initComponent(final UITableEditAction[] actions, int useParaType) { + public void initComponent(final UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (useParaType != ParameterTableModel.NO_CHART_USE) { - ParameterTableModel model = new ParameterTableModel(useParaType, this) { + ParameterTableModel model = new ParameterTableModel(valueEditorPane, valueRenderPane, this) { @Override public UITableEditAction[] createAction() { UITableEditAction[] tableEditActions = new UITableEditAction[] { new AddChartParameterAction(), new DeleteAction(this.component), diff --git a/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java b/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java index 2c8122c63..9b46977da 100644 --- a/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java +++ b/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java @@ -1,10 +1,10 @@ package com.fr.design.gui.itableeditorpane; import com.fr.base.Parameter; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; import com.fr.general.Inter; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -62,6 +62,14 @@ public class ParameterTableModel extends UITableModelAdapter this.component = component; } + public ParameterTableModel(ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, Component component) { + super(new String[] { Inter.getLocText("Parameter"), Inter.getLocText("Value") }); + this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); + this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(valueEditorPane)); + this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); + this.setDefaultRenderer(ParameterValueEditor.class, new ParameterValueRenderer(valueRenderPane)); + this.component = component; + } /** * 单元格是否可编辑 @@ -193,9 +201,13 @@ public class ParameterTableModel extends UITableModelAdapter private ValueEditorPane editor; public ParameterValueEditor(int paraUseType) { - - editor = ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType); - + this(ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType)); + } + + public ParameterValueEditor(ValueEditorPane valueEditorPane) { + + editor = valueEditorPane; + this.addCellEditorListener(new CellEditorListener() { @Override @@ -234,11 +246,15 @@ public class ParameterTableModel extends UITableModelAdapter private UILabel disableLable; public ParameterValueRenderer(int paraUseType) { + this(ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType)); + } + + public ParameterValueRenderer(ValueEditorPane valueEditorPane) { disableLable = new UILabel(Inter.getLocText("Set-Parameter-Name")); disableLable.setForeground(Color.pink); disableLable.setHorizontalAlignment(SwingConstants.CENTER); - - editor = ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType); + + editor = valueEditorPane; } public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java index 14fa855e9..1cdb3dcbb 100644 --- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -3,6 +3,8 @@ package com.fr.design.hyperlink; import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itableeditorpane.ParameterTableModel; @@ -10,11 +12,11 @@ import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.module.DesignModuleFactory; import com.fr.design.parameter.ParameterReader; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.js.ReportletHyperlink; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; @@ -37,7 +39,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane { northPane = new ReporletHyperNorthPane(needRenamePane()); this.add(northPane, BorderLayout.NORTH); - parameterViewPane = new ReportletParameterViewPane(new UITableEditAction[]{new HyperlinkParametersAction()}, getChartParaType()); + parameterViewPane = new ReportletParameterViewPane(new UITableEditAction[]{new HyperlinkParametersAction()}, getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); @@ -56,6 +58,10 @@ public class ReportletHyperlinkPane extends BasicBeanPane { return ParameterTableModel.NO_CHART_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + protected boolean needRenamePane() { return getChartParaType() != ParameterTableModel.NO_CHART_USE; } diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java index db4cc1b81..88bff48fb 100644 --- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -2,14 +2,16 @@ package com.fr.design.hyperlink; import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.js.WebHyperlink; import com.fr.stable.ParameterProvider; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; @@ -36,7 +38,7 @@ public class WebHyperlinkPane extends BasicBeanPane { northPane = new WebHyperNorthPane(needRenamePane()); this.add(northPane, BorderLayout.NORTH); - parameterViewPane = new ReportletParameterViewPane(getChartParaType()); + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters"), null)); @@ -54,6 +56,10 @@ public class WebHyperlinkPane extends BasicBeanPane { return ParameterTableModel.NO_CHART_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + protected boolean needRenamePane(){ return getChartParaType() != ParameterTableModel.NO_CHART_USE; } diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java index 879dfc31f..bcd1767d3 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java @@ -1,8 +1,10 @@ package com.fr.design.javascript; import com.fr.base.Parameter; -import com.fr.design.data.tabledata.tabledatapane.OneListTableModel; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.data.tabledata.tabledatapane.OneListTableModel; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itableeditorpane.UITableEditAction; @@ -10,11 +12,11 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.mainframe.DesignerContext; import com.fr.design.scrollruler.ModLineBorder; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.js.JavaScriptImpl; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import javax.swing.event.TableModelEvent; @@ -36,7 +38,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { public JavaScriptImplPane(String[] args) { this.defaultArgs = args; - parameterPane = new ReportletParameterViewPane(getChartParaType()); + parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_Parameter"))); parameterPane.addTableEditorListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { @@ -93,6 +95,10 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { return ParameterTableModel.NO_CHART_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + protected boolean needRenamePane(){ return getChartParaType() != ParameterTableModel.NO_CHART_USE; } diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java index c4daa4faf..14e8000de 100644 --- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java +++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java @@ -2,13 +2,15 @@ package com.fr.design.javascript; import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.js.ParameterJavaScript; import com.fr.stable.ParameterProvider; -import com.fr.design.utils.gui.GUICoreUtils; import java.awt.*; import java.util.List; @@ -19,7 +21,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane public ParameterJavaScriptPane(){ this.setLayout(new BorderLayout()); - parameterViewPane = new ReportletParameterViewPane(getChartParaType()); + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); if(needRenamePane()){ itemNameTextField = new UITextField(); @@ -31,6 +33,10 @@ public class ParameterJavaScriptPane extends BasicBeanPane return ParameterTableModel.NO_CHART_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + protected boolean needRenamePane(){ return getChartParaType() != ParameterTableModel.NO_CHART_USE; } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index 14008cf9a..92b7149cb 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -1,16 +1,9 @@ package com.fr.design.chart.series.SeriesCondition.impl; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; - import com.fr.base.Parameter; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.web.ChartHyperPoplink; +import com.fr.design.editor.ValueEditorPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.itextfield.UINumberField; @@ -19,10 +12,14 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.AbstractChartAttrPane; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.*; +import java.awt.*; +import java.util.List; /** * 图表弹出超链, 悬浮窗属性设置界面. @@ -40,9 +37,13 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { public static final int DEFAULT_V_VALUE = 500; private int paraType; + private ValueEditorPane valueEditorPane; + private ValueEditorPane valueRenderPane; - public ChartHyperPopAttrPane(int paraType) { + public ChartHyperPopAttrPane(int paraType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { this.paraType = paraType; + this.valueEditorPane = valueEditorPane; + this.valueRenderPane = valueRenderPane; initAll(); } @@ -81,7 +82,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { JPanel northPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); pane.add(northPane, BorderLayout.NORTH); - parameterViewPane = new ReportletParameterViewPane(paraType); + parameterViewPane = new ReportletParameterViewPane(paraType, valueEditorPane, valueRenderPane); parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameter"))); parameterViewPane.setPreferredSize(new Dimension(200, 200)); pane.add(parameterViewPane, BorderLayout.CENTER); diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index c0fe8d914..6b9f1b0a8 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -5,16 +5,18 @@ import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartFactory; -import com.fr.design.chart.gui.ChartComponent; import com.fr.chart.web.ChartHyperPoplink; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.chart.gui.ChartComponent; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartHyperEditPane; -import com.fr.general.Inter; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.Inter; import java.awt.*; @@ -37,7 +39,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH); } - hyperEditPane = new ChartHyperEditPane(getChartParaType()); + hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(hyperEditPane, BorderLayout.CENTER); ChartCollection cc = new ChartCollection(); @@ -59,6 +61,10 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { return ParameterTableModel.CHART_NORMAL_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + /** * 是否需要加载重命名的空间 * @return 默认需要加载 diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java index a0b161a0f..b1477c434 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java @@ -3,15 +3,17 @@ package com.fr.design.chart.series.SeriesCondition.impl; import com.fr.base.Utils; import com.fr.chart.web.ChartHyperRelateCellLink; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.columnrow.ColumnRowVerticalPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.stable.ColumnRow; import com.fr.stable.ParameterProvider; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import java.awt.*; @@ -48,7 +50,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane { private ReportletParameterViewPane parameterViewPane; @@ -32,7 +33,7 @@ public class FormHyperlinkPane extends BasicBeanPane { northPane = new FormHyperlinkNorthPane(needRenamePane()); this.add(northPane, BorderLayout.NORTH); - parameterViewPane = new ReportletParameterViewPane(getChartParaType()); + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameters"), null)); } @@ -46,6 +47,10 @@ public class FormHyperlinkPane extends BasicBeanPane { return ParameterTableModel.NO_CHART_USE; } + protected ValueEditorPane getValueEditorPane() { + return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType()); + } + protected boolean needRenamePane(){ return getChartParaType() != ParameterTableModel.NO_CHART_USE; } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java index 3c99eff5d..b4544e6f9 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java @@ -4,6 +4,7 @@ import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.web.ChartHyperPoplink; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPopAttrPane; +import com.fr.design.editor.ValueEditorPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartOtherPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; @@ -22,10 +23,10 @@ public class ChartHyperEditPane extends ChartEditPane { private ChartComponent useChartComponent; private ChartHyperPopAttrPane attrPane; - public ChartHyperEditPane(int paraType) { + public ChartHyperEditPane(int paraType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { paneList = new ArrayList(); - paneList.add(attrPane = new ChartHyperPopAttrPane(paraType)); + paneList.add(attrPane = new ChartHyperPopAttrPane(paraType, valueEditorPane, valueRenderPane)); paneList.add(new ChartTypePane()); dataPane4SupportCell = new ChartDataPane(listener);