Ver código fonte

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

niehaoyu 1 mês atrás
pai
commit
e4731873cf

+ 28 - 7
PDF Office/PDF Master/KMClass/NewBatch/Manager/KMBatchManager.swift

@@ -742,9 +742,16 @@ extension KMBatchManager {
                             self.batchSuccess()
                         }
                     } else {
-                        pdfDocument?.write(toFile: path)
+                        let success = pdfDocument?.write(toFile: path)
+                        if success != nil {
+                            for item in filesData {
+                                self.itemSuccess(item: item)
+                            }
+                            self.batchSuccess()
+                        } else {
+                            self.batchFailure()
+                        }
                     }
-                    self.batchSuccess()
                 } else {
                     for i in 0..<filesData.count {
                         let item = filesData[i]
@@ -754,9 +761,7 @@ extension KMBatchManager {
                             
                             
                             var pdfDocument = CPDFDocument()
-                            for item in filesData {
-                                pdfDocument?.km_insert(image: item.image, at: pdfDocument?.pageCount ?? 0)
-                            }
+                            pdfDocument?.km_insert(image: item.image, at: pdfDocument?.pageCount ?? 0)
 
                             let model = KMOCRModel()
                             model.showType = .page
@@ -777,6 +782,9 @@ extension KMBatchManager {
                                 self.itemSuccess(item: item)
                                 
                                 if i == filesData.count - 1 {
+                                    for item in filesData {
+                                        self.itemSuccess(item: item)
+                                    }
                                     self.batchSuccess()
                                 }
                             }
@@ -787,6 +795,9 @@ extension KMBatchManager {
                             pdfDocument?.km_insert(image: item.image, at: pdfDocument?.pageCount ?? 0)
                             let success = pdfDocument?.write(toFile: path)
                             if success != nil {
+                                for item in filesData {
+                                    self.itemSuccess(item: item)
+                                }
                                 self.batchSuccess()
                             } else {
                                 self.batchFailure()
@@ -822,13 +833,23 @@ extension KMBatchManager {
                         if (error != nil) {
                             self.batchFailure()
                         } else {
+                            for item in filesData {
+                                self.itemSuccess(item: item)
+                            }
                             self.batchSuccess()
                         }
                     }
                 } else {
-                    pdfDocument?.write(toFile: path)
+                    let success = pdfDocument?.write(toFile: path)
+                    if success != nil {
+                        for item in filesData {
+                            self.itemSuccess(item: item)
+                        }
+                        self.batchSuccess()
+                    } else {
+                        self.batchFailure()
+                    }
                 }
-                self.batchSuccess()
             }
         }
     }

+ 1 - 1
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.swift

@@ -104,7 +104,7 @@ class KMBatchProcessingTableView: NSView {
         if inputType == .imageToPDF {
             self.options = [.number, .name, .dimension, .size, .state]
         } else {
-            self.options = [.number, .name, .size, .state]
+            self.options = [.number, .name, .order, .size, .state]
         }
         
         if (options!.contains(KMBatchProcessingTableViewOptions.number)) {