From 2667d6bdf98aefdf34cfd050ad9a0997fed8682e Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Mon, 8 Oct 2018 14:32:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-10699=20=E5=B1=8F=E8=94=BD=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=87=8C=E9=9D=A2=E7=9A=84=E4=B8=8A=E4=BC=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/fun/JavaScriptActionProvider.java | 2 ++
 .../fun/impl/AbstractJavaScriptActionProvider.java       | 9 +++++++++
 .../com/fr/design/javascript/JavaScriptActionPane.java   | 5 +++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java b/designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java
index 6d70e8785..754bdaeb4 100644
--- a/designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java
@@ -18,4 +18,6 @@ public interface JavaScriptActionProvider extends Mutable{
 
     FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
 
+    boolean isSupportType();
+
 }
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
index daf4f92c8..4640eaf4f 100644
--- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
@@ -26,4 +26,13 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
     public FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane) {
         return getJavaScriptActionPane();
     }
+
+    /**
+     * 判断是否是支持的类型（cpt,frm），默认是
+     * @return
+     */
+    @Override
+    public boolean isSupportType(){
+        return true;
+    }
 }
\ No newline at end of file
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 373480096..05208762e 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
@@ -9,7 +9,6 @@ import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.form.ui.WebContentUtils;
-
 import com.fr.js.JavaScript;
 
 import javax.swing.BorderFactory;
@@ -46,7 +45,9 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
         if (javaScriptActionProviders != null) {
             for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
-                paneList.add(jsp.getJavaScriptActionPane(this));
+                if(jsp.isSupportType()){
+                    paneList.add(jsp.getJavaScriptActionPane(this));
+                }
             }
         }
         // 自定义事件