Parcourir la source

【fix】【合并】同时导入附件两张图片,只会导入其中一个

tangchao il y a 5 mois
Parent
commit
d7aff6d40f

+ 4 - 0
PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/KMMergeWindowController.swift

@@ -137,6 +137,10 @@ extension KMMergeWindowController {
                                     array.append(URL(fileURLWithPath: path))
                                 }
                             }
+                        } else {
+                            Task {
+                                _ = await KMAlertTool.runModel(message: NSLocalizedString("An error occurred while opening this document. The file is damaged and could not be repaired.", comment: ""))
+                            }
                         }
                     } else {
                         array.append(fileURL)

+ 12 - 0
PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/Model/KMMergeViewModel.swift

@@ -0,0 +1,12 @@
+//
+//  KMMergeViewModel.swift
+//  PDF Reader Pro
+//
+//  Created by User-Tangchao on 2024/9/30.
+//
+
+import Cocoa
+
+class KMMergeViewModel: NSObject {
+
+}

+ 3 - 0
PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -1420,6 +1420,9 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
                 if let fileURL = openPanel.urls.first {
 //                    self.choosePositionWindow {[weak self] index in
 //                        /// 插入位置
+                    if NSDocument.isDamage(url: fileURL, needAlertIfDamage: true) { // 损坏图片
+                        return
+                    }
                         if let imag = NSImage(contentsOfFile: fileURL.path ) {
                             let index = self.getInsertIndex() + 1
                             let document = CPDFDocument()