From 40e62b014f2aa7f027fc41da1453df158842df3a Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 13 Dec 2019 17:40:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-21556=20=E5=AF=BC=E5=85=A5excel=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascript/JavaScriptActionPane.java      | 41 ++++++++++---------
 .../design/javascript/ListenerEditPane.java   |  2 +-
 2 files changed, 23 insertions(+), 20 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 ee1e1905f6..f54b070b0a 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
@@ -144,30 +144,33 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         return contentDBManiPane;
     }
 
-    public static JavaScriptActionPane defaultJavaScriptActionPane = new JavaScriptActionPane() {
+    public static JavaScriptActionPane createDefaultJavaScriptActionPane() {
+        return new JavaScriptActionPane() {
 
-        private static final long serialVersionUID = 1L;
+            private static final long serialVersionUID = 1L;
 
-        @Override
-        public DBManipulationPane createDBManipulationPane() {
-            JTemplate jTemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
-            return jTemplate == null ? new DBManipulationPane() : jTemplate.createDBManipulationPane();
-        }
+            @Override
+            public DBManipulationPane createDBManipulationPane() {
+                JTemplate jTemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
+                return jTemplate == null ? new DBManipulationPane() : jTemplate.createDBManipulationPane();
+            }
 
-        @Override
-        protected String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function");
-        }
+            @Override
+            protected String title4PopupWindow() {
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function");
+            }
 
-        @Override
-        public boolean isForm() {
-            return false;
-        }
+            @Override
+            public boolean isForm() {
+                return false;
+            }
 
-        public String[] getDefaultArgs() {
-            return new String[0];
-        }
-    };
+            @Override
+            public String[] getDefaultArgs() {
+                return new String[0];
+            }
+        };
+    }
 
     /**
      * 生成界面默认的组建
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 5f1f941faa..b89971f879 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
@@ -81,7 +81,7 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         // 提交入库
         List dbManiList = new ArrayList();
         dbManiList.add(autoCreateDBManipulationPane());
-        Commit2DBJavaScriptPane commit2DBJavaScriptPane = new Commit2DBJavaScriptPane(JavaScriptActionPane.defaultJavaScriptActionPane,
+        Commit2DBJavaScriptPane commit2DBJavaScriptPane = new Commit2DBJavaScriptPane(JavaScriptActionPane.createDefaultJavaScriptActionPane(),
                 dbManiList);
         hyperlinkPane.add(DBCOMMIT, commit2DBJavaScriptPane);
         // 自定义事件