AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace DxPdfViewer with DxReportViewer for PDF handling

Browse Source 
Replaced `DxPdfViewer` with `DxReportViewer` to unify handling of
both PDF and report rendering. Removed conditional logic for
`PdfBytes` and directly initialized `XtraReport` with PDF content
using `XRPdfContent`. Simplified `OnInitializedAsync` to fetch
PDF content, create a report, and store it in `ReportStorage`.
Removed unused fields (`PdfViewerUrl`, `PdfBytes`, and
`SignedPdfBytes`) and redundant code related to PDF handling.
This commit is contained in:
tekh
2026-05-31 08:14:07 +02:00
parent 697f85f805
commit 390f2d2cae
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor
View File

@@ -2,7 +2,6 @@
@page "/receiver/{EnvelopeKey}"
@using System.Drawing
@using DevExpress.Blazor
@using DevExpress.Blazor.PdfViewer
@using DevExpress.Drawing
@using DevExpress.Utils
@using DevExpress.XtraPrinting
@@ -128,9 +127,7 @@
</DxPopup>
<div class="receiver-viewer-wrapper">
@if(!AppOptions.Value.ForceToUseFakeDocument && !string.IsNullOrWhiteSpace(EnvelopeKey) && PdfBytes is { Length: > 0 }) {
<DxPdfViewer @key="ViewerKey" CssClass="w-100 h-100" DocumentContent="PdfBytes" />
} else if(Report is not null) {
@if(Report is not null) {
<DxReportViewer @key="ViewerKey" @ref="reportViewer" Report="Report" RootCssClasses="w-100 h-100" />
}
</div>
@@ -159,9 +156,6 @@
DxReportViewer? reportViewer;
XtraReport? Report;
string PdfViewerUrl = string.Empty;
byte[]? PdfBytes;
byte[]? SignedPdfBytes;
bool SignatureApplied;
bool SignaturePopupVisible;
string? SignatureValidationMessage;
@@ -177,8 +171,16 @@
protected override async Task OnInitializedAsync() {
if (!AppOptions.Value.ForceToUseFakeDocument && !string.IsNullOrWhiteSpace(EnvelopeKey)) {
(PdfBytes, _) = await DocumentService.GetDocumentAsync(EnvelopeKey);
return;
var (pdfBytes, _) = await DocumentService.GetDocumentAsync(EnvelopeKey);
if (pdfBytes is { Length: > 0 }) {
var report = new XtraReport();
var detail = new DevExpress.XtraReports.UI.DetailBand();
report.Bands.Add(detail);
detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = pdfBytes, GenerateOwnPages = true });
ReportStorage.SetData(report, EnvelopeKey);
Report = ReportStorage.TryGetReport(EnvelopeKey, out var stored) ? stored : report;
return;
}
}
Report = CreateReportInstance();