Pull request #2102: CHART-15112 刻度单位调整

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

* commit 'd23640845ad96181e781ca69fd4af053369c9f7a':
  CHART-15112 刻度单位调整

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

@@ -162,8 +162,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
             JPanel mainTickPane = new JPanel();
             mainTickPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
-            mainUnitField.setPreferredSize(new Dimension(80,20));
-            secondUnitField.setPreferredSize(new Dimension(80,20));
+
+            int width = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH - (int) Math.ceil(mainType.getPreferredSize().getWidth());
+            mainUnitField.setPreferredSize(new Dimension(width,20));
+            secondUnitField.setPreferredSize(new Dimension(width,20));
             mainTickPane.add(mainUnitField);
             mainTickPane.add(mainType);