Browse Source

Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

tangchao 1 year ago
parent
commit
9a55054fa8

+ 6 - 4
PDF Office/PDF Master/Class/PDFTools/Print/KMPrintWindowController.swift

@@ -17,7 +17,7 @@ class KMPrintWindowController: KMBaseWindowController, NetServiceBrowserDelegate
     @IBOutlet weak var settingView: KMPrintSettingView!
     @IBOutlet weak var bottomView: KMPrintBottomView!
     
-//    var pdfDocument: CPDFDocument? = nil
+    var tempPDFDocument: PDFDocument?
     var password: String = "" {
         didSet {
             self.preview.password = password
@@ -387,10 +387,11 @@ extension KMPrintWindowController: KMPrintBottomViewDelegate {
     
     func printAction() {
         KMPrint("打印机直接打印")
-        guard let url = self.presenter.printData.url else { return }
-        let document = PDFDocument.init(url: url)
+//        guard let url = self.presenter.printData.url else { return }
+//        let document = PDFDocument.init(url: url)
+        guard let document = self.tempPDFDocument else { return }
         let printInfo = NSPrintInfo.shared
-        let printOperation: NSPrintOperation = document!.printOperation(for: printInfo, scalingMode: .pageScaleNone, autoRotate: true)!
+        let printOperation: NSPrintOperation = document.printOperation(for: printInfo, scalingMode: .pageScaleNone, autoRotate: true)!
         printOperation.showsPrintPanel = true //是否弹出打印机设置界面
         printOperation.run()
     }
@@ -474,6 +475,7 @@ extension KMPrintWindowController: KMPrintChooseViewDelegate {
 extension KMPrintWindowController: KMPrintPresenterDeleage {
     func showData(presenter: KMPrintPresenter, document: PDFDocument) {
         
+        self.tempPDFDocument = document
         self.preview.model = self.chooseData
         if isPrintPreView && self.preview.model?.page.operation.type == .poster {
 //            self.preview.pdfDocument = pdfDocument