From c3fc7be77cfde08fb878fefc316e206ca904f254 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 20 Sep 2018 14:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/ExtendedCustomFieldComboBoxPane.java        | 11 +++--------
 1 file changed, 3 insertions(+), 8 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 426540d13..c4e23faf9 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
@@ -166,24 +166,19 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
         public void refreshBoxListWithSelectTableData(List columnNameList) {
             DataPaneHelper.refreshBoxItems(series, columnNameList);
             DataPaneHelper.refreshBoxItems(value, columnNameList);
+            if (hasNoneItem) {
+                value.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+            }
         }
 
         @Override
         public void populateBean(AbstractDataConfig ob) {
             List<ExtendedField> 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());
                 function.populateBean((AbstractDataFunction) list.get(1).getDataFunction());
             }
-
-            if (value.getSelectedItem() == null) {
-                value.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
-            }
         }
 
         @Override