【综合】批量窗口文件列表，页面范围，自定义选项切换后不能输入信息(已修复)

PDF Office/PDF Master/Class/Batch/Data/KMBatchConvertParameter.swift

@@ -138,10 +138,10 @@ class KMBatchConvertParameter: KMBatchBaseParameter {
         //    #endif
         
         if isLimitConvert {
-            if fullpagesArray!.count  > 10 {
+            if let cnt = fullpagesArray?.count, cnt > 10 {
                 var newArr: [NSNumber] = []
-                for i in 0..<10 {
-                    var item = fullpagesArray![i]
+                for i in 0 ..< 10 {
+                    let item = fullpagesArray![i]
                     newArr.append(item)
                 }
                 return newArr

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

@@ -105,7 +105,7 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
             "  \(NSLocalizedString("Even Pages Only", comment: ""))",
             "  \(NSLocalizedString("e.g. 1,3-5,10", comment: ""))"
         ]
-        self.pageRangeCombobox!.addItems(withObjectValues: choiceArray)
+        self.pageRangeCombobox?.addItems(withObjectValues: choiceArray)
         let placeholderString = "  \(NSLocalizedString("e.g. 1,3-5,10", comment: ""))"
 //        self.pageRangeCombobox!.cell.placeholderString = placeholderString
         self.pageRangeCombobox?.selectItem(at: 0)
@@ -114,14 +114,13 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
         self.comboBoxContent = placeholderString
 
         self.updateViewColor()
-        weak var weakSelf = self
-        self.pageRangeCombobox?.mouseDownCallback = { mouseDown in
-            let itemIdex = weakSelf!.pageRangeCombobox!.indexOfSelectedItem
+        self.pageRangeCombobox?.mouseDownCallback = { [weak self] mouseDown in
+            let itemIdex = self?.pageRangeCombobox?.indexOfSelectedItem ?? 0
             if itemIdex == 3 {//KMBatchOperatePageChoice.Input
-                if weakSelf?.comboBoxContent == placeholderString {
-                    weakSelf?.pageRangeCombobox!.stringValue = ""
+                if self?.comboBoxContent == placeholderString {
+                    self?.pageRangeCombobox?.stringValue = ""
                 } else {
-                    weakSelf?.pageRangeCombobox!.stringValue = (weakSelf?.comboBoxContent)!
+                    self?.pageRangeCombobox?.stringValue = (self?.comboBoxContent) ?? ""
                 }
             }
         }
@@ -195,12 +194,11 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
             make?.width.equalTo()(20)
             make?.height.equalTo()(20)
         })
-        weak var weakSelf = self
-        self.removeButton!.mouseMoveCallback = { mouseEntered in 
+        self.removeButton!.mouseMoveCallback = { [weak self] mouseEntered in
             if mouseEntered {
-                weakSelf?.removeButton!.image = NSImage(named: KMImageNameUXIconBtnCloseHov)
+                self?.removeButton?.image = NSImage(named: KMImageNameUXIconBtnCloseHov)
             } else {
-                weakSelf?.removeButton!.image = NSImage(named: KMImageNameUXIconBtnCloseNor)
+                self?.removeButton?.image = NSImage(named: KMImageNameUXIconBtnCloseNor)
             }
         }
     }
@@ -326,7 +324,7 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
         }
     }
     func controlTextDidEndEditing(_ obj: Notification) {
-        if (self.pageRangeCombobox?.isEqual(obj.object)) != nil {
+        if let data = self.pageRangeCombobox?.isEqual(obj.object), data {
             self.file?.currentOperateInfo?.pageRangeString = self.pageRangeCombobox!.stringValue
             if self.file?.currentOperateInfo?.pagesArray == nil {
                 let alert = NSAlert()
@@ -348,9 +346,9 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
     
     func comboBoxSelectionDidChange(_ notification: Notification) {
         if notification.object as? NSComboBox == self.pageRangeCombobox {
-            self.pageRangeCombobox!.delegate = nil
+            self.pageRangeCombobox?.delegate = nil
             self.file?.currentOperateInfo!.pageChoice = self.tromsformPageChoice(index: self.pageRangeCombobox?.indexOfSelectedItem ?? 0)
-            if self.pageRangeCombobox?.indexOfSelectedItem == 0 {
+            if self.pageRangeCombobox?.indexOfSelectedItem == KMBatchOperatePageChoice.Input.rawValue {
                 self.pageRangeCombobox?.isEditable = true
                 self.pageRangeCombobox?.isSelectable = true
                 self.window?.makeFirstResponder(self.pageRangeCombobox)