From 7b08f0f72462e81afbcc3afacdb341083b787822 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 13 Mar 2023 16:23:22 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-91316=20=E4=B8=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=BB=BB=E4=BD=95=E6=8A=A5=E8=A1=A8=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E7=82=B9=E4=B8=8D=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/javascript/JavaScriptActionPane.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java index e2f8dd906..be216a46f 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java @@ -48,8 +48,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { contentDBManiPane.add(createDBManipulationPane()); paneList.add(new Commit2DBJavaScriptPane(this, contentDBManiPane)); paneList.add(initEmaiPane()); - boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook(); - if (workbook) { + if (isWorkBookValid()) { paneList.add(new ExportJavaScriptPane()); } paneList.add(new MobilePopupPane()); @@ -66,6 +65,16 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { return paneList; } + /** + * 选中的JTemplate是否有效并且是否是工作簿 + * + * @return 选中的JTemplate有效并且是工作簿则返回true + */ + private boolean isWorkBookValid() { + return DesignerContext.getDesignerFrame().getSelectedJTemplate() != null + && DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook(); + } + protected EmailPane initEmaiPane() { return new EmailPane(); }