Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0

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 javax.swing.JPanel;
-import java.awt.*;
+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());

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) {
+        try {
-            return adapter.getFloatNames();
+            if (adapter != null) {
+                return adapter.getFloatNames();
+            }
+        }catch (Exception Ignore){
+
         }
         return new String[0];
     }