Merge pull request #1528 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit 'b1112d2abc7dc1e4f5e884a34e53cdbfc1e025fc':
  REPORT-6090 单元格添加超链接-悬浮窗图表和超链接-悬浮元素有问题

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;
 
@@ -92,9 +93,16 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         if (itemNameTextField != null) {
             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();