修复 pdf无法打印问题 修复pdf打印添加水印问题

server/src/main/resources/static/pdfjs/web/viewer.mjs

@@ -13874,7 +13874,7 @@ class PDFPrintService {
     };
     return new Promise(renderNextPage);
   }
-  useRenderedPage() {
+useRenderedPage() {
     this.throwIfInactive();
     const img = document.createElement("img");
     this.scratchCanvas.toBlob(blob => {
@@ -13883,28 +13883,29 @@ class PDFPrintService {
     const wrapper = document.createElement("div");
     wrapper.className = "printedPage";
     wrapper.append(img);
-	 var printWatermarkDiv = document.createElement('div');
+    
-    // console.log(pageSize);
+    // 关键：定义 pageSize 和 pageCount
+    const pageSize = this.pagesOverview[0];
+    const pageCount = this.pagesOverview.length;
+    
+    var printWatermarkDiv = document.createElement('div');
     printWatermarkDiv.style.position = 'absolute';
     printWatermarkDiv.style.left = '0px';
     printWatermarkDiv.style.top = '0px';
     printWatermarkDiv.style.width = '1024px';
-    printWatermarkDiv.style.height = pageSize.height*pageCount+ "px";
+    printWatermarkDiv.style.height = pageSize.height * pageCount + "px";
-    watermarkObj(printWatermarkDiv,watermarkTxt);
+    watermarkObj(printWatermarkDiv, watermarkTxt);
     wrapper.appendChild(printWatermarkDiv);
     this.printContainer.append(wrapper);
-    const {
+    
-      promise,
+    const { promise, resolve, reject } = Promise.withResolvers();
-      resolve,
-      reject
-    } = Promise.withResolvers();
     img.onload = resolve;
     img.onerror = reject;
     promise.catch(() => {}).then(() => {
       URL.revokeObjectURL(img.src);
     });
     return promise;
-  }
+}
   performPrint() {
     this.throwIfInactive();
     return new Promise(resolve => {

server/src/main/resources/web/pdf.ftl

@@ -78,13 +78,6 @@
         }
         window.location.href = href;
     }
-
-    // 水印初始化（保持原有逻辑）
-    window.onload = function () {
-        if (typeof initWaterMark === 'function') {
-            initWaterMark();
-        }
-    };
 </script>
 </body>
 </html>