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

PDF Office/PDF Master/Class/PDFTools/Watermark/New/KMWatermarkWindowController.swift

@@ -33,6 +33,7 @@ class KMWatermarkWindowController: KMBaseWindowController {
         watermarkView.operateCallBack = { [unowned self] watermark, countType in
             operateCallBack?(self, watermark, countType)
         }
+        watermarkView.reloadData()
     }
     
 }

PDF Office/PDF Master/Class/PDFTools/Watermark/New/View/KMWatermarkView.swift

@@ -98,7 +98,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
     var pdfDocument: CPDFDocument? {
         didSet {
             self.pdfView.document = pdfDocument
-            self.reloadData()
+//            self.reloadData()
         }
     }
     
@@ -126,7 +126,6 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
     
     override func setup() {
         pdfView.watermark = watermark
-        pdfView.document = pdfDocument
         pdfView.autoScales = true
 //        pdfView.documentView?.enclosingScrollView?.hasVerticalScroller = false
 //        pdfView.documentView?.enclosingScrollView?.hasHorizontalScroller = false