From fdf8327ce0a8355deeeda891874e054e135ae1fc Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Thu, 4 Jun 2020 11:25:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-29657=20lab=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widget/ui/designer/LabelDefinePane.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
index cf435c1d0..d4ebf74ee 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
@@ -25,7 +25,7 @@ import java.awt.*;
  * Created by ibm on 2017/8/3.
  */
 public class LabelDefinePane extends AbstractDataModify<Label> {
-    private static final int WIDGET_VALUE_PANE_WIDTH = 145;
+    private static final int WIDGET_VALUE_PANE_WIDTH = 150;
     private FormWidgetValuePane formWidgetValuePane;
     private UICheckBox isPageSetupVertically;
     private UICheckBox isStyleAlignmentWrapText;
@@ -75,7 +75,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
                 new Component[]{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position_Similar")), hAlignmentPane},
                 new Component[]{fontLabel, frFontPane},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W4 - 5, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         boundsPane.add(panel);

From eb185a366a821d349e998a6eb8fca76e3f33cef1 Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Fri, 5 Jun 2020 09:22:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-32318=20frm=E6=A8=AA=E5=90=91?=
 =?UTF-8?q?=E5=92=8C=E7=BA=B5=E5=90=91=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/FormArea.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
index fe692388b..be9b4faa6 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
@@ -770,7 +770,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         int scrollMax = orientation == 1 ? verticalMax : horicalMax;
         //防止滚动条到达低端还可以继续点击移动(滚动条最大范围不变时，newValue要在范围之内)
         if (oldmax == scrollMax + visi && newValue > scrollMax) {
-            return new Point(oldValue, oldmax);
+            return new Point(scrollMax, oldmax);
         }
         return new Point(newValue, max);
     }