From b7a81c4daccf6047e9d8c43f58853547f183355a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 19 Sep 2018 17:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E8=AF=B4=E6=98=8E=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=92=8C=E5=80=BC=E4=B8=8B=E6=8B=89=E6=A1=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E2=80=9C=E6=97=A0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/ExtendedCustomFieldComboBoxPane.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
index 5ff47c128e..dfa7d793ed 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
@@ -11,16 +11,12 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itable.UITable;
 import com.fr.design.gui.itable.UITableEditor;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.stable.StringUtils;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTable;
-import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -30,6 +26,10 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.SwingConstants;
 
 /**
  * Created by shine on 2018/9/12.
@@ -119,6 +119,7 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
 
             series = new UIComboBox();
             value = new UIComboBox();
+            value.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
             function = new CalculateComboBox();
 
             Component[][] components = new Component[][]{
@@ -146,6 +147,7 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
         public void clearAllBoxList() {
             DataPaneHelper.clearBoxItems(series);
             DataPaneHelper.clearBoxItems(value);
+            value.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         }
 
         public void refreshBoxListWithSelectTableData(List columnNameList) {
@@ -159,6 +161,7 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
             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());
             }
         }