From 144da9e50a452b5ae8ec761984412d4b76b9a42a Mon Sep 17 00:00:00 2001
From: renekton <Renekton@fanruan.com>
Date: Mon, 23 Sep 2024 15:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=9D=A1=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=AD=A5=E9=95=BF=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?&=E6=8E=A7=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BAtab?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/gui/frpane/UINumberDragPane.java | 14 +++++++++++---
 .../gui/frpane/UINumberDragPaneWithPercent.java    |  4 ++++
 .../mainframe/theme/ReportThemeProfilePane.java    |  2 +-
 .../van/chart/column/VanChartColumnSeriesPane.java |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java
index d024f247fd..5d1b331122 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java
@@ -32,19 +32,27 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 	}
 
 	public UINumberDragPane(double minValue, double maxValue) {
-		this(minValue, maxValue, 1);
+		this(minValue, maxValue, 1, (int) maxValue - (int) minValue);
+	}
+
+	public UINumberDragPane(double minValue, double maxValue, int majorTickSpace) {
+		this(minValue, maxValue, 1, majorTickSpace);
 	}
 
 	public UINumberDragPane(double minValue, double maxValue, double dierta) {
+		this(minValue, maxValue, dierta, (int) maxValue - (int) minValue);
+	}
+
+	public UINumberDragPane(double minValue, double maxValue, double dierta, int majorTickSpace) {
 		dragBar = new UISlider((int) minValue, (int) maxValue);
 		dragBar.setPaintLabels(true);
-		dragBar.setMajorTickSpacing((int) maxValue - (int) minValue);
+		dragBar.setMajorTickSpacing(majorTickSpace);
 		spinner = createUISpinner(minValue, maxValue, dierta);
 		spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
 		spinner.setValue(dragBar.getValue());
 		this.setLayout(new BorderLayout());
 		this.add(Layouts.row(
-				cell(dragBar).weight(0.7), flex(0.1), cell(spinner).weight(0.7)
+				cell(dragBar).weight(0.8), flex(0.1), cell(spinner).weight(0.6)
 		).getComponent());
 		dragBar.addChangeListener(e -> {
 			if (globalNameListener != null && shouldResponseNameListener()) {
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java
index 9a17962b7a..d290bf2cc6 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java
@@ -14,6 +14,10 @@ public class UINumberDragPaneWithPercent extends UINumberDragPane {
         super(minValue, maxValue);
     }
 
+    public UINumberDragPaneWithPercent(double minValue, double maxValue, int majorTickSpace) {
+        super(minValue, maxValue, majorTickSpace);
+    }
+
     public UINumberDragPaneWithPercent(double minValue, double maxValue, double dierta) {
         super(minValue, maxValue, dierta);
     }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
index 44253b983b..d5eb2b3a1a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
@@ -51,8 +51,8 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
-            initializePane();
             refreshExtraAdvancedPane();
+            initializePane();
         }
 
         @Override
diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
index a8b039c77b..ba8a50497e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
@@ -63,7 +63,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
     private JPanel createSeriesStylePane() {
         isFixedWidth = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
         columnWidth = new UISpinnerWithPx(0,1000,1,0);
-        seriesGap = new UINumberDragPaneWithPercent(-100, 100);
+        seriesGap = new UINumberDragPaneWithPercent(-100, 100, 100);
         categoryGap = new UINumberDragPaneWithPercent(0, 100);
         isFillWithImage = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
         imagePane = new ImageBackgroundQuickPane(false);