From 56f45d13b066d528cde6d0c3fedb52bd230b58e1 Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 13 Nov 2020 10:20:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-32205=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=A4=9A=E5=B1=8F=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/utils/gui/GUICoreUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java index 9f5c7fbaa9..e6b276437a 100644 --- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java @@ -298,7 +298,11 @@ public final class GUICoreUtils { * @param win the current window august:现在要考虑左边日志模板的影响 */ public static void centerWindow(Window win) { - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + // Toolkit.getDefaultToolkit().getScreenSize()在有多个显示器也只能获取到主屏的大小 + // getGraphicsConfiguration().getBounds()能获取多个屏时 设计器主体界面所在屏的大小和对应的坐标 + Rectangle rectangle = win.getGraphicsConfiguration().getBounds(); + + Dimension screenSize = rectangle.getSize(); Dimension winSize = win.getSize(); @@ -308,7 +312,7 @@ public final class GUICoreUtils { if (winSize.width > screenSize.width) { winSize.width = screenSize.width; } - win.setLocation((screenSize.width - winSize.width) / 2, (screenSize.height - winSize.height) / 2 - WINDOW_GAP); + win.setLocation(rectangle.x + (screenSize.width - winSize.width) / 2, rectangle.y + (screenSize.height - winSize.height) / 2 - WINDOW_GAP); } /** From 28746aff31a6ca57e6aeabee61c0d2113e4b0d57 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 17 Nov 2020 09:08:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-43022=20=E3=80=9010.0.11=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=9C=AA?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=92=A4?= =?UTF-8?q?=E9=94=80=E9=87=8D=E5=81=9A=E6=97=A0=E6=95=88=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E6=92=A4=E9=94=80=E9=87=8D=E5=81=9A?= =?UTF-8?q?=E5=B9=B6=E4=B8=8D=E6=98=AF=E6=97=A0=E6=95=88=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E6=98=AF=E5=9B=A0=E4=B8=BA=E4=B9=8B=E5=89=8D=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E7=BC=96=E8=BE=91=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=BB=8F?= =?UTF-8?q?=E8=BF=87=E4=BA=86=E4=B8=8E=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E7=9A=84=E6=92=A4=E9=94=80=E9=87=8D=E5=81=9A?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=96=B9=E6=A1=88=E3=80=91=E5=9C=A8=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E4=B9=9F=E9=9C=80=E8=A6=81populate?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index daae99160f..7fba013587 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -762,6 +762,11 @@ public class JWorkBook extends JTemplate { DesignModuleFactory.getFormHierarchyPane().refreshRoot(); } } else { + // REPORT-43022 即使没有处于编辑参数面板的状态，在经过有关参数面板的撤销后，也需要刷新一下参数面板 + if (hasParameterPane()) { + parameterPane.populate(u.getApplyTarget()); + setAutoHeightForCenterPane(); + } reportComposite.setSelectedIndex(u.getSelectedReportIndex()); u.getSelectedEditingState().revert(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();