From b3910bc86f8be33dd5cebf60e362a7ab26820ccc Mon Sep 17 00:00:00 2001 From: pengda Date: Tue, 24 Aug 2021 17:48:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-57561=20=E8=BF=9C=E7=A8=8B=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E4=B8=80=E8=87=B4=E5=8A=9F=E8=83=BD=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E7=9A=84=E6=8F=90=E7=A4=BA-=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E8=BF=9E=E6=8E=A5=E8=BF=9C=E7=A8=8B=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/module/DesignerWorkspaceProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index d5b6cdb632..f1e1ec5a25 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -63,12 +63,12 @@ public class DesignerWorkspaceProvider extends Activator { } else { WorkContext.switchTo(workspace); //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可 - final DesignerWorkspaceInfo selectEnv = workspaceInfo; + final String selectEnv = current; EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener() { @Override public void on(Event event, Null aNull) { try { - VersionCheckUtils.showVersionCheckDialog(selectEnv.getName()); + VersionCheckUtils.showVersionCheckDialog(selectEnv); } catch (Exception e) { FineLoggerFactory.getLogger().warn("Check Service Failed"); } From bbef610501613c581cce192a06821e4f5df649c4 Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Wed, 25 Aug 2021 10:25:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-57568=20=E8=A7=A3=E5=86=B3=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=A0=91=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/file/TemplateTreePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 0fc3ca7281..2c0d860fb4 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -83,7 +83,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { @Override public void mousePressed(MouseEvent evt) { - if (evt.getClickCount() == 2) { + if (reportletsTree.getPathForLocation(evt.getX(), evt.getY()) != null && evt.getClickCount() == 2) { openFile(); } } From 27238f73cca2804d677d10c2d927d52bdcea9dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Wed, 25 Aug 2021 10:57:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-57449=20=E3=80=90FR11=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91=E3=80=90=E5=BC=80=E5=8F=91=E8=80=85=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=94=AF=E6=8C=81=E8=B0=83=E6=95=B4=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E3=80=91=E6=96=B0=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?-=E8=BF=9C=E7=A8=8B=E7=8E=AF=E5=A2=83=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=BC=80=E5=8F=91=E8=80=85=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=AB=AF=E6=AD=A4?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=B7=B2?= =?UTF-8?q?=E9=94=81=E5=AE=9A=EF=BC=8C=E5=8F=8C=E5=87=BB=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BC=9A=E5=BC=B9=E5=87=BA=E5=B7=B2=E9=94=81=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BD=86=E4=BC=9A=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=A9=BA=E7=99=BD=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E6=AD=A4=E6=97=B6=E6=A8=A1=E6=9D=BF=E6=89=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E5=B7=B2=E9=94=81=E5=AE=9A=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/form/util/FormDesignerUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java index ded4e7c994..4c1f9304ba 100644 --- a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java +++ b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java @@ -36,6 +36,9 @@ public class FormDesignerUtils { * @return */ public static boolean isBodyAbsolute(FormDesigner designer) { + if (!designer.getRootComponent().acceptType(XWFitLayout.class)) { + return false; + } WFitLayout root = ((WFitLayout) designer.getRootComponent().toData()); return root.getBodyLayoutType() == com.fr.form.ui.container.WBodyLayoutType.ABSOLUTE; }