Bladeren bron

【2025】【Convert】图片转PDF, 导入多张图片,点击表头进行排序,崩溃 修复

lizhe 1 maand geleden
bovenliggende
commit
b41d319be8

+ 9 - 7
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.swift

@@ -233,6 +233,7 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
             if (self.data!.count > row) {
                 let model = self.data![row]
                 model.type = self.inputType
+                model.row = row + 1
                 cell!.model = model
             }
         }
@@ -244,7 +245,8 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
         let tableRowView = KMBatchProcessingTableRowView()
         tableRowView.selectionHighlightStyle = .none
         tableRowView.model = self.data?[row]
-        tableRowView.hoverCallback = { [unowned self] (mouseEntered, mouseBox) in
+        tableRowView.hoverCallback = { [weak self] (mouseEntered, mouseBox) in
+            guard let self = self else { return }
             if data != nil {
                 for i in 0...self.data!.count - 1 {
                     let model = self.data![i]
@@ -474,12 +476,12 @@ extension KMBatchProcessingTableView: NSTableViewDataSource {
             if info.draggingSource as? NSTableView == tableView {
                 
                 //移除物件悬浮状态
-                if data != nil {
-                    let model = self.data![rowIndexes.firstIndex]
-                    model.hover = false
-                    let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
-                    self.tableView.reloadData(forRowIndexes: rowIndexes as IndexSet, columnIndexes: IndexSet(integer: columnIndex))
-                }
+//                if data != nil {
+//                    let model = self.data![rowIndexes.firstIndex]
+//                    model.hover = false
+//                    let columnIndex = self.tableView.column(withIdentifier: NSUserInterfaceItemIdentifier(KMBatchProcessingTableViewOptions.delete.rawValue.description))
+//                    self.tableView.reloadData(forRowIndexes: rowIndexes as IndexSet, columnIndexes: IndexSet(integer: columnIndex))
+//                }
                 
                 //数据处理
                 self.data!.move(with: IndexSet(rowIndexes), to: row)

+ 1 - 0
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableViewModel/KMBatchProcessingTableViewModel.swift

@@ -58,6 +58,7 @@ class KMBatchProcessingTableViewModel: NSObject {
     var isLock: Bool = false 
     var password: String = ""
     var permissionPassword: String = ""
+    var row: Int = 1
     
     var type: KMBatchCollectionViewType = .convertPDF
     

+ 1 - 1
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.swift

@@ -57,6 +57,6 @@ class KMBatchProcessingNumTableCell: KMBatchProcessingTableCell {
     
     
     override func reloadData() {
-
+        self.titleLabel.stringValue = self.model.row.description
     }
 }