Browse Source

Pull request #11650: REPORT-91316 不打开任何报表的情况下,编辑工具栏点不动

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit '7b08f0f72462e81afbcc3afacdb341083b787822':
  REPORT-91316 不打开任何报表的情况下,编辑工具栏点不动
feature/x
parent
commit
c1fe2aa250
  1. 13
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

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

@ -48,8 +48,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
contentDBManiPane.add(createDBManipulationPane());
paneList.add(new Commit2DBJavaScriptPane(this, contentDBManiPane));
paneList.add(initEmaiPane());
boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
if (workbook) {
if (isWorkBookValid()) {
paneList.add(new ExportJavaScriptPane());
}
paneList.add(new MobilePopupPane());
@ -66,6 +65,16 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
return paneList;
}
/**
* 选中的JTemplate是否有效并且是否是工作簿
*
* @return 选中的JTemplate有效并且是工作簿则返回true
*/
private boolean isWorkBookValid() {
return DesignerContext.getDesignerFrame().getSelectedJTemplate() != null
&& DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
}
protected EmailPane initEmaiPane() {
return new EmailPane();
}

Loading…
Cancel
Save