Browse Source

Merge pull request #466 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit '26504d4b45e64e8117ce15f7f390180ab274b2ff':
  CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
final/10.0
zheng 6 years ago
parent
commit
77945d86e3
  1. 6
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

6
designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@ -26,7 +26,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
protected void initComponents() { protected void initComponents() {
String[] labels = fieldLabel(); String[] labels = fieldLabel();
TinyFormulaPane[] formulaPanes = formulaPanes(); Component[] formulaPanes = fieldComponents();
int len = Math.min(labels.length, formulaPanes.length); int len = Math.min(labels.length, formulaPanes.length);
@ -49,6 +49,10 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }
protected Component[] fieldComponents() {
return formulaPanes();
}
protected abstract String[] fieldLabel(); protected abstract String[] fieldLabel();
protected abstract TinyFormulaPane[] formulaPanes(); protected abstract TinyFormulaPane[] formulaPanes();

Loading…
Cancel
Save