From ac23b37e17998cc7fbc280c2294c87c65ba75220 Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 19 Nov 2021 16:08:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-62972=20=E3=80=90=E6=8E=A5=E8=A7=A6?= =?UTF-8?q?=E7=82=B9=E4=BC=98=E5=8C=96=E3=80=91=E8=B7=9F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8F=AF=E6=9B=B4=E6=96=B0=E7=9A=84=E4=BA=A4=E4=BA=92=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 本地组件可更新提示初始时应该不可见 【改动思路】 同上 --- .../fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java index d2ad2d6f5..fd050513b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/local/LocalWidgetRepoPane.java @@ -92,6 +92,7 @@ public class LocalWidgetRepoPane extends BasicPane { container.setLayout(new BorderLayout()); updateTipPane = createUpdateTipPane(); + updateTipPane.setVisible(false); container.add(updateTipPane, BorderLayout.NORTH); updateProgressPane = createUpdateMaskPane(); From f4ce22e862bc2dc0fe091337187d8782919057fb Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 19 Nov 2021 17:34:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-62984=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=A6=E6=91=B8=E6=9D=BF=E9=97=AE=E9=A2=98-=E5=8F=8C?= =?UTF-8?q?=E6=8C=87=E5=90=91=E5=8F=B3=E6=BB=91=E5=8A=A8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=90=91=E5=8F=B3=E4=B8=8B=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 修复REPORT-55989时实现了新的支持双向触摸滚动的MouseWheelListener, 但未删除旧的触摸板滚动处理逻辑，导致旧的纵向滚动逻辑也一起生效了 【改动思路】 删除旧的纵向滚动处理逻辑 --- .../src/main/java/com/fr/grid/GridMouseAdapter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java b/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java index 11b6ae22b..c2c186114 100644 --- a/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java +++ b/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java @@ -879,12 +879,7 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous * @param e */ public void mouseWheelMoved(MouseWheelEvent e) { - if (!InputEventBaseOnOS.isControlDown(e)) { - ElementCasePane reportPane = grid.getElementCasePane(); - if (reportPane.isHorizontalScrollBarVisible()) { - reportPane.getVerticalScrollBar().setValue(reportPane.getVerticalScrollBar().getValue() + e.getWheelRotation() * 3); - } - } + } /**