diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java index 19a7b8e16..0ac454634 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java @@ -10,14 +10,13 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.general.GeneralUtils; - -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Component; import java.util.Arrays; import java.util.List; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingConstants; /** * Created by shine on 2018/3/2. @@ -54,7 +53,7 @@ public abstract class AbstractExtendedChartTableDataPane fieldList = new ArrayList(); + public ExtendedCustomFieldComboBoxPane(boolean hasNoneItem) { + this.hasNoneItem = hasNoneItem; + } + @Override protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); @@ -119,7 +126,11 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane list = ob.getCustomFields(); + if (hasNoneItem) { + value.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); + } + if (list.size() == 2) { series.setSelectedItem(list.get(0).getFieldName()); value.setSelectedItem(list.get(1).getFieldName()); - value.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); function.populateBean((AbstractDataFunction) list.get(1).getDataFunction()); } + + if (value.getSelectedItem() == null) { + value.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); + } } @Override