From 4396d78c3377ac5d25767681684f987f92f45d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Thu, 30 Apr 2020 17:25:34 +0800
Subject: [PATCH] =?UTF-8?q?CHART-13598=20&&=20CHART-13604=20=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E6=8A=A5=E8=A1=A8=E8=B6=85=E9=93=BE=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E6=8A=A5=E9=94=99=20&&=20=E5=88=A0=E6=8E=89?=
 =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=82=AC=E6=B5=AE=E5=9B=BE=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChartHyperPopAttrPane.java                | 12 +++++-------
 .../impl/ChartHyperRelateFloatLinkPane.java        | 14 +++++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
index 4e1a4b2f46..ac30dbf3be 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
@@ -13,13 +13,14 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.stable.ParameterProvider;
-import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 
 /**
  * 图表弹出超链, 悬浮窗属性设置界面.
@@ -108,9 +109,6 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 	 */
 	public void updateBean(ChartHyperPoplink chartHyperlink) {
 		String title = titleField.getText();
-		if (StringUtils.isBlank(title)) {
-			title = "Chart";
-		}
 		chartHyperlink.setChartDigTitle(title);
 		chartHyperlink.setWidth((int)widthField.getValue());
 		chartHyperlink.setHeight((int)heightField.getValue());
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index 96b157f105..15b2a4f6fd 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -17,13 +17,13 @@ import javax.swing.JPanel;
 import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
 import javax.swing.border.TitledBorder;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com
@@ -84,8 +84,12 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 
     private String[] getFloatNames() {
         DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter();
-        if (adapter != null) {
-            return adapter.getFloatNames();
+        try {
+            if (adapter != null) {
+                return adapter.getFloatNames();
+            }
+        }catch (Exception Ignore){
+
         }
         return new String[0];
     }