Merge pull request #2714 in DESIGN/design from feature/10.0 to research/10.0

* commit '30b8d35cf43310c4baeb525e664749cf558c67ba':
  CHART-16244 警戒线默认字体
  CHART-15808 抽出createUISpinner
  MOBILE-29857【RN】设计器上圆点指示器选中填充色设置后没有生效
  MOBILE-29820 移动端tab样式页面缺少滚动条 添加滚动条 最外层直接使用JPanel，没有布局约束导致布局异常，需要调整
  MOBILE-29820 移动端tab样式页面缺少滚动条 对齐属性面板 新增scroll属性和滚动条

designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java

@@ -1,17 +1,16 @@
 package com.fr.design.gui.frpane;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.style.NumberDragBar;
 
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
 
 public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNameObserver {
 	private static final long serialVersionUID = -8681716725163358249L;
@@ -35,7 +34,7 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 
 	public UINumberDragPane(double minValue, double maxValue, double dierta) {
 		dragBar = new NumberDragBar((int) minValue, (int) maxValue);
-		spinner = new UISpinner(minValue, maxValue, dierta, minValue);
+		spinner = createUISpinner(minValue, maxValue, dierta);
 		spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
 		this.setLayout(new BorderLayout(4, 0));
 		this.add(spinner, BorderLayout.EAST);
@@ -66,6 +65,10 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 		});
 	}
 
+	protected UISpinner createUISpinner(double minValue, double maxValue, double dierta) {
+		return new UISpinner(minValue, maxValue, dierta, minValue);
+	}
+
 	/**
      * 添加事件
 	 * @param l 事件

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@@ -205,7 +205,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
         } else {
             alertText.populateBean(GeneralUtils.objectToString(chartAlertValue.getAlertContentFormula()));
         }
-        fontName.setSelectedItem(chartAlertValue.getAlertFont().getName());
+        fontName.setSelectedItem(chartAlertValue.getAlertFont().getFamily());
         fontSize.setSelectedItem(chartAlertValue.getAlertFont().getSize());
         fontColor.setSelectObject(chartAlertValue.getAlertFont().getForeground());
     }