Pull request #14912: REPORT-135400 & REPORT-135840 & REPORT-134213 fix:fbp回归问题修复

Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release

* commit '20a7200cbd000bb2a1110179b8922070e307661a':
  REPORT-135400 & REPORT-135840 & REPORT-134213 fix:fbp回归问题修复

designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java

@@ -1,12 +1,9 @@
 package com.fr.van.chart.designer;
 
-import com.fine.theme.utils.FineUIScale;
 import com.fr.design.dialog.BasicScrollPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import java.awt.Window;
 
 /**
  * Created by mengao on 2017/8/11.
@@ -24,13 +21,11 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
     }
 
     /**
-     * getHeight与最外层ChartPropertyPane获取的高度一致，都是计算的面板高度而不是到设计器底部的高度
-     * 这里直接获取设计器高度减去单元格元素北区最大高度(格式TextFormatPaneContainer高度不固定)，先让滚动效果显示起来
+     * 获取可视窗口高度
      * @return height
      */
     @Override
     protected int getMaxHeight() {
-        Window window = SwingUtilities.getWindowAncestor(this);
-        return window.getHeight() - FineUIScale.scale(400);
+        return getVisibleRect().height;
     }
 }

designer-realize/src/main/java/com/fr/design/mainframe/AbstractAttrPane.java

@@ -15,7 +15,7 @@ import java.awt.event.MouseWheelListener;
  * 几点：子类不需要写构造函数了，所有的组件都放在createContentPane()方法生成的pane里面,它不需要考虑border。
  */
 public abstract class AbstractAttrPane extends AbstractAttrNoScrollPane {
-	private static final int MAXVALUE = FineUIScale.scale(100);
+	private static final int MAXVALUE = 100;
     private static final int TITLE_HEIGHT = FineUIScale.scale(50);
 	private static final int MOUSE_WHEEL_SPEED = 5;
 	private int maxHeight = FineUIScale.scale(280);

designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java

@@ -27,7 +27,7 @@ public abstract class FreezeAndRepeatPane extends BasicBeanPane<FT> {
 	protected boolean isEnalbed;
 
 	protected void initComponent() {
-		Dimension size = FineUIScale.createScaleDimension(50, 21);
+		Dimension size = FineUIScale.createScaleDimension(58, 21);
         if (start instanceof UISpinner) {
             start.setPreferredSize(size);
             ((UISpinner) start).addChangeListener(new ChangeListener() {