页面编辑-替换功能测试

PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift

@@ -34,7 +34,7 @@ class KMBaseViewController: NSViewController {
     // MARK: - Open Password Files
     
     private var lockedFiles: [URL] = []
-    func km_open_pdf_multi(type: KMPasswordInputWindowType = .open, progressBlock: ((_ index: Int, _ params: Any...)->Void)?, completionBlock:@escaping ([CPDFDocument])->Void) {
+    func km_open_pdf_multi(type: KMPasswordInputWindowType = .open, progressBlock: ((_ index: Int, _ params: Any...)->Void)? = nil, completionBlock:@escaping ([CPDFDocument])->Void) {
         NSPanel.km_open_pdf_multi_success(self.view.window!, panel: nil) { urls in
             var results: [CPDFDocument] = []
             

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -764,44 +764,24 @@ extension KMPDFEditViewController {
         }
     }
     
-    @objc func replacePageItemAction(menu:NSMenuItem?) {
-        let panel = NSOpenPanel()
-        panel.allowedFileTypes = ["pdf"]
-        panel.allowsMultipleSelection = true
-        panel.beginSheetModal(for: self.view.window!) { [weak self] response in
-            if (response == .cancel) {
-                return
-            }
-            
+    @objc func replacePageItemAction(menu:NSMenuItem?) {        
+        self.km_open_pdf_multi { [unowned self] documents in
             /// 处理page
             var pages: Array<CPDFPage> = []
-            let selectedIndex: Int = (self?.getSelecteIndex())!
-            self?.listView?.document.removePage(at: UInt(selectedIndex))
+            let selectedIndex: Int = self.getSelecteIndex()
+            self.listView?.document.removePage(at: UInt(selectedIndex))
             
             var insertIndex: Int = selectedIndex
-            self?.lockedFiles.removeAll()
-            for fileURL in panel.urls {
-                let document = CPDFDocument(url: fileURL)
-                if ((document?.isLocked)!) {
-                    self?.lockedFiles.append(fileURL)
-                    continue
-                }
-                
-                for i in 0 ..< document!.pageCount {
-                    let page = document?.page(at: i)
+            for document in documents {
+                for i in 0 ..< document.pageCount {
+                    let page = document.page(at: i)
                     pages.append(page!)
-                    self!.listView?.document.insertPageObject(page, at:UInt(insertIndex))
+                    self.listView?.document.insertPageObject(page, at:UInt(insertIndex))
                     insertIndex += 1
                 }
             }
             
-            if ((self?.lockedFiles.count)! <= 0) {
-                self?.refreshUI()
-                return
-            }
-            
-            self?.refreshUI()
-            self!.showPasswordWindow(insertIndex)
+            self.refreshUI()
         }
     }
     

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditExtractSettingView.swift

@@ -38,7 +38,7 @@ class KMPageEditExtractSettingView: KMPageEditSettingBaseView {
         self.independentPerPageVC?.view.autoresizingMask = [.width, .height]
         self.independentPerPageVC?.target = self
         self.independentPerPageVC?.action = #selector(independentPerPageAction)
-        self.independentPerPageVC?.stringValue = NSLocalizedString("Each page as a separate page", comment: "")
+        self.independentPerPageVC?.stringValue = NSLocalizedString("Each page in a separate file", comment: "")
         self.independentPerPageVC?.checkbox_radio()
         
         self.extractAfterDeletePageVC = KMDesignButton(withType: .CheckBox)
@@ -47,7 +47,7 @@ class KMPageEditExtractSettingView: KMPageEditSettingBaseView {
         self.extractAfterDeletePageVC?.view.autoresizingMask = [.width, .height]
         self.extractAfterDeletePageVC?.target = self
         self.extractAfterDeletePageVC?.action = #selector(extractAfterDeletePageAction)
-        self.extractAfterDeletePageVC?.stringValue = NSLocalizedString("Delete page after extraction", comment: "")
+        self.extractAfterDeletePageVC?.stringValue = NSLocalizedString("Delete pages after extraction", comment: "")
         self.extractAfterDeletePageVC?.checkbox_radio()
     }
     

PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -3504,7 +3504,6 @@
 "Paste and Match Style" = "Paste and Match Style";
 
 "All pages in one file" = "All pages in one file";
-"Each page in a separate file" = "Each page in a separate file";
 "Extract Methods" = "Extract Methods";
 "Click to refresh" = "Click to refresh";