ct

designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java

@@ -2,11 +2,12 @@ package com.fr.design.fun;
 
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.javascript.JavaScriptActionPane;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.js.JavaScript;
 import com.fr.stable.fun.mark.Mutable;
 
 /**
- * Created by zack on 2015/8/14.
+ * 控件的事件扩展接口
  */
 public interface JavaScriptActionProvider extends Mutable{
 
@@ -14,9 +15,21 @@ public interface JavaScriptActionProvider extends Mutable{
 
     int CURRENT_LEVEL = 1;
 
+    /**
+     * 事件的界面
+     */
     FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane();
 
+    /**
+     * 这个界面在哪些类型模板设计的时候会出现
+     * @see com.fr.design.mainframe.JWorkBook
+     * @see com.fr.design.mainframe.JForm
+     */
+    boolean accept(JTemplate template);
+
+    @Deprecated
     FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
 
+    @Deprecated
     boolean isSupportType();
 }

designer-base/src/main/java/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java

@@ -3,6 +3,8 @@ package com.fr.design.fun.impl;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.fun.JavaScriptActionProvider;
 import com.fr.design.javascript.JavaScriptActionPane;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.js.JavaScript;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
@@ -27,10 +29,16 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
         return getJavaScriptActionPane();
     }
 
-	/**
+    @Override
-     * 判断是否是支持的类型（cpt,frm），默认是
+    public boolean accept(JTemplate template) {
-     * @return
+        // 这里只是为了兼容原来的isSupportType方法
-     */
+        boolean result = isSupportType();
+        if (result) {
+            return true;
+        }
+        return true;
+    }
+
     @Override
     public boolean isSupportType(){
         return true;