diff --git a/designer/designer.iml b/designer/designer.iml
index 796f2413b..661dcd939 100644
--- a/designer/designer.iml
+++ b/designer/designer.iml
@@ -7,16 +7,7 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/designer_base/designer_base.iml b/designer_base/designer_base.iml
deleted file mode 100644
index d20642b28..000000000
--- a/designer_base/designer_base.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
index dfb4cdca0..f3e00932a 100644
--- a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
+++ b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java
@@ -1,6 +1,7 @@
package com.fr.design.fun;
import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.javascript.JavaScriptActionPane;
import com.fr.js.JavaScript;
import com.fr.stable.fun.mark.Mutable;
@@ -13,6 +14,8 @@ public interface JavaScriptActionProvider extends Mutable{
int CURRENT_LEVEL = 1;
-
FurtherBasicBeanPane extends JavaScript> getJavaScriptActionPane();
+
+ FurtherBasicBeanPane extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
+
}
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
index 504a8b73e..69e277032 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java
@@ -1,6 +1,9 @@
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.js.JavaScript;
import com.fr.stable.fun.impl.AbstractProvider;
import com.fr.stable.fun.mark.API;
@@ -18,4 +21,9 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
public String mark4Provider() {
return getClass().getName();
}
+
+ @Override
+ public FurtherBasicBeanPane extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane) {
+ return getJavaScriptActionPane();
+ }
}
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
index d29393944..52648e444 100644
--- a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
+++ b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java
@@ -56,7 +56,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane {
Set javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
if (javaScriptActionProviders != null) {
for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
- paneList.add(jsp.getJavaScriptActionPane());
+ paneList.add(jsp.getJavaScriptActionPane(this));
}
}
// 自定义事件
diff --git a/designer_chart/designer_chart.iml b/designer_chart/designer_chart.iml
deleted file mode 100644
index cde6262d7..000000000
--- a/designer_chart/designer_chart.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/designer_form/designer_form.iml b/designer_form/designer_form.iml
deleted file mode 100644
index 842981108..000000000
--- a/designer_form/designer_form.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file