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

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeView.swift

@@ -239,36 +239,15 @@ extension KMMergeView: NSTableViewDelegate {
            let pboard = info.draggingPasteboard
            insertRow = row
 
-//        NSPasteboard.PasteboardType.fileURL
-        if pboard.availableType(from: [NSPasteboard.PasteboardType.fileURL]) != nil {
-            let filePath = pboard.propertyList(forType: NSPasteboard.PasteboardType.fileURL) as? String
-            let url = URL(string: filePath!)
-            var array = [URL]()
-            array.append(url!)
-//               for path in fileNames {
-//                   if !isExistAtFilePath(filePath: path) {
-//                       continue
-//                   }
-////                       if let attrib = try? FileManager.default.attributesOfItem(atPath: path),
-////                          let fileSize = attrib[.size] as? CGFloat {
-////
-////                           allFileSize += fileSize
-////
-////                           if !IAPProductsManager.defaultManager.isAvailableAllFunction {
-////                               // 免费版只支持2个文件做合并，小于20M的文件合并
-////                               if files.count >= 2 || allFileSize > (20 * 1024 * 1024) {
-////                                   let vc = KMToolCompareWindowController.toolCompare(with: .pageEdit, setSelectIndex: 1)
-////                                   vc.showWindow(nil)
-////
-////                                   allFileSize -= fileSize
-////                                   addFiles(array)
-////                                   result = true
-////                                   return false
-////                               }
-////                           }
-//                   array.append(URL(string: path)!)
-////                       }
-//               }
+        if ((pboard.availableType(from: [NSPasteboard.PasteboardType.fileURL])) != nil) {
+            //获取url
+            var array: [URL] = []
+            for item: NSPasteboardItem in pboard.pasteboardItems! {
+                let string: String = item.string(forType: NSPasteboard.PasteboardType.fileURL)!
+                let url = NSURL(string: string)
+                array.append(url! as URL)
+            }
+
             var theFileUrls: [URL] = []
             for fileUrl in array {
                 if KMTools.isImageType(fileUrl.pathExtension) {

PDF Office/PDF Master/KMClass/NewBatch/Manager/KMBatchManager.swift

@@ -1051,20 +1051,27 @@ extension KMBatchManager {
             fileName = NSLocalizedString("Untitled", comment: "")
         }
         
-        let path = outputFolderPath + "/" + fileName + ".pdf"
-        
-        //        // 检查文件是否已存在，如果存在，则添加数字后缀
-        //        var finalPath = path
-        //        var count = 1
-        //        while FileManager.default.fileExists(atPath: finalPath) {
-        //            let newFileName = "\(fileName) \(count)"
-        //            finalPath = outputFolderPath + "/" + newFileName + ".pdf"
-        //            count += 1
-        //        }
-        
-        // 使用最终路径进行保存或其他操作
-        //        path = finalPath
+        var typeString = ""
+        switch type {
+        case .compress:
+            typeString = "_compress"
+        case .OCR:
+            typeString = "_OCR"
+        case .security:
+            typeString = "_security"
+        case .watermark:
+            typeString = "_watermark"
+        case .background:
+            typeString = "_background"
+        case .headerAndFooter:
+            typeString = "_headerAndFooter"
+        case .batesNumber:
+            typeString = "_bates"
+        default:
+            typeString = ""
+        }
         
+        var path = "\(outputFolderPath)/\(fileName)\(typeString).pdf"
         return path
     }