Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0

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);
     }

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);