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

PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/KMQucikToolsView.swift

@@ -176,9 +176,6 @@ extension KMQucikToolsView: NSCollectionViewDelegateFlowLayout {
 //Collection Page
 extension KMQucikToolsView {
     func pageCount() -> Int {
-        print(self.collectionView.frame.size)
-        print(self.collectionView.visibleRect.size)
-        
         var width =  260.0
         var count = ceilf(Float(self.data.count) * 0.5)
         if type == .collapse {

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

@@ -215,7 +215,7 @@ extension KMMergeWindowController {
         }
         
         
-        let fileName = (files.first?.filePath.lastPathComponent)! + "_Merged"
+        let fileName = (files.first?.filePath.deletingPathExtension.lastPathComponent ?? "") + "_Merged"
         DispatchQueue.main.async {
             self.oldPDFDocument.outlineRoot = PDFOutline.init()
             if allPage {

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

@@ -76,6 +76,19 @@ extension KMMergeBlankView {
                         break
                     }
                 }
+            } else if let fileName = pboard.propertyList(forType: .fileURL) as? String {
+                if let urlString = pboard.propertyList(forType: .fileURL) as? String,
+                   let url = URL(string: urlString),
+                   let resolvedUrl = try? url.resolvingSymlinksInPath() {
+                       print(resolvedUrl.path) // 这是文件的具体地址
+                    if resolvedUrl.path.lowercased().hasSuffix("pdf") {
+                        isCanDrag = true
+                    } else {
+                        isCanDrag = false
+                    }
+                } else {
+                    print("无法解析文件地址")
+                }
             }
         }
         

PDF Office/PDF Master/Class/PDFWindowController/Form/AlertView/KMFormAlertView.swift

@@ -97,9 +97,10 @@ class KMFormAlertView: KMBaseXibView {
             if isContainsForm {
                 self.type = .highlightForm
                 DispatchQueue.main.async {
-                    let top = 40
-//                    self.pdfView?.document.permissionsStatus != .owner ? 80.5 : 40
+//                    var top = 40
+                    let top = self.pdfView?.document.permissionsStatus != .owner ? 80.5 : 40
                     self.frame = NSMakeRect(0, pdfView.frame.size.height - CGFloat(top), pdfView.frame.size.width, 40)
+                    self.autoresizingMask = [.width, .minYMargin]
                     pdfView.addSubview(self)
                     self.textLabel.stringValue = NSLocalizedString("This document contains interactive form fields.", comment: "")
                     let highlightFormFiled = UserDefaults.standard.bool(forKey: "kPDFViewHighlightFormFiledKey")

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -206,6 +206,7 @@ class KMToolbarController: NSViewController {
             } else {
                 _toolbarType = newValue
             }
+            mainToolBarView?.toolbar?.isHidden = false
             secondaryToolBarBox.isHidden = true
             secondaryToolBarHeight.constant = 51
             let mainToolbarH = self.mainToolBarisVisable ? Self.mainToolBarHeight : 0
@@ -220,6 +221,7 @@ class KMToolbarController: NSViewController {
                     mainToolBarHeight.constant = 0
                     bottomOffset.constant = 0
                     childToolBarBox.isHidden = true
+                    mainToolBarView?.toolbar?.isHidden = true
                     self.delegate?.toolbarController?(self, heightOffsetChange: 0, animated: false)
                 }
             } else {