【页面编辑】暂未支持从一个文件拖拽页面至另一个文件插入页面，并支持BOTA缩略图和页面编辑之间进行操作(已修复)

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -84,54 +84,6 @@
             landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F7E32914-DF57-4F07-9241-17A645596AA2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFTools/Print/KMPrintWindowController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "143"
-            endingLineNumber = "143"
-            landmarkName = "showPrintWindowControll(inputData:inputDocument:inputType:inputPageRange:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "F7E32914-DF57-4F07-9241-17A645596AA2 - acc6aaba610152d5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "static PDF_Master.KMPrintWindowController.showPrintWindowControll(inputData: Swift.Optional&lt;Foundation.URL&gt;, inputDocument: Swift.Optional&lt;Swift.AnyObject&gt;, inputType: PDF_Master.DataNavigationViewButtonActionType, inputPageRange: PDF_Master.KMPrintPageRange) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFTools/Print/KMPrintWindowController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "143"
-                  endingLineNumber = "143"
-                  offsetFromSymbolStart = "674">
-               </Location>
-               <Location
-                  uuid = "F7E32914-DF57-4F07-9241-17A645596AA2 - 4426868787c78648"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (PDF_Master.KMPasswordInputWindowResult, Swift.Optional&lt;Swift.String&gt;) -&gt; () in static PDF_Master.KMPrintWindowController.showPrintWindowControll(inputData: Swift.Optional&lt;Foundation.URL&gt;, inputDocument: Swift.Optional&lt;Swift.AnyObject&gt;, inputType: PDF_Master.DataNavigationViewButtonActionType, inputPageRange: PDF_Master.KMPrintPageRange) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFTools/Print/KMPrintWindowController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "143"
-                  endingLineNumber = "143"
-                  offsetFromSymbolStart = "129">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

PDF Office/PDF Master/Class/Common/Control/KMThumbnailView.swift

@@ -52,31 +52,31 @@ import Cocoa
     
     open var minimumLineSpacing: CGFloat = 0.0 {
         didSet {
-            self.collectionView.reloadData()
+            self.reloadData()
         }
     }
 
     open var minimumInteritemSpacing: CGFloat = 0.0 {
         didSet {
-            self.collectionView.reloadData()
+            self.reloadData()
         }
     }
 
     open var itemSize: NSSize = NSMakeSize(60, 80) {
         didSet {
-            self.collectionView.reloadData()
+            self.reloadData()
         }
     }
 
     open var sectionInset: NSEdgeInsets = NSEdgeInsetsZero {
         didSet {
-            self.collectionView.reloadData()
+            self.reloadData()
         }
     }
     
     open var numberOfSections: Int = 0 {
         didSet {
-            self.collectionView.reloadData()
+            self.reloadData()
         }
     }
     

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -910,7 +910,7 @@ extension KMPDFEditViewController: KMThumbnailViewDelegate {
                 return
             }
             
-            var _fileUrl = self.fetchProgressBlockParamsForFileUrl(params: params)
+            let _fileUrl = self.fetchProgressBlockParamsForFileUrl(params: params)
             if let exn = _fileUrl?.pathExtension, KMTools.isPDFType(exn) {
                 if (_fileUrl!.path.isPDFValid() == false) {
                     let alert = NSAlert()

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMPDFThumbnailView.swift

@@ -131,7 +131,7 @@ extension KMPDFThumbnailView {
             indexs.insert(indexpath.item)
         }
         // 清空临时数据
-        if let _path = self.dragFilePath, FileManager.default.fileExists(atPath: _path) {
+        if let _path = self.dragTempFilePath, FileManager.default.fileExists(atPath: _path) {
             try?FileManager.default.removeItem(atPath: _path)
         }
             
@@ -143,7 +143,7 @@ extension KMPDFThumbnailView {
             if let data = self.dragTempFloderPath, !FileManager.default.fileExists(atPath: data) {
                 try?FileManager.default.createDirectory(atPath: data, withIntermediateDirectories: false)
             }
-            if let data = self.dragTempFilePath, FileManager.default.fileExists(atPath: data) {
+            if let data = self.dragTempFilePath, !FileManager.default.fileExists(atPath: data) {
                 FileManager.default.createFile(atPath: data, contents: nil)
             }
             
@@ -198,7 +198,15 @@ extension KMPDFThumbnailView {
 
             return super.collectionView(collectionView, acceptDrop: draggingInfo, indexPath: indexPath, dropOperation: dropOperation)
         } else if (pboard.availableType(from: [.localDraggedTypes]) != nil) {
-            return super.collectionView(collectionView, acceptDrop: draggingInfo, indexPath: indexPath, dropOperation: dropOperation)
+            if let data = draggingInfo.draggingSource as? NSCollectionView, data.isEqual(to: collectionView) {
+//                Swift.debugPrint("当前文件拖拽")
+                return super.collectionView(collectionView, acceptDrop: draggingInfo, indexPath: indexPath, dropOperation: dropOperation)
+            } else {
+//                Swift.debugPrint("不同文件拖拽")
+                if let _urlString = self.dragTempFilePath {
+                    self.delegate?.thumbnailView?(thumbanView: self, didDragAddFiles: [URL(fileURLWithPath: _urlString)], indexpath: indexPath)
+                }
+            }
         } else if ((pboard.availableType(from: [.fileURL])) != nil) {
             //获取url
             var array: [URL] = []