From 2d9479f52d7c5321638ded5d662302bfab3f2ca9 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Wed, 16 Sep 2020 14:26:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-15263=20=E7=B3=BB=E5=88=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chartx/component/AbstractCustomFieldComboBoxPane.java  | 7 +++++--
 .../java/com/fr/extended/chart/UIComboBoxWithNone.java     | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
index e4e27b7f49..16f983c758 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
@@ -82,6 +82,10 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
         return false;
     }
 
+    protected boolean seriesComboBoxHasNone() {
+        return false;
+    }
+
     public void checkBoxUse(boolean hasUse) {
         nameOrValue.setEnabled(hasUse);
         useFieldValuePane.checkBoxUse(hasUse);
@@ -147,8 +151,7 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
 
         private void initComponents() {
 
-            series = new UIComboBox();
-
+            series = seriesComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
             value = valueComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
             value.addItemListener(new ItemListener() {
                 @Override
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java
index 6df855cd70..f20675066f 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java
@@ -41,7 +41,9 @@ public class UIComboBoxWithNone extends UIComboBox {
     public void setSelectedItem(Object anObject) {
         super.setSelectedItem(anObject);
 
-        if (getSelectedIndex() == -1) {//找不到的都选中无。中文的无 英文下是none。
+        //找不到的都选中无。中文的无 英文下是none。
+        //改正：找不到的且anObject不是null的 全部选中无。
+        if (getSelectedIndex() == -1 && anObject != null) {
             super.setSelectedItem(getDefaultLocaleString());
         }
     }

From d8fd16a0b4aacac708964a5134c8bf182d21d235 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Wed, 16 Sep 2020 15:59:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-15263=20=E8=BD=AE=E6=92=ADgis?=
 =?UTF-8?q?=E5=92=8C=E4=B8=89=E7=BB=B4=E7=BB=84=E5=90=88=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=20=E7=B3=BB=E5=88=97=20=E6=97=A0=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/extended/chart/ExtendedCustomFieldComboBoxPane.java    | 4 ++++
 1 file changed, 4 insertions(+)

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 119d73bda6..fe02f67c04 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
@@ -22,6 +22,10 @@ public class ExtendedCustomFieldComboBoxPane extends AbstractCustomFieldComboBox
         return new ExtendedCustomFieldNamePane();
     }
 
+    @Override
+    protected boolean seriesComboBoxHasNone() {
+        return true;
+    }
 
     @Override
     public void populateBean(AbstractDataConfig ob) {