|
@@ -469,7 +469,7 @@ end;
|
|
|
procedure TReportsForm.xlbPrintCurPageClick(Sender: TObject);
|
|
|
begin
|
|
|
if _IsEncrypt or G_IsCloud then
|
|
|
- PreviewComXML.Print(CurPage, 1)
|
|
|
+ PreviewComXML.Print(PreviewBox.Canvas, CurPage, 1)
|
|
|
else
|
|
|
TipMessage(GetHintStr, Handle);
|
|
|
end;
|
|
@@ -490,7 +490,7 @@ begin
|
|
|
if extvReport.LeafCheckedCount > 0 then
|
|
|
PrintAllSelectedReports
|
|
|
else
|
|
|
- PreviewComXML.PrintMultiPages(PrintStartPage, PrintEndPage);
|
|
|
+ PreviewComXML.PrintMultiPages(PreviewBox.Canvas, PrintStartPage, PrintEndPage);
|
|
|
end
|
|
|
else
|
|
|
TipMessage(GetHintStr, Handle);
|
|
@@ -520,7 +520,7 @@ begin
|
|
|
if extvReport.LeafCheckedCount > 0 then
|
|
|
ExportAllSelectedPDFReports
|
|
|
else
|
|
|
- PreviewComXML.PrintPDF(PrintStartPage, PrintEndPage);
|
|
|
+ PreviewComXML.PrintPDF(PreviewBox.Canvas, PrintStartPage, PrintEndPage);
|
|
|
end
|
|
|
else
|
|
|
TipMessage(GetHintStr, Handle);
|
|
@@ -1343,12 +1343,12 @@ procedure TReportsForm.PrintReport(ATemplateNode: TTemplateNode;
|
|
|
begin
|
|
|
if isPDF then
|
|
|
begin
|
|
|
- BatchPrintXml.PrintPDFAll;
|
|
|
+ BatchPrintXml.PrintPDFAll(PreviewBox.Canvas);
|
|
|
while not CheckPrinterReady do
|
|
|
Sleep(1000);
|
|
|
end
|
|
|
else if not isExcel then
|
|
|
- BatchPrintXml.PrintAll(1)
|
|
|
+ BatchPrintXml.PrintAll(PreviewBox.Canvas, 1)
|
|
|
else
|
|
|
ExportXlsReport(1, BatchPrintXml.TotalPages, ExcelOutputName, BatchPrintXml);
|
|
|
end;
|