Browse Source

Merge pull request #6407 in DESIGN/design from release/11.0 to feature/x

* commit '1b6e607b23575dbcb305158576e6be28b951be04':
  REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
  REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
feature/x
superman 3 years ago
parent
commit
b83ccb40cc
  1. 1
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
  2. 4
      designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

1
designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@ -699,6 +699,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
if (parameterArr != null) {
js.setParameters(parameterArr);
}
parameterArr = null;
fireTableDataChanged();
}
});

4
designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

@ -107,7 +107,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
engineSettingPane.add(outEngineXSettingPane, JLayeredPane.DEFAULT_LAYER);
engineSettingPane.add(outLineEngineSettingPane, JLayeredPane.DEFAULT_LAYER);
engineSettingPane.moveToFront(outEngineXSettingPane);
engineSettingPane.setVisible(false);
engineSettingPane.setVisible(true);
JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
pagingEngineSelectPane.add(createPagingEngineRadioPanel());
pagingEngineSelectPane.add(engineSettingPane);
@ -197,7 +197,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
}
private JPanel createPagingEngineRadioPanel(){
UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), false);
UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), true);
UIRadioButton lineEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Line_Engine"), false);
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(newEngine);

Loading…
Cancel
Save