【主页】合并入口补充

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -1080,21 +1080,18 @@ extension KMHomeViewController {
     }
     
     func km_open_pdf_merge() {
-//        DispatchQueue.main.async {
-//            NSPanel.km_open_pdf_multi_success(self.view.window!, panel: nil) { urls in
-//                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-//                    var filepaths: Array<String> = []
-//                    for url in urls {
-//                        filepaths.append(url.path)
-//                    }
-//                    let windowController = KMPDFEditAppendWindow(filePaths: filepaths)
-//                    self.currentWindowController = windowController
-//                    windowController?.beginSheetModal(for: self.view.window, completionHandler: { result, indexs in
-//
-//                    })
-//                }
-//            }
-//        }
+        DispatchQueue.main.async {
+            
+                let windowController = KMMergeWindowController(windowNibName: "KMMergeWindowController")
+                self.currentWindowController = windowController
+                
+                windowController.cancelAction = { [unowned self] controller in
+                    self.view.window?.endSheet((self.currentWindowController!.window)!)
+                    self.currentWindowController = nil
+                }
+                
+                self.view.window?.beginSheet(windowController.window!)
+        }
     }
     
     func fastTool_Compression() {   // 压缩