fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #48 in BA/design from ~SHINE/design:dev to dev 

* commit '4aa0c801aadcf44b7ffee120e27269ddc5650d31':
  超链
master
richie 9 years ago
parent
c6922f787c 4aa0c801aa
commit
26039d30dc
12 changed files with 127 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java
  2. 30
      designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java
  3. 10
      designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  4. 10
      designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
  5. 12
      designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
  6. 10
      designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
  7. 23
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
  8. 12
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  9. 10
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  10. 10
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  11. 15
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
  12. 5
      designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java

33
designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java
Unescape View File

@ -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<ParameterProvider> 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),

30
designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java
Unescape View File

@ -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<ParameterProvider>
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<ParameterProvider>
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<ParameterProvider>
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) {

10
designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
Unescape View File

@ -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<ReportletHyperlink> {
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<ReportletHyperlink> {
return ParameterTableModel.NO_CHART_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
protected boolean needRenamePane() {
return getChartParaType() != ParameterTableModel.NO_CHART_USE;
}

10
designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
Unescape View File

@ -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<WebHyperlink> {
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<WebHyperlink> {
return ParameterTableModel.NO_CHART_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
protected boolean needRenamePane(){
return getChartParaType() != ParameterTableModel.NO_CHART_USE;
}

12
designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
Unescape View File

@ -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<JavaScriptImpl> {
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<JavaScriptImpl> {
return ParameterTableModel.NO_CHART_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
protected boolean needRenamePane(){
return getChartParaType() != ParameterTableModel.NO_CHART_USE;
}

10
designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
Unescape View File

@ -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<ParameterJavaScript>
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<ParameterJavaScript>
return ParameterTableModel.NO_CHART_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
protected boolean needRenamePane(){
return getChartParaType() != ParameterTableModel.NO_CHART_USE;
}

23
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
Unescape View File

@ -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);

12
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
Unescape View File

@ -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<ChartHyperPoplink> {
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<ChartHyperPoplink> {
return ParameterTableModel.CHART_NORMAL_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
/**
* 是否需要加载重命名的空间
* @return 默认需要加载

10
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
Unescape View File

@ -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<ChartHyperRelate
colRowPane = new ColumnRowVerticalPane();
centerPane.add(colRowPane, BorderLayout.NORTH);
parameterViewPane = new ReportletParameterViewPane(getChartParaType());
parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters")));
parameterViewPane.setPreferredSize(new Dimension(500, 200));
this.add(parameterViewPane, BorderLayout.SOUTH);
@ -58,6 +60,10 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
return ParameterTableModel.CHART_NORMAL_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
/**
* 是否需要加载重命名的空间
* @return 默认需要加载

10
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
Unescape View File

@ -4,15 +4,17 @@ import com.fr.base.Utils;
import com.fr.chart.web.ChartHyperRelateFloatLink;
import com.fr.design.DesignModelAdapter;
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.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
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.ParameterProvider;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.*;
import javax.swing.border.Border;
@ -63,7 +65,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
centerPane.add(pane, BorderLayout.NORTH);
parameterViewPane = new ReportletParameterViewPane(getChartParaType());
parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters")));
parameterViewPane.setPreferredSize(new Dimension(500, 200));
this.add(parameterViewPane, BorderLayout.SOUTH);
@ -73,6 +75,10 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
return ParameterTableModel.CHART_NORMAL_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
/**
* 是否需要加载重命名的空间
* @return 默认需要加载

15
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
Unescape View File

@ -1,11 +1,9 @@
package com.fr.design.chart.series.SeriesCondition.impl;
import java.awt.BorderLayout;
import javax.swing.BorderFactory;
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.layout.FRGUIPaneFactory;
@ -16,6 +14,9 @@ import com.fr.js.FormHyperlinkProvider;
import com.fr.stable.ParameterProvider;
import com.fr.stable.bridge.StableFactory;
import javax.swing.*;
import java.awt.*;
public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
private ReportletParameterViewPane parameterViewPane;
@ -32,7 +33,7 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
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<FormHyperlinkProvider> {
return ParameterTableModel.NO_CHART_USE;
}
protected ValueEditorPane getValueEditorPane() {
return ValueEditorPaneFactory.createVallueEditorPaneWithUseType(getChartParaType());
}
protected boolean needRenamePane(){
return getChartParaType() != ParameterTableModel.NO_CHART_USE;
}

5
designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java
Unescape View File

@ -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<AbstractChartAttrPane>();
paneList.add(attrPane = new ChartHyperPopAttrPane(paraType));
paneList.add(attrPane = new ChartHyperPopAttrPane(paraType, valueEditorPane, valueRenderPane));
paneList.add(new ChartTypePane());
dataPane4SupportCell = new ChartDataPane(listener);

Write Preview
Loading…
Cancel
Save