From f40ede4e48ca1bd670babd72c21cf99a2ab9b136 Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Fri, 20 Aug 2021 14:38:59 +0800
Subject: [PATCH 1/3] =?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 a1546025f9..91b7d322dc 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<ExportJavaScript
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (currentTemplateRadio.isSelected()) {
-                    reportPathTextField.setEnabled(false);
                     browserButton.setEnabled(false);
                 } else {
-                    reportPathTextField.setEnabled(true);
                     browserButton.setEnabled(true);
                 }
             }
@@ -234,6 +232,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
         reportPathTextField = new UITextField(20);
+        reportPathTextField.setEnabled(false);
         reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
 
         // 选择路径按钮
@@ -272,10 +271,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {
-            this.reportPathTextField.setEnabled(false);
             this.browserButton.setEnabled(false);
         } else {
-            this.reportPathTextField.setEnabled(true);
             this.browserButton.setEnabled(true);
             this.reportPathTextField.setText(ob.getTemplatePath());
         }

From 8d8049fbf8db56b1e12d40cc3a5df5c5404fa99a Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Fri, 20 Aug 2021 15:49:57 +0800
Subject: [PATCH 2/3] =?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 73e1caafa7..f7f5ef16b0 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<Listener> {
         // 发送邮件
         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" <bruce.deng@fanruan.com>
Date: Sun, 22 Aug 2021 17:12:58 +0800
Subject: [PATCH 3/3] =?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 91b7d322dc..f3367206f5 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<ExportJavaScript
 
     private JPanel initParamsPane() {
         extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        extendParametersCheckBox.setSelected(true);
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterViewPane.setVisible(false);
         parameterViewPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
                 List<ParameterProvider> list = parameterViewPane.update();
@@ -158,6 +160,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"));
         addRadioToGroup(fileNameRadioGroup, defaultNameRadio, customNameRadio);
         fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+        fileNameFormulaEditor.setEnabled(false);
         fileNameRadioGroup.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -238,6 +241,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         // 选择路径按钮
         browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+        browserButton.setEnabled(false);
         reportletNamePane.add(browserButton, BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {
             @Override