Browse Source

Merge pull request #311 in BA/design from ~LOY/design_fr:dev to dev

* commit '88dc3a8fe788316cf320de7dac7dac57bb528987':
  优化web报表性能,增加轻量重方式输出选项
master
superman 8 years ago
parent
commit
90c87ffcdd
  1. 6
      designer/src/com/fr/design/webattr/PageToolBarPane.java
  2. 14
      designer/src/com/fr/design/webattr/PageWebSettingPane.java

6
designer/src/com/fr/design/webattr/PageToolBarPane.java

@ -34,6 +34,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
private UICheckBox isShowAsImageBox;
private UICheckBox isAutoScaleBox;
private UICheckBox isTDHeavyBox;
private UICheckBox isTDHeavyUseLightBox;
private EventPane eventPane;
private UILabel showLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":");
@ -59,6 +60,8 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
north.add(GUICoreUtils.createFlowPane(isAutoScaleBox, FlowLayout.LEFT));
isTDHeavyBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_TD_HEAVY_EXPORT"), false);
north.add(GUICoreUtils.createFlowPane(isTDHeavyBox, FlowLayout.LEFT));
isTDHeavyUseLightBox = new UICheckBox(Inter.getLocText("FR-Designer_USE_TD_HEAVY_LIGHT"), false);
north.add(GUICoreUtils.createFlowPane(isTDHeavyUseLightBox, FlowLayout.LEFT));
editToolBarButton.addActionListener(editBtnListener);
isUseToolBarCheckBox.setSelected(true);
@ -93,6 +96,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
this.centerRadioButton.setEnabled(isEnabled);
this.eventPane.setEnabled(isEnabled);
this.isTDHeavyBox.setEnabled(isEnabled);
this.isTDHeavyUseLightBox.setEnabled(isEnabled);
this.isAutoScaleBox.setEnabled(isEnabled);
this.isShowAsImageBox.setEnabled(isEnabled);
this.leftRadioButton.setEnabled(isEnabled);
@ -122,6 +126,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
isShowAsImageBox.setSelected(webPage.isShowAsImage());
isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe());
isTDHeavyBox.setSelected(webPage.isTDHeavy());
isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy());
if (webPage.isUseToolBar()) {
this.toolBarManagers = webPage.getToolBarManagers();
this.isUseToolBarCheckBox.setSelected(true);
@ -156,6 +161,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
webPage.setShowAsImage(isShowAsImageBox.isSelected());
webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected());
webPage.setTDHeavy(isTDHeavyBox.isSelected());
webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected());
return webPage;
}

14
designer/src/com/fr/design/webattr/PageWebSettingPane.java

@ -29,6 +29,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
private UICheckBox isShowAsImageBox;
private UICheckBox isAutoScaleBox;
private UICheckBox isTDHeavyBox;
private UICheckBox isTDHeavyUseLightBox;
public PageWebSettingPane() {
super();
@ -48,14 +49,15 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox = new UICheckBox(Inter.getLocText("Is_Paint_Page"));
isAutoScaleBox = new UICheckBox(Inter.getLocText("IS_Auto_Scale"));
isTDHeavyBox = new UICheckBox(Inter.getLocText("IS_TD_HEAVY_EXPORT"), false);
isTDHeavyUseLightBox = new UICheckBox(Inter.getLocText("USE_TD_HEAVY_LIGHT"), false);
double p = TableLayout.PREFERRED;
double[] columnSize = { p,p,p};
double[] rowSize = { p, p,p,p };
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT),buttonpane,null},
new Component[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT),isShowAsImageBox,isAutoScaleBox},
new Component[]{null,isTDHeavyBox,null}
} ;
new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT), buttonpane,null},
new Component[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox},
new Component[]{null, isTDHeavyBox, isTDHeavyUseLightBox}
};
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
}
@ -69,6 +71,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setEnabled(isSelected);
isAutoScaleBox.setEnabled(isSelected);
isTDHeavyBox.setEnabled(isSelected);
isTDHeavyUseLightBox.setEnabled(isSelected);
}
protected void setDefault(){
super.setDefault();
@ -76,6 +79,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setSelected(false);
isAutoScaleBox.setSelected(false);
isTDHeavyBox.setSelected(false);
isTDHeavyUseLightBox.setSelected(false);
}
@Override
protected void populateSubWebSettingrBean(WebPage webPage) {
@ -91,6 +95,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setSelected(webPage.isShowAsImage());
isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe());
isTDHeavyBox.setSelected(webPage.isTDHeavy());
isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy());
}
@Override
@ -100,6 +105,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
webPage.setShowAsImage(isShowAsImageBox.isSelected());
webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected());
webPage.setTDHeavy(isTDHeavyBox.isSelected());
webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected());
return webPage;
}

Loading…
Cancel
Save