Pārlūkot izejas kodu

【UI替换】编辑工具 - 文件对比 新文件刷新数据异常修复

lizhe 1 gadu atpakaļ
vecāks
revīzija
a58d3ae68a

+ 6 - 6
PDF Office/PDF Master/Class/PDFTools/Compare/View/KMCompareView.swift

@@ -180,7 +180,7 @@ class KMCompareView: KMBaseXibView {
         }
         
         self.addFileContentView.mouseUpBack = { [unowned self] view in
-            self.chooseFileAction()
+            self.chooseFileAction(isNew: true)
         }
     }
     
@@ -403,14 +403,14 @@ extension KMCompareView {
         
         addFileContentView.isHidden = false
         if isNew {
-            guard let pdfNewDocument = KMCompareFilesConfig.defaultConfig.fileNewAttribute.pdfDocument else { return }
+            guard let document = KMCompareFilesConfig.defaultConfig.fileNewAttribute.pdfDocument else { return }
             pdfView = pdfNewView
             pageDocument = pdfView.document!
             currentPageLabel = currentNewPageLabel
             totalPageLabel = totalPaNewgeLabel
             addFileContentView.isHidden = true
         } else {
-            guard let pdfOldDocument = KMCompareFilesConfig.defaultConfig.fileOldAttribute.pdfDocument else { return }
+            guard let document = KMCompareFilesConfig.defaultConfig.fileOldAttribute.pdfDocument else { return }
             pdfView = oldPDFView
             pageDocument = pdfView.document!
             currentPageLabel = currentOldPageLabel
@@ -436,9 +436,9 @@ extension KMCompareView {
     func updateDocument(filePath: String, isNew: Bool = false, completion: @escaping (_ fileAttitude: KMFileAttribute?) -> Void) {
         var pdfDocument = CPDFDocument()
         if isNew {
-            pdfDocument = KMCompareFilesConfig.defaultConfig.fileOldAttribute.pdfDocument
-        } else {
             pdfDocument = KMCompareFilesConfig.defaultConfig.fileNewAttribute.pdfDocument
+        } else {
+            pdfDocument = KMCompareFilesConfig.defaultConfig.fileOldAttribute.pdfDocument
         }
         
         guard let pdfDocument = pdfDocument else {
@@ -597,7 +597,7 @@ extension KMCompareView {
     
     func chooseFileAction(isNew: Bool = false) {
 //        fileQKNewSelectedBox.resignFirstResponder()
-        self.window?.makeFirstResponder(nil)
+//        self.window?.makeFirstResponder(nil)
 
         let openPanel = NSOpenPanel()
         openPanel.allowedFileTypes = ["pdf"]