From 20a7200cbd000bb2a1110179b8922070e307661a Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Wed, 25 Sep 2024 17:04:35 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135400=20&=20REPORT-135840=20&=20REPORT-?= =?UTF-8?q?134213=20fix:fbp=E5=9B=9E=E5=BD=92=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/designer/AbstractVanChartScrollPane.java | 9 ++------- .../java/com/fr/design/mainframe/AbstractAttrPane.java | 2 +- .../com/fr/design/report/freeze/FreezeAndRepeatPane.java | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java index c0d3de1d3f..01458cb612 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java +++ b/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 extends BasicScrollPane { } /** - * getHeight与最外层ChartPropertyPane获取的高度一致，都是计算的面板高度而不是到设计器底部的高度 - * 这里直接获取设计器高度减去单元格元素北区最大高度(格式TextFormatPaneContainer高度不固定)，先让滚动效果显示起来 + * 获取可视窗口高度 * @return height */ @Override protected int getMaxHeight() { - Window window = SwingUtilities.getWindowAncestor(this); - return window.getHeight() - FineUIScale.scale(400); + return getVisibleRect().height; } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AbstractAttrPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AbstractAttrPane.java index b6bd0f164b..e0efa23347 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AbstractAttrPane.java +++ b/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); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java index 7d22ebabb1..aab94cb3aa 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java @@ -27,7 +27,7 @@ public abstract class FreezeAndRepeatPane extends BasicBeanPane { 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() {