Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into bugfix/10.0

# Conflicts:
#	designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -330,7 +330,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
     }
 
-    private JPanel createCommonStylePane() {
+    protected JPanel createCommonStylePane() {
         styleButton = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Automatic"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
@@ -801,6 +801,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
      * 图表对于其他的格式有要求也可以在这里继续添加。
+     *
      * @param attrTooltipContent
      */
     private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {