【编辑工具】合并，添加文档，无论页面范围设置奇数偶数自定义，添加的都是全部页面 -- 修复

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/KMMergeWindowController.swift

@@ -218,7 +218,7 @@ extension KMMergeWindowController {
         let fileName = (files.first?.filePath.deletingPathExtension.lastPathComponent ?? "") + "_Merged"
         DispatchQueue.main.async {
             self.oldPDFDocument.outlineRoot = PDFOutline.init()
-            if allPage {
+//            if allPage {
                 var insertIndex = 0
                 for i in 0..<rootPDFOutlineArray.count {
                     let rootOutline = rootPDFOutlineArray[i]
@@ -285,7 +285,7 @@ extension KMMergeWindowController {
                         }
                     }
                 }
-            }
+//            }
         }
     }
     

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeTableViewCell.swift

@@ -117,10 +117,12 @@ class KMMergeTableViewCell: NSTableCellView {
     
     @IBAction func comboBoxAction(_ sender: NSComboBoxCell) {
         guard let fileModel = fileModel else { return }
-        let type = KMPageRange.init(rawValue: sender.indexOfSelectedItem) ?? .all
-        fileModel.pagesType = type
+        if sender.indexOfSelectedItem >= 0 {
+            let type = KMPageRange.init(rawValue: sender.indexOfSelectedItem) ?? .all
+            fileModel.pagesType = type
+        }
         
-        if type == .custom {
+        if fileModel.pagesType == .custom {
             fileModel.pagesString = sender.stringValue
         }
     }

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeView.swift

@@ -300,7 +300,7 @@ extension KMMergeView {
     
     @IBAction func mergeButtonAction(_ sender: Any) {
         guard let callBack = mergeAction else { return }
-        
+        self.reloadData()
         callBack(self, self.files, self.newPageSize)
     }
     

PDF Office/PDF Master/Class/PDFTools/Merge/Model/KMFileAttribute.swift

@@ -23,7 +23,7 @@ import Cocoa
     var oriFilePath: String?
     var myPDFDocument: PDFDocument?
     var pdfDocument: CPDFDocument?
-    var bAllPage = true
+    var bAllPage = false
     private var selectPages: [Int] = []
     var pagesString: String = ""
     var isLocked = false