Browse Source

【页面编辑】拆分窗口样式调整和导出路径新增文件夹

tangchao 1 year ago
parent
commit
b1c696d647

+ 2 - 23
PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -580,35 +580,14 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
             panel.canChooseFiles = false
             panel.canChooseDirectories = true
             panel.canCreateDirectories = true
-            let button = NSButton.init(checkboxWithTitle: "保存后打开文档", target: nil, action: nil)
-            button.state = .off
-            panel.accessoryView = button
             panel.beginSheetModal(for: (self?.view.window)!) { response in
                 if (response == .cancel) {
                     return
                 }
                 KMPageEditTools.split((self?.listView?.document)!, outputModel, panel.url!.path, outputModel.outputFileNameDeletePathExtension) { result, outputFilepaths, error in
                     if (result) {
-                        if (button.state == .on) {
-                            for filepath in outputFilepaths! {
-                                if !filepath.isPDFValid() {
-                                    let alert = NSAlert()
-                                    alert.alertStyle = .critical
-                                    alert.messageText = NSLocalizedString("An error occurred while opening this document. The file is damaged and could not be repaired.", comment: "")
-                                    alert.runModal()
-                                } else {
-                                    NSDocumentController.shared.openDocument(withContentsOf: URL(fileURLWithPath: filepath), display: true) { document, alreadyOpen, error in
-                                        
-                                    }
-                                }
-                            }
-
-                        } else {
-                            var urls: [URL] = []
-                            for filepath in outputFilepaths! {
-                                urls.append(URL(fileURLWithPath: filepath))
-                            }
-                            NSWorkspace.shared.activateFileViewerSelecting(urls)
+                        if let _urlString = outputFilepaths?.first?.deletingLastPathComponent {
+                            NSWorkspace.shared.activateFileViewerSelecting([URL(fileURLWithPath: _urlString)])
                         }
                     }
                 }

+ 4 - 5
PDF Office/PDF Master/Class/PDFTools/PageEdit/Tools/KMPageEditTools.swift

@@ -158,11 +158,10 @@ class KMPageEditTools: NSObject {
             return
         }
         
-//        var filePath = "\(path)/\(document.documentURL.deletingPathExtension().lastPathComponent)"
-//        if (!FileManager.default.fileExists(atPath: filePath)) {
-//            try?FileManager.default.createDirectory(atPath: filePath, withIntermediateDirectories: true)
-//        }
-        let filePath = path
+        let filePath = "\(path)/\(document.documentURL.deletingPathExtension().lastPathComponent)"
+        if (!FileManager.default.fileExists(atPath: filePath)) {
+            try?FileManager.default.createDirectory(atPath: filePath, withIntermediateDirectories: true)
+        }
         
         var filepaths: [String] = []
         for i in 0 ..< file_indexs!.count {

+ 4 - 0
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditSplitSettingView.swift

@@ -311,8 +311,12 @@ class KMPageEditSplitSettingView: KMPageEditSettingBaseView {
         
         if let state = self.pageRangeVC?.state, state == .Checked {
             self.pageRangeComboVC?.enabled = true
+            self.pageRangeComboVC?.editable = true
+            self.window?.makeFirstResponder(self.pageRangeComboVC?.textField)
         } else {
             self.pageRangeComboVC?.enabled = false
+            self.pageRangeComboVC?.editable = false
+            self.window?.makeFirstResponder(nil)
         }
     }