Browse Source

Merge pull request #371 in BA/design from ~DANIEL/finereport_design:dev to dev

* commit '5ee8cd6abc7465835be83ad199f46b249fdd31b5':
  换一下输出
master
superman 8 years ago
parent
commit
c007a58e31
  1. 3
      designer/src/com/fr/design/actions/file/export/AbstractExportAction.java
  2. 3
      designer/src/com/fr/design/actions/file/export/PDFExportAction.java

3
designer/src/com/fr/design/actions/file/export/AbstractExportAction.java

@ -5,6 +5,7 @@ package com.fr.design.actions.file.export;
import com.fr.base.FRContext;
import com.fr.base.Parameter;
import com.fr.io.exporter.pdfstream.PDFStreamExporter;
import com.fr.page.PageSetProvider;
import com.fr.design.actions.JWorkBookAction;
import com.fr.design.gui.iprogressbar.FRProgressBar;
@ -139,7 +140,7 @@ public abstract class AbstractExportAction extends JWorkBookAction {
if (exporter instanceof AppExporter) {
AppExporter appExporter = (AppExporter) exporter;
if (exporter instanceof ExcelExporter || exporter instanceof CSVExporter
|| exporter instanceof PDFExporter || exporter instanceof WordExporter) {
|| exporter instanceof PDFExporter || exporter instanceof PDFStreamExporter || exporter instanceof WordExporter) {
ReportHelper.clearFormulaResult(tpl);// 清空rpt中的公式计算结果
appExporter.export(fileOutputStream, tpl.execute(parameterMap, ActorFactory.getActor(ActorConstants.TYPE_PAGE)

3
designer/src/com/fr/design/actions/file/export/PDFExportAction.java

@ -10,6 +10,7 @@ import com.fr.file.filter.ChooseFileFilter;
import com.fr.general.Inter;
import com.fr.io.exporter.Exporter;
import com.fr.io.exporter.PDFExporter;
import com.fr.io.exporter.pdfstream.PDFStreamExporter;
/**
* Export pdf
@ -28,7 +29,7 @@ public class PDFExportAction extends AbstractExportAction {
@Override
protected Exporter getExporter() {
return new PDFExporter();
return new PDFStreamExporter();
}
@Override

Loading…
Cancel
Save