Browse Source

Pull request #1716: CHART-13666 打包报错

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit 'f6663d5adf6a9d40a415dc629b0b16b50220901a':
  CHART-13666 打包报错
feature/big-screen
eason 5 years ago
parent
commit
9ee1568264
  1. 14
      designer-chart/src/main/java/com/fr/design/chart/AutoChartDialog.java

14
designer-chart/src/main/java/com/fr/design/chart/AutoChartDialog.java

@ -1,9 +1,7 @@
package com.fr.design.chart; package com.fr.design.chart;
import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartCollection;
import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.plugin.chart.vanchart.VanChart;
import java.awt.Component; import java.awt.Component;
import java.awt.Dialog; import java.awt.Dialog;
@ -53,17 +51,5 @@ public class AutoChartDialog extends ChartDialog {
*/ */
public void populate(BaseChartCollection cc) { public void populate(BaseChartCollection cc) {
super.populate(cc); super.populate(cc);
ChartCollection chartCollection = (ChartCollection) getChartCollection();
VanChart vanChart = chartCollection.getSelectedChartProvider(VanChart.class);
if (vanChart == null) {
return;
}
TopDefinitionProvider filterDefinition = vanChart.getFilterDefinition();
if (filterDefinition == null) {
return;
}
String tableName = vanChart.getFilterDefinition().getTableName();
String[] dataFields = vanChart.getFilterDefinition().getDataFields();
autoChartTypePane.populate(tableName, dataFields);
} }
} }

Loading…
Cancel
Save