【综合】合并新增支持导入图片格式文件

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/KMMergeWindowController.swift

@@ -83,6 +83,8 @@ class KMMergeWindowController: KMBaseWindowController {
         
         mergeView.cancelAction = { [weak self] view in
             guard let self = self else { return }
+            
+            self._clearImageData()
             self.cancelAction?(self)
         }
     }
@@ -159,6 +161,13 @@ extension KMMergeWindowController {
         return path
     }
     
+    private func _clearImageData() {
+        let path = self._saveImagePath()
+        if FileManager.default.fileExists(atPath: path) {
+            try?FileManager.default.removeItem(atPath: path)
+        }
+    }
+    
     func mergeFiles(files: [KMFileAttribute], size: CGSize = .zero) {
         var size = 0.0
         for file in files {
@@ -282,6 +291,7 @@ extension KMMergeWindowController {
         //                self.savePanelAccessoryViewController = savePanelAccessoryViewController;
                         savePanel.beginSheetModal(for: self.window!) { result in
                             if result == .OK {
+                                self._clearImageData()
                                 self.cancelAction?()
                                 var outputSavePanel = savePanel.url?.path ?? ""
                                 DispatchQueue.main.async {
@@ -324,6 +334,7 @@ extension KMMergeWindowController {
     //                self.savePanelAccessoryViewController = savePanelAccessoryViewController;
                     savePanel.beginSheetModal(for: self.window!) { result in
                         if result == .OK {
+                            self._clearImageData()
                             self.cancelAction?()
                             var outputSavePanel = savePanel.url?.path
                             DispatchQueue.main.async {