From 716b26cd32695219ea7947251ffbad2aa783665c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 5 Jun 2018 09:04:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6090=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E9=93=BE=E6=8E=A5-=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E7=AA=97=E5=9B=BE=E8=A1=A8=E5=92=8C=E8=B6=85=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5-=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChartHyperRelateFloatLinkPane.java          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index f3610da865..caf766df37 100644
--- a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -19,6 +19,7 @@ import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
 import javax.swing.border.TitledBorder;
 import java.awt.*;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -93,7 +94,16 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
             itemNameTextField.setText(ob.getItemName());
         }
 
-        floatNameBox.setSelectedItem(ob.getRelateCCName());
+        floatNameBox.removeAllItems();
+        String[] floatNames = getFloatNames();
+        for (int i = 0, size = floatNames.length; i < size; i++) {
+            floatNameBox.addItem(floatNames[i]);
+        }
+        if (ob.getRelateCCName() == null || !Arrays.asList(floatNames).contains(ob.getRelateCCName())) {
+            floatNameBox.setSelectedIndex(-1);
+        } else {
+            floatNameBox.setSelectedItem(ob.getRelateCCName());
+        }
 
         List parameterList = this.parameterViewPane.update();
         parameterList.clear();