From c457b64d66e2ed8ec52163bb6d42a40d1030e9ff Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Sat, 8 Aug 2020 20:41:18 +0800 Subject: [PATCH] =?UTF-8?q?CHART-14960=20=E7=BB=93=E6=9E=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E7=B3=BB=E5=88=97=E5=92=8C=E4=B8=AD=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/BoxPlotTableResultDataSeriesPane.java | 14 ++++++++++++++ .../box/data/table/UIComboBoxWithEditLabel.java | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java index a9813f2d39..bdaf58a342 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java @@ -56,6 +56,11 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa median = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Median")); q1 = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q1")); min = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Min")); + + addNoneItem(); + + seriesName.setSelectedItem(null); + median.populateComboBox(null); } private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) { @@ -134,6 +139,8 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa refreshBoxItems(median.getComboBox(), list); refreshBoxItems(q1.getComboBox(), list); refreshBoxItems(min.getComboBox(), list); + + addNoneItem(); } public void clearAllBoxList() { @@ -145,6 +152,13 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa clearBoxItems(median.getComboBox()); clearBoxItems(q1.getComboBox()); clearBoxItems(min.getComboBox()); + + addNoneItem(); + } + + private void addNoneItem() { + seriesName.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); + median.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); } public void populateBean(ChartCollection collection) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java index dbfcae01fe..3392038604 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java @@ -45,6 +45,10 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv this.comboBox = comboBox; } + public void addItem(String value) { + comboBox.addItem(value); + } + protected void addItemListener(ItemListener aListener) { comboBox.addItemListener(aListener); }