Browse Source

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

niehaoyu 1 month ago
parent
commit
f4f7e67a39

+ 4 - 0
PDF Office/PDF Master/KMClass/NewBatch/View/Setting/ImageToPDF/KMBatchImageToPDFView.swift

@@ -235,7 +235,11 @@ extension KMBatchImageToPDFView: ComponentSelectDelegate {
 //MARK: Action
 extension KMBatchImageToPDFView {
     @objc func saveButtonClicked(_ sender: ComponentButton) {
+        self.model.selectFilePath = self.selectFileInputButton.properties.text
         
+        guard let callBack = self.batchExport else { return }
+        
+        callBack(self, model)
     }
     
     func addFilesButtonAction() {

+ 1 - 1
PDF Office/PDF Master/KMClass/NewBatch/View/Setting/ImageToPDF/Model/KMBatchImageToPDFModel.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMBatchImageToPDFModel: NSObject {
+class KMBatchImageToPDFModel: KMBatchSettingItemViewModel {
     var isNewPDF = true
     var isMergeAll = false
     

+ 1 - 1
PDF Office/PDF Master/KMClass/NewBatch/View/Setting/KMBatchSettingView.swift

@@ -155,7 +155,7 @@ class KMBatchSettingView: BaseXibView {
             case .imageToPDF:
                 resultView = KMBatchImageToPDFView()
                 resultView.batchExport = { [unowned self] (view, data) in
-//                    KMBatchManager.manager.batch(type: type, data: data)
+                    KMBatchManager.manager.batch(type: type, data: data)
                 }
             default:
                 KMPrint("找不到")