Pull request #1800: CHART-14541 轴标题增加缩进

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit 'e828cd48d5030505beb64c53954f33bb6a8b14f7':
  CHART-14541 轴标题增加缩进

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -126,7 +126,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         double[] column = {f, s};
         double[] rowSize = {p, p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
@@ -144,7 +144,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         titleContent = new TinyFormulaPane();
         titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
         UIComponentUtils.setLineWrap(titleUseHtml);
-        titleTextAttrPane = new ChartTextAttrPane();
+        titleTextAttrPane = getChartTextAttrPane();
         titleTextRotation = new UINumberDragPane(-ROTATION_MAX, ROTATION_MAX);
         if (isXAxis) {
             titleTextRotation.populateBean(0.0);
@@ -163,6 +163,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 },
         };
         titlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
+        titlePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
 
         JPanel showTitlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Title"), showTitle);
         showTitle.addActionListener(new ActionListener() {

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java

@@ -27,15 +27,15 @@ import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.regex.Pattern;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.regex.Pattern;
 
 /**
  * 时间坐标轴
@@ -68,7 +68,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, columnSize, isXAxis),null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, column, isXAxis),null},
                 new Component[]{createLabelPane(new double[]{p, p}, column),null},
                 new Component[]{createValueDefinition(),null},
                 new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null},

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java

@@ -49,7 +49,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
         double[] column = {f, s};
         double[] rowSize = {p,p,p,p,p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null},
+                new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null},
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},