From f40ede4e48ca1bd670babd72c21cf99a2ab9b136 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Fri, 20 Aug 2021 14:38:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-57431=20=E5=AF=BC=E5=87=BA-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BA=8B=E4=BB=B6-=E6=A8=A1=E6=9D=BF=E9=80=89?= =?UTF-8?q?=E6=8B=A9-=E6=96=87=E6=9C=AC=E6=A1=86=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/javascript/ExportJavaScriptPane.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java index a1546025f..91b7d322d 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java @@ -220,10 +220,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane Date: Fri, 20 Aug 2021 15:49:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-57624=20=E5=AF=BC=E5=87=BA-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BA=8B=E4=BB=B6-=E6=A8=A1=E6=9D=BFweb=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE=E5=AF=BC=E5=87=BA=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?-=E4=BF=9D=E5=AD=98=E5=90=8E=E5=86=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=E9=82=AE=E4=BB=B6=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/javascript/ListenerEditPane.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index 73e1caafa..f7f5ef16b 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -101,16 +101,16 @@ public class ListenerEditPane extends BasicBeanPane { // 发送邮件 EmailPane emailPane = new EmailPane(); hyperlinkPane.add(EMAIL, emailPane); - // 导出事件 + cards.add(javaScriptPane); + cards.add(commit2DBJavaScriptPane); + cards.add(customActionPane); + cards.add(emailPane); + // 导出事件 这里要按顺序添加 if (workbook) { ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane(); hyperlinkPane.add(EXPORT, exportJavaScriptPane); cards.add(exportJavaScriptPane); } - cards.add(javaScriptPane); - cards.add(commit2DBJavaScriptPane); - cards.add(customActionPane); - cards.add(emailPane); //其他事件 addOtherEvent(); hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set"))); From 36e9f88c1a803a32ddee0abe7b5090213ec1d1fe Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Sun, 22 Aug 2021 17:12:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-57609=20&=20REPORT-57622=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA-=E5=AF=BC=E5=87=BA=E4=BA=8B=E4=BB=B6-=E6=A8=A1?= =?UTF-8?q?=E6=9D=BFweb=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE&=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E8=AE=BE=E7=BD=AE=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6-=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/javascript/ExportJavaScriptPane.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java index 91b7d322d..f3367206f 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java @@ -117,7 +117,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane list = parameterViewPane.update(); @@ -158,6 +160,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane Date: Mon, 23 Aug 2021 14:00:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-57647=20cpt=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=B8=AD=E7=BB=84=E4=BB=B6=E8=A2=AB=E4=B8=8B?= =?UTF-8?q?=E6=96=B9=E8=A6=86=E7=9B=96=E6=97=B6=20=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=8D=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/designer/creator/XCreator.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java index ed90a1c54..3856dde4b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java @@ -783,6 +783,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo // 不超过可绘制区域 int extraX = Math.min(creatorRightX, formDesignerWidth); int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight); + + if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) { + popup.setVisible(false); + return; + } + // 放到事件尾部执行 SwingUtilities.invokeLater(new Runnable() { @Override