Browse Source

增加图表超链类型和下拉框接口,整理图表超链代码

master
mengao 7 years ago
parent
commit
989c364f66
  1. 10
      designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
  2. 8
      designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  3. 8
      designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
  4. 8
      designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
  5. 8
      designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
  6. 7
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
  7. 7
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  8. 7
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  9. 7
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

10
designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java

@ -1,7 +1,7 @@
package com.fr.design.editor; package com.fr.design.editor;
import com.fr.base.Formula; import com.fr.base.Formula;
import com.fr.chart.chartattr.Plot; import com.fr.base.chart.BasePlot;
import com.fr.design.editor.editor.BooleanEditor; import com.fr.design.editor.editor.BooleanEditor;
import com.fr.design.editor.editor.ColumnRowEditor; import com.fr.design.editor.editor.ColumnRowEditor;
import com.fr.design.editor.editor.ColumnRowGroupEditor; import com.fr.design.editor.editor.ColumnRowGroupEditor;
@ -202,7 +202,7 @@ public class ValueEditorPaneFactory {
return createVallueEditorPaneWithUseType(paraUseType, null); return createVallueEditorPaneWithUseType(paraUseType, null);
} }
public static ValueEditorPane createVallueEditorPaneWithUseType(int paraUseType, Plot plot) { public static ValueEditorPane createVallueEditorPaneWithUseType(int paraUseType, BasePlot plot) {
if (paraUseType == ParameterTableModel.NO_CHART_USE) { if (paraUseType == ParameterTableModel.NO_CHART_USE) {
return createBasicValueEditorPane(); return createBasicValueEditorPane();
} else if (paraUseType == ParameterTableModel.FORM_NORMAL_USE) { } else if (paraUseType == ParameterTableModel.FORM_NORMAL_USE) {
@ -218,7 +218,7 @@ public class ValueEditorPaneFactory {
* @param plot plot类型 * @param plot plot类型
* @return 值编辑器 * @return 值编辑器
*/ */
public static ValueEditorPane createChartHotValueEditorPane(Plot plot) { public static ValueEditorPane createChartHotValueEditorPane(BasePlot plot) {
return createValueEditorPane(chartHotEditors(plot), StringUtils.EMPTY, StringUtils.EMPTY); return createValueEditorPane(chartHotEditors(plot), StringUtils.EMPTY, StringUtils.EMPTY);
} }
@ -446,7 +446,7 @@ public class ValueEditorPaneFactory {
* *
* @return 值编辑器 * @return 值编辑器
*/ */
public static Editor[] chartHotEditors(Plot plot) { public static Editor[] chartHotEditors(BasePlot plot) {
List<Editor> list = createEditors4Chart(plot); List<Editor> list = createEditors4Chart(plot);
list.add(new TextEditor()); list.add(new TextEditor());
@ -467,7 +467,7 @@ public class ValueEditorPaneFactory {
* *
* @return 值编辑器 * @return 值编辑器
*/ */
private static List<Editor> createEditors4Chart(Plot plot) { private static List<Editor> createEditors4Chart(BasePlot plot) {
List<Editor> lists = new ArrayList<Editor>(); List<Editor> lists = new ArrayList<Editor>();
if (plot == null) { if (plot == null) {
return lists; return lists;

8
designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@ -2,7 +2,7 @@ package com.fr.design.hyperlink;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.chart.chartattr.Plot; import com.fr.base.chart.BasePlot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
@ -25,16 +25,16 @@ import java.awt.event.ActionEvent;
import java.util.List; import java.util.List;
public class ReportletHyperlinkPane extends BasicBeanPane<ReportletHyperlink> { public class ReportletHyperlinkPane extends BasicBeanPane<ReportletHyperlink> {
private Plot plot; private BasePlot plot;
private ReporletHyperNorthPane northPane; private ReporletHyperNorthPane northPane;
private ReportletParameterViewPane parameterViewPane = null; private ReportletParameterViewPane parameterViewPane = null;
private UICheckBox extendParametersCheckBox; private UICheckBox extendParametersCheckBox;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
public ReportletHyperlinkPane(Plot plot) { public ReportletHyperlinkPane(BasePlot plot) {
super(); super();
this.plot = plot; this.plot = plot;
this.initComponents(); this.initComponents();

8
designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java

@ -1,7 +1,7 @@
package com.fr.design.hyperlink; package com.fr.design.hyperlink;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.chart.chartattr.Plot; import com.fr.base.chart.BasePlot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
@ -19,7 +19,7 @@ import java.awt.*;
import java.util.List; import java.util.List;
public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> { public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
private Plot plot; private BasePlot plot;
private WebHyperNorthPane northPane; private WebHyperNorthPane northPane;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
@ -28,7 +28,7 @@ public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
private UICheckBox extendParametersCheckBox; private UICheckBox extendParametersCheckBox;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -37,7 +37,7 @@ public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
this.initComponents(); this.initComponents();
} }
public WebHyperlinkPane(Plot plot) { public WebHyperlinkPane(BasePlot plot) {
super(); super();
this.plot = plot; this.plot = plot;
this.initComponents(); this.initComponents();

8
designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java

@ -1,7 +1,7 @@
package com.fr.design.javascript; package com.fr.design.javascript;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.chart.chartattr.Plot; import com.fr.base.chart.BasePlot;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.data.tabledata.tabledatapane.OneListTableModel; import com.fr.design.data.tabledata.tabledatapane.OneListTableModel;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
@ -27,14 +27,14 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> { public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
private Plot plot; private BasePlot plot;
private UITextField itemNameTextField; private UITextField itemNameTextField;
private JSContentPane jsPane; private JSContentPane jsPane;
private UITableEditorPane<String> importedJsPane; private UITableEditorPane<String> importedJsPane;
private ReportletParameterViewPane parameterPane; private ReportletParameterViewPane parameterPane;
private String[] defaultArgs; private String[] defaultArgs;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -42,7 +42,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
this(new String[0]); this(new String[0]);
} }
public JavaScriptImplPane(Plot plot) { public JavaScriptImplPane(BasePlot plot) {
this.plot = plot; this.plot = plot;
this.defaultArgs = new String[0]; this.defaultArgs = new String[0];
initComponents(); initComponents();

8
designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java

@ -1,7 +1,7 @@
package com.fr.design.javascript; package com.fr.design.javascript;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.chart.chartattr.Plot; import com.fr.base.chart.BasePlot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
@ -17,11 +17,11 @@ import java.awt.*;
import java.util.List; import java.util.List;
public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript> { public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript> {
private Plot plot; private BasePlot plot;
private UITextField itemNameTextField; private UITextField itemNameTextField;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -29,7 +29,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript>
this(null); this(null);
} }
public ParameterJavaScriptPane(Plot plot){ public ParameterJavaScriptPane(BasePlot plot){
this.plot = plot; this.plot = plot;
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());

7
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@ -1,6 +1,7 @@
package com.fr.design.chart.series.SeriesCondition.impl; package com.fr.design.chart.series.SeriesCondition.impl;
import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartCollection;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.Bar2DPlot;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
@ -34,9 +35,9 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
private ChartHyperEditPane hyperEditPane; private ChartHyperEditPane hyperEditPane;
private ChartComponent chartComponent; private ChartComponent chartComponent;
private Plot plot; private BasePlot plot;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -44,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
this(null); this(null);
} }
public ChartHyperPoplinkPane(Plot plot) { public ChartHyperPoplinkPane(BasePlot plot) {
this.plot = plot; this.plot = plot;
this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setLayout(FRGUIPaneFactory.createM_BorderLayout());

7
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@ -1,6 +1,7 @@
package com.fr.design.chart.series.SeriesCondition.impl; package com.fr.design.chart.series.SeriesCondition.impl;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.chart.web.ChartHyperRelateCellLink; import com.fr.chart.web.ChartHyperRelateCellLink;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
@ -32,9 +33,9 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
private ColumnRowVerticalPane colRowPane; private ColumnRowVerticalPane colRowPane;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
private Plot plot; private BasePlot plot;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -42,7 +43,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
this.initComponent(); this.initComponent();
} }
public ChartHyperRelateCellLinkPane(Plot plot) { public ChartHyperRelateCellLinkPane(BasePlot plot) {
this.plot = plot; this.plot = plot;
this.initComponent(); this.initComponent();
} }

7
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@ -1,6 +1,7 @@
package com.fr.design.chart.series.SeriesCondition.impl; package com.fr.design.chart.series.SeriesCondition.impl;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.chart.web.ChartHyperRelateFloatLink; import com.fr.chart.web.ChartHyperRelateFloatLink;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
@ -38,9 +39,9 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
private UIComboBox floatNameBox; private UIComboBox floatNameBox;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
private Plot plot; private BasePlot plot;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
@ -48,7 +49,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
this.initComponent(); this.initComponent();
} }
public ChartHyperRelateFloatLinkPane(Plot plot) { public ChartHyperRelateFloatLinkPane(BasePlot plot) {
this.plot = plot; this.plot = plot;
this.initComponent(); this.initComponent();

7
designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

@ -1,6 +1,7 @@
package com.fr.design.chart.series.SeriesCondition.impl; package com.fr.design.chart.series.SeriesCondition.impl;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.chart.BasePlot;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
@ -19,16 +20,16 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> { public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
private Plot plot; private BasePlot plot;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
private FormHyperlinkNorthPane northPane; private FormHyperlinkNorthPane northPane;
protected Plot getPlot() { protected BasePlot getPlot() {
return plot; return plot;
} }
public FormHyperlinkPane(Plot plot) { public FormHyperlinkPane(BasePlot plot) {
super(); super();
this.plot = plot; this.plot = plot;
this.initComponents(); this.initComponents();

Loading…
Cancel
Save