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

PDF Office/PDF Master/Class/Batch/View/KMBatchTableCellView.swift

@@ -294,6 +294,11 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
                 self.indicateImageView?.isHidden = true
                 self.progressIndicator?.isHidden = false
                 self.progressIndicator?.startAnimation(nil)
+            } else {
+                self.indicateImageView?.isHidden = false
+                self.progressIndicator?.isHidden = true
+                
+                self.indicateImageView?.image = NSImage(named: KMImageNameUXIconProgressWaiting)
             }
         } else if self.type == .DPI {
             switch self.file?.dpi {

PDF Office/PDF Master/Class/Home/View/HomeContentView/History/KMHomeHistoryListView.swift

@@ -38,9 +38,9 @@ class KMHomeHistoryListView: KMBaseXibView {
     
     
     override func draw(_ dirtyRect: NSRect) {
-        if dirtyRect.size.width != self.bounds.size.width {
+//        if dirtyRect.size.width != self.bounds.size.width {
             collectionView.reloadSections(IndexSet(integer: 0))
-        }
+//        }
         super.draw(dirtyRect)
     }
     

PDF Office/PDF Master/Class/Home/View/HomeContentView/KMHomeContentView.swift

@@ -16,6 +16,9 @@ typealias KMHomeContentViewQucikToolsDidSelect = (_ view: KMHomeContentView, _ i
 typealias KMHomeContentViewQucikToolsAddAction = (_ view: KMHomeContentView, _ item: KMQucikToolsModel) -> Void
 typealias KMHomeContentViewQucikToolsRemoveAction = (_ view: KMHomeContentView, _ item: KMQucikToolsModel) -> Void
 
+
+let kRecentlyListModel = "kRecentlyListModel"
+
 enum KMHomeQucikToolsShowType {
     case expand
     case collapse
@@ -117,6 +120,10 @@ class KMHomeContentView: KMBaseXibView {
             }
         }
         
+        
+        let type = UserDefaults.standard.object(forKey: kRecentlyListModel) ?? 0
+        historyListView.showType = KMHomeHistoryListViewShowType.init(rawValue: type as! Int) ?? .horizontal
+        
         self.updatePageLabel()
         self.updateRecentlyListState()
     }
@@ -134,6 +141,8 @@ class KMHomeContentView: KMBaseXibView {
             verticalButton.image = NSImage(named: "KMImageNameUXIconHomeViewthumbnailPre")
             horizontalButton.image = NSImage(named: "KMImageNameUXIconHomeViewlistNor")
         }
+        
+        UserDefaults.standard.setValue(showType.rawValue, forKey: kRecentlyListModel)
     }
     
     override func updateUI() {

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

@@ -22,7 +22,11 @@ class KMMergeTableViewCell: NSTableCellView {
     
     var removeAction: KMMergeTableViewCellRemoveAction?
     
-    var index: Int = 1
+    var index: Int = 1 {
+        didSet {
+            self.reloadData()
+        }
+    }
     var fileModel: KMFileAttribute? {
         didSet {
             self.reloadData()

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

@@ -157,6 +157,7 @@ extension KMMergeView: NSTableViewDataSource {
         if row < files.count {
             myCellView.fileModel = files[row]
         }
+        myCellView.index = row + 1
         // 配置单元格的显示内容
         myCellView.removeAction = { [unowned self] view, model in
             self.files.removeObject(model)