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

PDF Office/PDF Master/Class/PDFTools/Compress/View/KMCompressView.swift

@@ -14,6 +14,7 @@ typealias KMCompressViewCompressAction = (_ view: KMCompressView, _ model: KMCom
 
 class KMCompressView: BaseXibView {
 
+    @IBOutlet weak var compressTitleLabel: NSTextField!
     @IBOutlet weak var previewBox: KMBox!
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var sizeLabel: NSTextField!
@@ -22,6 +23,7 @@ class KMCompressView: BaseXibView {
     @IBOutlet weak var progressSizeLabel: NSTextField!
     @IBOutlet weak var progress: NSProgressIndicator!
     
+    @IBOutlet weak var modesLabel: NSTextField!
     @IBOutlet weak var compressContentView: KMCompressContentView!
     
     @IBOutlet weak var compressButton: ComponentButton!
@@ -87,7 +89,17 @@ class KMCompressView: BaseXibView {
     }
     
     override func updateUIThemeColor() {
-        titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-medium")
+        titleLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
+        titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
+        
+        sizeLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("comp-form/colorText-label")
+        sizeLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-regular")
+        
+        compressTitleLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/1")
+        compressTitleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-m-medium")
+        
+        modesLabel.textColor = ComponentLibrary.shared.getComponentColorFromKey("colorText/2")
+        modesLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
     }
     
     override func updateUILanguage() {

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.swift

@@ -196,7 +196,7 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
         } else if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.order.rawValue)) {
             cell = KMBatchProcessingOrderTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))
             if cell != nil {
-                (cell as? KMBatchProcessingOrderTableCell)!.cellAction = { [weak self] in
+                (cell as? KMBatchProcessingOrderTableCell)!.cellAction = { [weak self] pageRange in
                     self?.orderClickRow = row
                 }
             }
@@ -265,40 +265,40 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
             }
         }
         
-        tableRowView.mouseDownCallback = { [unowned self] (mouseEntered, mouseBox) in
-            if data != nil && !self.isDrag && self.orderClickRow != row {
-                for i in 0...self.data!.count - 1 {
-                    let model = self.data![i]
-                    if model.select == true {
-                        model.select = false
-                        let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
-                        self.tableView.reloadData(forRowIndexes: IndexSet(integer: i), columnIndexes: IndexSet(integer: columnIndex))
-                        if self.tableView.rowView(atRow: i, makeIfNecessary: false) is KMBatchProcessingTableRowView {
-                            let rowView: KMBatchProcessingTableRowView = self.tableView.rowView(atRow: i, makeIfNecessary: false) as! KMBatchProcessingTableRowView
-                            rowView.reloadData()
-                        }
-                    }
-                    
-                    if i == row {
-                        if mouseEntered {
-                            model.select = true
-                        } else {
-                            model.select = false
-                        }
-                        let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
-                        self.tableView.reloadData(forRowIndexes: IndexSet(integer: i), columnIndexes: IndexSet(integer: columnIndex))
-                        if self.tableView.rowView(atRow: i, makeIfNecessary: false) is KMBatchProcessingTableRowView {
-                            let rowView: KMBatchProcessingTableRowView = self.tableView.rowView(atRow: i, makeIfNecessary: false) as! KMBatchProcessingTableRowView
-                            rowView.reloadData()
-                        }
-                        self.didSelectItem(shouldSelectRow: i)
-                    }
-                }
-                
-            } else {
-                self.orderClickRow = -1
-            }
-        }
+//        tableRowView.mouseDownCallback = { [unowned self] (mouseEntered, mouseBox) in
+//            if self.canSelect(row: row) {
+//                for i in 0...self.data!.count - 1 {
+//                    let model = self.data![i]
+//                    if model.select == true {
+//                        model.select = false
+//                        let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
+//                        self.tableView.reloadData(forRowIndexes: IndexSet(integer: i), columnIndexes: IndexSet(integer: columnIndex))
+//                        if self.tableView.rowView(atRow: i, makeIfNecessary: false) is KMBatchProcessingTableRowView {
+//                            let rowView: KMBatchProcessingTableRowView = self.tableView.rowView(atRow: i, makeIfNecessary: false) as! KMBatchProcessingTableRowView
+//                            rowView.reloadData()
+//                        }
+//                    }
+//                    
+//                    if i == row {
+//                        if mouseEntered {
+//                            model.select = true
+//                        } else {
+//                            model.select = false
+//                        }
+//                        let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
+//                        self.tableView.reloadData(forRowIndexes: IndexSet(integer: i), columnIndexes: IndexSet(integer: columnIndex))
+//                        if self.tableView.rowView(atRow: i, makeIfNecessary: false) is KMBatchProcessingTableRowView {
+//                            let rowView: KMBatchProcessingTableRowView = self.tableView.rowView(atRow: i, makeIfNecessary: false) as! KMBatchProcessingTableRowView
+//                            rowView.reloadData()
+//                        }
+//                        self.didSelectItem(shouldSelectRow: i)
+//                    }
+//                }
+//                
+//            } else {
+//                self.orderClickRow = -1
+//            }
+//        }
         return tableRowView
     }
     
@@ -307,7 +307,7 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
     }
     
     func tableView(_ tableView: NSTableView, didClick tableColumn: NSTableColumn) {
-        KMPrint("选中")
+        
     }
     
     
@@ -327,8 +327,8 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
     }
     
     func tableView(_ tableView: NSTableView, shouldSelectRow row: Int) -> Bool {
-        
-        KMPrint("选中3")
+        KMPrint("选中")
+        self.didSelectItem(shouldSelectRow: row)
         return true
     }
     
@@ -532,3 +532,14 @@ extension KMBatchProcessingTableView {
         }
     }
 }
+
+extension KMBatchProcessingTableView{
+    func canSelect(row: Int) -> Bool {
+        guard let data = data else { return false }
+        if !self.isDrag && (self.orderClickRow != row && data[row].pageRange == .custom) {
+            return true
+        } else {
+            return false
+        }
+    }
+}

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Presenter/KMBatchProcessingTableViewPresenter.swift

@@ -57,15 +57,17 @@ extension KMBatchProcessingTableViewPresenter: KMBatchProcessingTableViewPresent
                     
                     if document != nil {
                         if document!.isLocked {
-                            KMPasswordInputWindow.openWindow(window: NSWindow.currentWindow(), url: URL(fileURLWithPath: model.filePath)) { [unowned self] result, password in
-                                if (result == .success) {
-                                    model.password = password ?? ""
-                                    model.isLock = false
-                                } else {
-                                    model.isLock = true
+                            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.3) {
+                                KMPasswordInputWindow.openWindow(window: NSWindow.currentWindow(), url: URL(fileURLWithPath: model.filePath)) { [unowned self] result, password in
+                                    if (result == .success) {
+                                        model.password = password ?? ""
+                                        model.isLock = false
+                                    } else {
+                                        model.isLock = true
+                                    }
+                                    self.modelData.append(model)
+                                    self.delegate?.showData(presenter: self, data: self.modelData)
                                 }
-                                self.modelData.append(model)
-                                self.delegate?.showData(presenter: self, data: self.modelData)
                             }
                         } else {
                             self.modelData.append(model)

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingOrderTableCell.swift

@@ -8,7 +8,7 @@
 import Cocoa
 import KMComponentLibrary
 
-typealias KMBatchProcessingOrderTableCellAction = () -> Void
+typealias KMBatchProcessingOrderTableCellAction = (_ pageRange: KMPageRange) -> Void
 class KMBatchProcessingOrderTableCell: KMBatchProcessingTableCell {
     @IBOutlet var contentView: NSView!
     @IBOutlet weak var pageRangeSelectView: KMPageRangeSelectView!
@@ -80,7 +80,12 @@ class KMBatchProcessingOrderTableCell: KMBatchProcessingTableCell {
     override func reloadData() {
         super.reloadData()
 //        self.orderButton.stringValue = NSLocalizedString(self.model.pageRange.type.rawValue, comment: "")
-        
+        if self.model.pageRange == .custom {
+            self.pageRangeSelectView.pageSelectView.properties.text = self.model.pageRangeString
+            self.pageRangeSelectView.pageSelectView.reloadData()
+        } else {
+            self.pageRangeSelectView.pageSelectView.selectItemAtIndex(self.model.pageRange.rawValue)
+        }
     }
     
     func updateRangeType() {
@@ -95,19 +100,23 @@ class KMBatchProcessingOrderTableCell: KMBatchProcessingTableCell {
             self.model.pageRange = .custom
             self.model.pageRangeString = self.pageRangeSelectView.pageSelectView.properties.text ?? ""
         default:
-            self.model.pageRange = .current
+            self.model.pageRange = .custom
+            self.model.pageRangeString = self.pageRangeSelectView.pageSelectView.properties.text ?? ""
             break
         }
+        
+        print(self.pageRangeSelectView.pageSelectView.properties.text)
+        print(self.model.pageRangeString)
     }
 }
 
 extension KMBatchProcessingOrderTableCell: KMPageRangeSelectViewDelegate {
     func kmPageRangeSelectViewDidMouseDown(_ RangeSelectView: KMPageRangeSelectView, _ view: ComponentSelect?) {
-        cellAction?()
+        cellAction?(self.model.pageRange)
     }
     
     func kmPageRangeSelectViewDidMouseup(_ RangeSelectView: KMPageRangeSelectView, _ view: ComponentSelect?) {
-        cellAction?()
+        cellAction?(self.model.pageRange)
     }
     
     func kmPageRangeSelectViewDidClickedItem(_ RangeSelectView: KMPageRangeSelectView, _ item: ComponentMenuitemProperty?) {
@@ -115,4 +124,16 @@ extension KMBatchProcessingOrderTableCell: KMPageRangeSelectViewDelegate {
             self.updateRangeType()
         }
     }
+    
+    func kmPageRangeSelectViewDidSelectTextEndEditing(_ RangeSelectView: KMPageRangeSelectView, _ view: ComponentSelect?) {
+        if RangeSelectView == self.pageRangeSelectView {
+            self.updateRangeType()
+        }
+    }
+    
+    func kmPageRangeSelectViewDidSelectTextChange(_ RangeSelectView: KMPageRangeSelectView, _ view: ComponentSelect?) {
+        if RangeSelectView == self.pageRangeSelectView {
+            self.updateRangeType()
+        }
+    }
 }