Browse Source

Merge pull request #1365 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '40e62b014f2aa7f027fc41da1453df158842df3a':
  REPORT-21556 导入excel不显示数据
bugfix/10.0
Hades 5 years ago
parent
commit
ead5ac1c66
  1. 5
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

5
designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@ -144,7 +144,8 @@ 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;
@ -164,10 +165,12 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
return false;
}
@Override
public String[] getDefaultArgs() {
return new String[0];
}
};
}
/**
* 生成界面默认的组建

2
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);
// 自定义事件

Loading…
Cancel
Save