Ver código fonte

【2025】 【Convert】图片转PDF, 上传图片后, 选择合并,会一直卡住(其实是有转出来,但是弹窗一直卡住)-修复

lizhe 1 mês atrás
pai
commit
5766933bc3

+ 2 - 6
PDF Office/PDF Master/KMClass/NewBatch/Manager/KMBatchManager.swift

@@ -47,7 +47,6 @@ class KMBatchManager: NSObject {
             let outputFolderPath = (panel.url?.path)!
             //
             self.batchUnkown()
-            
             switch type {
             case .convertPDF:
                 self.convertPDFExport(data: data, outputFolderPath: outputFolderPath)
@@ -83,9 +82,6 @@ class KMBatchManager: NSObject {
                 KMPrint("找不到")
                 break
             }
-            
-            //
-            self.batchProgress()
         }
     }
 }
@@ -674,10 +670,10 @@ extension KMBatchManager {
             if data.isNewPDF {
                 if data.isMergeAll {
                     let item = filesData[0]
-                    var path = self.fetchFilePath(type: .imageToPDF, filePath: item.filePath, outputFolderPath: outputFolderPath)
+                    let path = self.fetchFilePath(type: .imageToPDF, filePath: item.filePath, outputFolderPath: outputFolderPath)
                     
                     
-                    var pdfDocument = CPDFDocument()
+                    let pdfDocument = CPDFDocument()
                     for item in filesData {
                         pdfDocument?.km_insert(image: item.image, at: pdfDocument?.pageCount ?? 0)
                     }

+ 9 - 7
PDF Office/PDF Master/KMClass/NewBatch/View/Setting/ImageToPDF/KMBatchImageToPDFView.swift

@@ -284,13 +284,15 @@ extension KMBatchImageToPDFView {
     @objc func saveButtonClicked(_ sender: ComponentButton) {
         self.model.selectFilePath = self.selectFileInputButton.properties.text
         
-        let selectFilePath = self.model.selectFilePath
-        if selectFilePath.count == 0 {
-            let alert = NSAlert()
-            alert.alertStyle = .critical
-            alert.messageText = KMLocalizedString("文件未选择")
-            alert.runModal()
-            return
+        if !self.model.isNewPDF {
+            let selectFilePath = self.model.selectFilePath
+            if selectFilePath.count == 0 {
+                let alert = NSAlert()
+                alert.alertStyle = .critical
+                alert.messageText = KMLocalizedString("文件未选择")
+                alert.runModal()
+                return
+            }
         }
         
         guard let callBack = self.batchExport else { return }