【2025】【批量】文件列表UI调整

PDF Office/PDF Master/KMClass/ImageToPDF/Controller/KMBatchOperateImageToPDFViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -35,7 +35,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="566"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPB-Pb-64w">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aPB-Pb-64w">
                     <rect key="frame" x="14" y="497" width="42" height="17"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="dr8-xu-eZp">
                         <font key="font" metaFont="systemBold" size="14"/>
@@ -43,7 +43,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hyp-2H-elp">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hyp-2H-elp">
                     <rect key="frame" x="14" y="318" width="35" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="OCR" id="SLY-wg-469">
                         <font key="font" metaFont="systemBold" size="14"/>
@@ -183,7 +183,7 @@
                         <rect key="frame" x="1" y="1" width="478" height="38"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N3m-4e-rSU">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N3m-4e-rSU">
                                 <rect key="frame" x="221" y="11" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Sym-H3-uOC">
                                     <font key="font" usesAppearanceFont="YES"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3227,7 +3227,7 @@ extension KMMainViewController {
         
         self.compressWindowController?.batchAction = { [unowned self] view, filePaths in
             self.view.window?.endSheet((self.compressWindowController?.window)!)
-            self.showBatchWindow(type: .Compress, files: filePaths)
+            self.showBatchWindow(type: .compress, files: filePaths)
         }
         
         self.compressWindowController?.resultCallback = { [unowned self] result, openDocument, fileURL, error in
@@ -3392,10 +3392,18 @@ extension KMMainViewController {
 
 //Batch
 extension KMMainViewController {
-    func showBatchWindow(type: KMBatchOperationType, files: [URL]?) {
+    func showBatchWindow(type: KMBatchCollectionViewType, files: [URL]?) {
         let batchWindowController = KMBatchWindowController.init(windowNibName: "KMBatchWindowController")
         batchWindowController.window?.makeKeyAndOrderFront("")
         
+        var datas: [KMBatchProcessingTableViewModel] = []
+        for file in files! {
+            let data = KMBatchProcessingTableViewModel.initWithFilePath(url: file)
+            datas.append(data)
+        }
+        batchWindowController.batchData = datas
+        batchWindowController.type = type
+        
 //        let batchWindowController = KMBatchOperateWindowController.sharedWindowController
 //        
 //        var array: [KMBatchOperateFile] = []
@@ -3781,7 +3789,7 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
                 self.showCompressController(self.listView.document.documentURL)
                 
             } else if itemIdentifier == KMPDFToolbar_tools_batch_compress_Identifier {
-                self.showBatchWindow(type: .Compress, files: [self.listView.document.documentURL])
+                self.showBatchWindow(type: .compress, files: [self.listView.document.documentURL])
                 
             } else if itemIdentifier == KMPDFToolbar_tools_OCR_Identifier {
                 viewManager.showRightSide = !viewManager.showRightSide
@@ -3807,7 +3815,7 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
             } else if itemIdentifier == KMPDFToolbar_tools_compare_Overlay_Identifier {
                 self.beginCompareAction(2)
             } else if itemIdentifier == KMPDFToolbar_tools_batch_Identifier {
-                self.showBatchWindow(type: .NotDetermined, files: [])
+                self.showBatchWindow(type: .convertPDF, files: [])
             }
         } else if itemIdentifier == KMPDFToolbar_ViewDisplay_Identifier {
             //MARK: -Display

PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.swift

@@ -47,37 +47,13 @@ class KMBatchWindowController: NSWindowController {
     @IBOutlet weak var batchCollectionView: KMBatchCollectionView!
     @IBOutlet weak var batchHandleView: NSView!
     @IBOutlet weak var settingView: KMBatchSettingView!
+    @IBOutlet weak var processView: NSView!
     
     @IBOutlet weak var addFilesButton: ComponentDropdownTool!
     @IBOutlet weak var deleteButton: ComponentButton!
     
     
     var batchData: [KMBatchProcessingTableViewModel]?
-    var inputType: DataNavigationViewButtonActionType? {
-        didSet {
-            var type: KMBatchCollectionViewType = .convertPDF
-            switch inputType {
-            case .BatchRemove:
-                type = .batchRemove
-            case .Background:
-                type = .background
-            case .Watermark:
-                type = .watermark
-            case .Compression:
-                type = .compress
-            case .Security:
-                type = .security
-            case.HeaderAndFooter:
-                type = .headerAndFooter
-            case .BatesCode:
-                type = .batesNumber
-            default:
-                type = .convertPDF
-            }
-            self.type = type
-        }
-    }
-    
     var inputSubType: Any?
     
     var type: KMBatchCollectionViewType = .convertPDF {
@@ -127,6 +103,9 @@ class KMBatchWindowController: NSWindowController {
         // 修改窗口背景颜色
         self.window?.backgroundColor = ComponentLibrary.shared.backgroundColor(forToken: "colorBg/layout-middle")
         
+        self.processView.wantsLayer = true
+        self.processView.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
+        
         self.batchCollectionView.delegate = self
         self.batchPrecessingView.delegate = self
         
@@ -145,7 +124,7 @@ class KMBatchWindowController: NSWindowController {
     }
     
     func reloadData() {
-        self.batchPrecessingView.inputType = self.inputType
+        self.batchPrecessingView.inputType = self.type
         self.batchCollectionView.inputType = self.type
         self.settingView.type = self.type
         self.settingView.subType = self.inputSubType
@@ -156,7 +135,6 @@ class KMBatchWindowController: NSWindowController {
         if KMBatchWindowController.isSampleController() {
             KMPrint("存在相同文件")
             if let controller: KMBatchWindowController = self.fetchSampleController() {
-                controller.inputType = .Batch
                 controller.showWindow(window)
             }
         } else {
@@ -171,19 +149,18 @@ class KMBatchWindowController: NSWindowController {
                     let batchWindowController: KMBatchWindowController = KMBatchWindowController.init(windowNibName: "KMBatchWindowController")
                     batchWindowController.showWindow(window)
                     batchWindowController.batchPrecessingView.inputData = data
-                    batchWindowController.inputType = .Batch
                 }
             }
         }
     }
     
     //MARK: 打开文件
-    static func openFile(_ url: URL?, _ type: DataNavigationViewButtonActionType, _ subType: Any = "") {
+    static func openFile(_ url: URL?, _ type: KMBatchCollectionViewType, _ subType: Any = "") {
         if KMBatchWindowController.isSampleController() {
             if let controller: KMBatchWindowController = self.fetchSampleController() {
                 KMPrint("存在相同文件")
                 controller.inputSubType = subType
-                controller.inputType = type
+                controller.type = type
                 controller.showWindow(NSApp.mainWindow)
             }
         } else {
@@ -194,7 +171,7 @@ class KMBatchWindowController: NSWindowController {
             }
             
             batchWindowController.inputSubType = subType
-            batchWindowController.inputType = type
+            batchWindowController.type = type
         }
     }
     
@@ -232,26 +209,6 @@ extension KMBatchWindowController: KMBatchCollectionViewDelegate {
         KMPrint(data.type.rawValue)
         let dataType: KMBatchCollectionViewType = data.type
         self.settingView.type = dataType
-        
-        var type: DataNavigationViewButtonActionType = self.inputType ?? .ConvertPDF
-        switch dataType {
-        case .batchRemove:
-            type = .BatchRemove
-        case .background:
-            type = .Background
-        case .watermark:
-            type = .Watermark
-        case .compress:
-            type = .Compression
-        case .security:
-            type = .Security
-        case.headerAndFooter:
-            type = .HeaderAndFooter
-        case .batesNumber:
-            type = .BatesCode
-        default:
-            type = .ConvertPDF
-        }
-        self.batchPrecessingView.inputType = type
+        self.batchPrecessingView.inputType = dataType
     }
 }

PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.xib

@@ -13,6 +13,7 @@
                 <outlet property="batchHandleView" destination="gb1-Aa-tbK" id="F8k-Ha-0pb"/>
                 <outlet property="batchPrecessingView" destination="Quv-tZ-EYd" id="mU2-SE-yX7"/>
                 <outlet property="deleteButton" destination="Xbx-iI-2wR" id="iFR-BN-UQP"/>
+                <outlet property="processView" destination="gH5-eQ-PMm" id="Gv5-YC-WCR"/>
                 <outlet property="settingView" destination="DNN-jM-3Lh" id="cmU-9D-7sd"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
@@ -22,23 +23,24 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="1014" height="559"/>
+            <rect key="contentRect" x="912" y="400" width="1080" height="600"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <value key="minSize" type="size" width="1080" height="600"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="1014" height="559"/>
+                <rect key="frame" x="0.0" y="0.0" width="1080" height="600"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="NpS-mf-MjM" customClass="KMBatchCollectionView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="240" height="559"/>
+                        <rect key="frame" x="0.0" y="0.0" width="240" height="600"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="240" id="Ar4-ka-nDh"/>
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="gb1-Aa-tbK">
-                        <rect key="frame" x="750" y="0.0" width="264" height="559"/>
+                        <rect key="frame" x="816" y="0.0" width="264" height="600"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="DNN-jM-3Lh" customClass="KMBatchSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="264" height="559"/>
+                                <rect key="frame" x="0.0" y="0.0" width="264" height="600"/>
                             </customView>
                         </subviews>
                         <constraints>
@@ -50,16 +52,16 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="gH5-eQ-PMm">
-                        <rect key="frame" x="240" y="0.0" width="510" height="559"/>
+                        <rect key="frame" x="240" y="0.0" width="576" height="600"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Quv-tZ-EYd" customClass="KMBatchProcessingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="510" height="497"/>
+                                <rect key="frame" x="0.0" y="0.0" width="576" height="538"/>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mFD-ha-HSU">
-                                <rect key="frame" x="0.0" y="497" width="510" height="62"/>
+                                <rect key="frame" x="0.0" y="538" width="576" height="62"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="pG5-aO-KP9">
-                                        <rect key="frame" x="24" y="0.0" width="462" height="54"/>
+                                        <rect key="frame" x="24" y="0.0" width="528" height="54"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="xL9-Ss-nHe" customClass="ComponentDropdownTool" customModule="KMComponentLibrary">
                                                 <rect key="frame" x="0.0" y="11" width="129" height="32"/>
@@ -69,7 +71,7 @@
                                                 </constraints>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Xbx-iI-2wR" customClass="ComponentButton" customModule="KMComponentLibrary">
-                                                <rect key="frame" x="430" y="11" width="32" height="32"/>
+                                                <rect key="frame" x="496" y="11" width="32" height="32"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="32" id="dwZ-9S-dJM"/>
                                                     <constraint firstAttribute="width" constant="32" id="nvo-i3-fYx"/>

PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/KMBatchCollectionView.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchCollectionView: BaseXibView {
     @IBOutlet weak var collectionView: NSCollectionView!
@@ -42,6 +43,9 @@ class KMBatchCollectionView: BaseXibView {
     override func setup() {
         super.setup()
         
+        self.wantsLayer = true
+        self.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
+        
         self.contentView.wantsLayer = true
 //        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         

PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/Model/KMBatchCollectionViewModel.swift

@@ -18,6 +18,7 @@ enum KMBatchCollectionViewType: String {
     case headerAndFooter = "Header & Footer"
     case batesNumber = "Bates"
     case batchRemove = "Batch Remove"
+    case imageToPDF = "imageToPDF"
     
     static func typeOfRawVale(value: String) -> KMBatchCollectionViewType {
         var type: KMBatchCollectionViewType
@@ -31,6 +32,7 @@ enum KMBatchCollectionViewType: String {
         case "Header & Footer": type = .headerAndFooter
         case "Bates": type = .batesNumber
         case "Batch Remove": type = .batchRemove
+        case "imageToPDF": type = .imageToPDF
         default:
             type = .convertPDF
         }

PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/View/KMBatchCollectionViewItem.swift

@@ -40,17 +40,6 @@ class KMBatchCollectionViewItem: NSCollectionViewItem {
         } else {
             self.titleButton.properties.state = .normal
         }
-//        if self.model.isSelect {
-////            self.titleTextField.textColor = NSColor.km_init(hex: "#1770F4")
-//            
-//            self.titleButton.properties.iconImage = NSImage(named: self.model.selectImageString)
-////            self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1).cgColor
-//        } else {
-////            self.titleTextField.textColor = NSColor.km_init(hex: "#616469")
-//            
-//            self.titleButton.properties.iconImage = NSImage(named: self.model.imageString)
-////            self.contentView.layer?.backgroundColor = NSColor.clear.cgColor
-//        }
         
         self.titleButton.reloadData()
     }

PDF Office/PDF Master/KMClass/NewBatch/View/Choose/KMBatchSettingView.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchSettingView: BaseXibView {
     var currentView: KMBatchSettingItemView = KMBatchSettingItemView()
@@ -32,8 +33,8 @@ class KMBatchSettingView: BaseXibView {
     override func setup() {
         super.setup()
         
-        self.contentView.wantsLayer = true
-//        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
+        self.wantsLayer = true
+        self.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
         
         self.type = .convertPDF
     }

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

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchProcessingView: BaseXibView {
     @IBOutlet weak var tableView: KMBatchProcessingTableView!
@@ -15,11 +16,11 @@ class KMBatchProcessingView: BaseXibView {
     var addVC: KMDesignSelect!
     
     weak var delegate: KMBatchProcessingViewDelegate?
-    var inputType: DataNavigationViewButtonActionType? {
+    var inputType: KMBatchCollectionViewType? {
         didSet {
             self.selectedFilesView.inputType = inputType
             self.tableView.inputType = inputType
-            if inputType == .ImageToPDF {
+            if inputType == .imageToPDF {
                 addVC.removeAllItems()
                 addVC.addItems(withObjectValues: ["Add Files", "Add Folder"])
             }
@@ -44,7 +45,6 @@ class KMBatchProcessingView: BaseXibView {
     }
     
     override func setup() {
-        
         self.selectedFilesView.dragEnd = {[unowned self] (data) in
             self.inputData = data
         }
@@ -91,7 +91,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
         KMBatchProcessingView.openfiles(window: window!) { [unowned self] openPanel in
             if self.inputType == .OCR {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
-            } else if self.inputType == .ImageToPDF {
+            } else if self.inputType == .imageToPDF {
                 openPanel.allowedFileTypes = KMBatchProcessingTableViewModel.supportedImageTypes()
             } else {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
@@ -118,7 +118,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
         KMBatchProcessingView.openfiles(window: window!) { [unowned self] openPanel in
             if self.inputType == .OCR {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
-            } else if self.inputType == .ImageToPDF {
+            } else if self.inputType == .imageToPDF {
                 openPanel.allowedFileTypes = KMBatchProcessingTableViewModel.supportedImageTypes()
             } else {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
@@ -135,7 +135,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
                 var types: [String] = []
                 if self.inputType == .OCR {
                     types = KMOCRModel.supportedTypes()
-                } else if self.inputType == .ImageToPDF {
+                } else if self.inputType == .imageToPDF {
                     types = KMBatchProcessingTableViewModel.supportedImageTypes()
                 } else {
                     types = KMOCRModel.supportedTypes()

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.swift

@@ -15,7 +15,7 @@ class KMBatchSelectedFilesView: BaseXibView {
     @IBOutlet weak var subtitleLabel: NSTextField!
     @IBOutlet weak var box: KMBox!
     
-    var inputType: DataNavigationViewButtonActionType?
+    var inputType: KMBatchCollectionViewType?
     var data: [URL] = []
     var dragEnd: KMBatchSelectedFilesViewCompletion?
     var addAction: KMBatchSelectedFilesViewAddFilesAction?
@@ -124,11 +124,11 @@ extension KMBatchSelectedFilesView: KMBatchSelectedFilesViewDrag {
                 let url = NSURL(string: string)
                 
                 switch self.inputType {
-                case .OCR,.Batch:
+                case .OCR,.batchRemove:
                     if (url?.pathExtension?.lowercased() == "pdf") {
                         array.append(url! as URL)
                     }
-                case .ImageToPDF:
+                case .imageToPDF:
                     if (KMBatchProcessingTableViewModel.supportedImageTypes().contains((url?.pathExtension?.lowercased())!)) {
                         array.append(url! as URL)
                     }

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

@@ -19,7 +19,7 @@ class KMBatchProcessingTableView: NSView {
     weak var delegate: KMBatchProcessingTableViewDelegate?
 
     var selectModels: [KMBatchProcessingTableViewModel] = []
-    var inputType: DataNavigationViewButtonActionType? {
+    var inputType: KMBatchCollectionViewType? {
         didSet {
             self.reloadData()
         }
@@ -92,13 +92,24 @@ class KMBatchProcessingTableView: NSView {
             self.tableView.removeTableColumn(self.tableView.tableColumns[0])
         }
         
+        if (options!.contains(KMBatchProcessingTableViewOptions.number)) {
+            let column = NSTableColumn()
+            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
+            column.title = NSLocalizedString("  ", comment: "")
+            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.number.rawValue))
+//            column.resizingMask = .userResizingMask
+            column.width = 40
+            
+            self.tableView.addTableColumn(column)
+        }
+        
         if (options!.contains(KMBatchProcessingTableViewOptions.name)) {
             let column = NSTableColumn()
             column.headerCell = KMBatchProcessingColumnHeaderCell.init()
             column.title = NSLocalizedString("File Name", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.name.rawValue))
 //            column.resizingMask = .userResizingMask
-            column.width = self.canShowOrder() ? 218 : 600
+            column.width = self.canShowOrder() ? 180 : 600
             
             self.tableView.addTableColumn(column)
         }
@@ -109,7 +120,7 @@ class KMBatchProcessingTableView: NSView {
             column.title = NSLocalizedString("Page Range", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.order.rawValue))
             column.resizingMask = .userResizingMask
-            column.width = 156
+            column.width = 164
             self.tableView.addTableColumn(column)
         }
         
@@ -119,7 +130,7 @@ class KMBatchProcessingTableView: NSView {
             column.title = NSLocalizedString("Size", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.size.rawValue))
             column.resizingMask = .userResizingMask
-            column.width = 90
+            column.width = 88
             self.tableView.addTableColumn(column)
         }
         
@@ -130,27 +141,27 @@ class KMBatchProcessingTableView: NSView {
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.state.rawValue))
             column.headerCell.textColor = NSColor.red
             column.resizingMask = .userResizingMask
-            column.width = 90
+            column.width = 56
             self.tableView.addTableColumn(column)
         }
         
-        if (options!.contains(KMBatchProcessingTableViewOptions.delete)) {
-            let column = NSTableColumn()
-            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
-            column.title = NSLocalizedString("", comment: "")
-            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.delete.rawValue))
-            column.resizingMask = .userResizingMask
-            column.width = 30
-            self.tableView.addTableColumn(column)
-        }
+//        if (options!.contains(KMBatchProcessingTableViewOptions.delete)) {
+//            let column = NSTableColumn()
+//            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
+//            column.title = NSLocalizedString("", comment: "")
+//            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.delete.rawValue))
+//            column.resizingMask = .userResizingMask
+//            column.width = 30
+//            self.tableView.addTableColumn(column)
+//        }
         
         self.tableView.reloadData()
     }
     
     func canShowOrder() -> Bool {
-        if (self.inputType != .ImageToPDF &&
-            self.inputType != .Security &&
-            self.inputType != .Compression) {
+        if (self.inputType != .imageToPDF &&
+            self.inputType != .security &&
+            self.inputType != .compress) {
             return true
         } else {
             return false
@@ -166,7 +177,9 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
     
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         var cell: KMBatchProcessingTableCell?
-        if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.name.rawValue)) {
+        if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.number.rawValue)) {
+            cell = KMBatchProcessingNumTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))
+        } else if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.name.rawValue)) {
             cell = KMBatchProcessingNameTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))
         } else if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.order.rawValue)) {
             cell = KMBatchProcessingOrderTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))

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

@@ -19,13 +19,13 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBT-Yb-LH6">
-                    <rect key="frame" x="0.0" y="0.0" width="747" height="467"/>
+                    <rect key="frame" x="24" y="0.0" width="699" height="467"/>
                     <clipView key="contentView" drawsBackground="NO" id="Ukp-eK-M2w">
-                        <rect key="frame" x="0.0" y="0.0" width="747" height="467"/>
+                        <rect key="frame" x="0.0" y="0.0" width="699" height="467"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnSelection="YES" autosaveColumns="NO" rowHeight="24" headerView="5ix-cJ-akY" viewBased="YES" id="iF7-ag-gLW">
-                                <rect key="frame" x="0.0" y="0.0" width="747" height="439"/>
+                                <rect key="frame" x="0.0" y="0.0" width="699" height="439"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="gridColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -62,7 +62,7 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn identifier="AutomaticTableColumnIdentifier.1" width="619" minWidth="40" maxWidth="1000" id="5A0-s0-Kc3">
+                                    <tableColumn identifier="AutomaticTableColumnIdentifier.1" width="571" minWidth="40" maxWidth="1000" id="5A0-s0-Kc3">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -75,11 +75,11 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView id="wPA-2x-vh6">
-                                                <rect key="frame" x="122" y="0.0" width="625" height="52"/>
+                                                <rect key="frame" x="122" y="0.0" width="577" height="52"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zlk-wC-1F0">
-                                                        <rect key="frame" x="0.0" y="18" width="625" height="16"/>
+                                                        <rect key="frame" x="0.0" y="18" width="577" height="16"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Q2c-3b-6dl">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -108,15 +108,15 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" wantsLayer="YES" id="5ix-cJ-akY">
-                        <rect key="frame" x="0.0" y="0.0" width="747" height="28"/>
+                        <rect key="frame" x="0.0" y="0.0" width="699" height="28"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="LBT-Yb-LH6" secondAttribute="trailing" id="6WO-Js-I7C"/>
+                <constraint firstAttribute="trailing" secondItem="LBT-Yb-LH6" secondAttribute="trailing" constant="24" id="6WO-Js-I7C"/>
                 <constraint firstAttribute="bottom" secondItem="LBT-Yb-LH6" secondAttribute="bottom" id="AgW-17-Vjg"/>
-                <constraint firstItem="LBT-Yb-LH6" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="VOh-HO-hTl"/>
+                <constraint firstItem="LBT-Yb-LH6" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="24" id="VOh-HO-hTl"/>
                 <constraint firstItem="LBT-Yb-LH6" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="yUL-CH-XPw"/>
             </constraints>
             <point key="canvasLocation" x="272.5" y="251.5"/>

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

@@ -13,13 +13,14 @@ import Cocoa
 struct KMBatchProcessingTableViewOptions: OptionSet {
     let rawValue: Int
     
-    static let name = KMBatchProcessingTableViewOptions(rawValue: 1 << 0)
-    static let size = KMBatchProcessingTableViewOptions(rawValue: 1 << 1)
-    static let order = KMBatchProcessingTableViewOptions(rawValue: 1 << 2)
-    static let state = KMBatchProcessingTableViewOptions(rawValue: 1 << 3)
-    static let delete = KMBatchProcessingTableViewOptions(rawValue: 1 << 4)
+    static let number = KMBatchProcessingTableViewOptions(rawValue: 1 << 0)
+    static let name = KMBatchProcessingTableViewOptions(rawValue: 1 << 1)
+    static let size = KMBatchProcessingTableViewOptions(rawValue: 1 << 2)
+    static let order = KMBatchProcessingTableViewOptions(rawValue: 1 << 3)
+    static let state = KMBatchProcessingTableViewOptions(rawValue: 1 << 4)
+    static let delete = KMBatchProcessingTableViewOptions(rawValue: 1 << 5)
     
-    static let all: KMBatchProcessingTableViewOptions = [.name, .size, .order, .state, .delete]
+    static let all: KMBatchProcessingTableViewOptions = [.number,.name, .size, .order, .state, .delete]
 }
 
 enum KMBatchProcessingTableFileState: String, CaseIterable {

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

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
     
@@ -22,7 +23,7 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
     }
     
     func draw(frame: CGRect, highlight: Bool) {
-        NSColor.white.withAlphaComponent(1).setFill()
+        ComponentLibrary.shared.backgroundColor(forToken: "colorFill/4")?.withAlphaComponent(1).setFill()
         let path = NSBezierPath(roundedRect: frame, xRadius: 0, yRadius: 0)
         path.fill()
         
@@ -34,8 +35,8 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
         titleRect.origin.x += 24
         titleRect.origin.y += 8
         
-        let attributes = [NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#616469"),
-                          NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(12.0)]
+        let attributes = [NSAttributedString.Key.foregroundColor: ComponentLibrary.shared.getComponentColorFromKey("colorText/1"),
+                          NSAttributedString.Key.font: ComponentLibrary.shared.font(forToken: "mac/body-s-medium")]
         
         
         let attributedString = NSAttributedString(string: self.attributedStringValue.string, attributes: attributes)

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingDeleteTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingDeleteTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingDeleteTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="GUs-qS-kbl"/>
                 <outlet property="deleteButton" destination="V6R-Z5-vrK" id="cE2-I8-tJE"/>
@@ -20,14 +20,14 @@
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V6R-Z5-vrK">
                     <rect key="frame" x="0.0" y="11" width="20" height="20"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="20" id="do1-q7-e3j"/>
-                        <constraint firstAttribute="height" constant="20" id="uWh-N9-uV0"/>
-                    </constraints>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_btn_close-fill" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fYz-tt-WAC">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="20" id="do1-q7-e3j"/>
+                        <constraint firstAttribute="height" constant="20" id="uWh-N9-uV0"/>
+                    </constraints>
                     <connections>
                         <action selector="deleteAction:" target="-2" id="KJI-GM-pUT"/>
                     </connections>

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingNameTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingNameTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="H1z-Vy-z59"/>
                 <outlet property="iconImageView" destination="f0z-1i-ekg" id="br7-04-TKL"/>
@@ -27,7 +27,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="d8O-hm-Icc"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9BP-LK-TK6">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9BP-LK-TK6">
                     <rect key="frame" x="38" y="10" width="71" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="H0s-Nl-EiE"/>

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

@@ -0,0 +1,59 @@
+//
+//  KMBatchProcessingNumTableCell.swift
+//  PDF Reader Pro
+//
+//  Created by lizhe on 2025/1/6.
+//
+
+import Cocoa
+import KMComponentLibrary
+
+class KMBatchProcessingNumTableCell: KMBatchProcessingTableCell {
+    @IBOutlet var contentView: NSView!
+    
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        // Drawing code here.
+    }
+    
+    // MARK: 初始化
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        initContentView()
+        setup()
+    }
+    
+    required init?(coder decoder: NSCoder) {
+        super.init(coder: decoder)
+        initContentView()
+        setup()
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func initContentView() {
+        //绑定xib
+        let resource = NSNib(nibNamed: String(describing: self.classForCoder.self),
+                             bundle: Bundle(for: self.classForCoder.self))!
+        resource.instantiate(withOwner: self, topLevelObjects: nil)
+        addSubview(contentView)
+        contentView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            contentView.topAnchor.constraint(equalTo: topAnchor),
+            contentView.leftAnchor.constraint(equalTo: leftAnchor),
+            contentView.rightAnchor.constraint(equalTo: rightAnchor),
+            contentView.bottomAnchor.constraint(equalTo: bottomAnchor)])
+        contentView.updateConstraintsForSubtreeIfNeeded()
+    }
+    
+    override func setup() {
+        super.setup()
+
+        
+    }
+    
+    
+    override func reloadData() {
+
+    }
+}

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.xib

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingNumTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
+            <connections>
+                <outlet property="contentView" destination="c22-O7-iKe" id="6xH-n9-3Uv"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <point key="canvasLocation" x="139" y="154"/>
+        </customView>
+    </objects>
+</document>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingOrderTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingOrderTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="r5V-UN-Rjs"/>
                 <outlet property="orderButton" destination="unP-k5-IOp" id="RAU-Wd-5C8"/>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="160" height="40"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="unP-k5-IOp" customClass="KMTextfieldButton" customModule="PDF_Office" customModuleProvider="target">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="unP-k5-IOp" customClass="KMTextfieldButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="24" y="8" width="150" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="150" id="Gy1-6w-3Qo"/>

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingSizeTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingSizeTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingSizeTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="3sD-la-SLK"/>
                 <outlet property="sizeLabel" destination="TB8-4t-Uyp" id="P0e-uJ-KcR"/>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="204" height="40"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-4t-Uyp">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-4t-Uyp">
                     <rect key="frame" x="22" y="10" width="37" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="xEL-E8-K7R"/>

PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingStateTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingStateTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingStateTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="2hP-ym-f8D"/>
                 <outlet property="iconImageView" destination="SmF-pN-hLc" id="A3x-QC-u3T"/>

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

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 typealias KMBatchProcessingTableRowViewHoverCallback = (_ mouseEntered: Bool, _ mouseBox: KMBox) -> Void
 typealias KMBatchProcessingTableRowViewMouseDownCallback = (_ mouseEntered: Bool, _ mouseBox: KMBox) -> Void
@@ -28,18 +29,18 @@ class KMBatchProcessingTableRowView: NSTableRowView {
     
     func addBox() {
         var rect = self.bounds
-        rect.origin.x = self.bounds.origin.x + 16.0
+        rect.origin.x = self.bounds.origin.x
         rect.origin.y = self.bounds.origin.y + 2
         rect.size.height = self.bounds.size.height - 4
-        rect.size.width = self.bounds.size.width - 32.0
+        rect.size.width = self.bounds.size.width
         
         if self.box == nil {
             
             self.box?.wantsLayer = true
             self.box = KMBox(frame: rect)
-            self.box?.borderWidth = 1
+            self.box?.borderWidth = 0
             self.box?.borderColor = NSColor.km_init(hex: "#CED0D4")
-            self.box?.layer?.cornerRadius = 4
+            self.box?.layer?.cornerRadius = 0
             self.box?.boxType = .custom
             self.addSubview(self.box!, positioned: NSWindow.OrderingMode.below, relativeTo: self)
             self.box?.moveCallback = { [unowned self] (mouseEntered, mouseBox) in
@@ -89,13 +90,13 @@ class KMBatchProcessingTableRowView: NSTableRowView {
     
     func drawView(_ color: NSColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)) {
         if model.select {
-            self.box?.backgroundColor(NSColor.km_init(hex: "#CED0D4", alpha: 0.6))
-            self.box?.borderWidth = 1
-            self.box?.layer?.cornerRadius = 4
+            self.box?.backgroundColor(ComponentLibrary.shared.getComponentColorFromKey("colorFill/hight"))
+            self.box?.borderWidth = 0
+            self.box?.layer?.cornerRadius = 0
         } else if model.hover {
-            self.box?.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
-            self.box?.borderWidth = 1
-            self.box?.layer?.cornerRadius = 4
+            self.box?.backgroundColor(ComponentLibrary.shared.getComponentColorFromKey("colorPrimary/bg-active"))
+            self.box?.borderWidth = 0
+            self.box?.layer?.cornerRadius = 0
         } else {
             self.box?.backgroundColor(NSColor.clear)
             self.box?.borderWidth = 0

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -1571,6 +1571,12 @@
 		AD8B5A142D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
 		AD8B5A152D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
 		AD8B5A162D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
+		AD8B5A1C2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A1D2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A1E2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A202D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
+		AD8B5A212D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
+		AD8B5A222D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
 		AD8DD2A32A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
 		AD8DD2A42A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
 		AD8DD2A52A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
@@ -5291,6 +5297,8 @@
 		AD8B59D52D2B778D00150EA6 /* KMBatchSelectedFilesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMBatchSelectedFilesView.xib; sourceTree = "<group>"; };
 		AD8B59D62D2B778D00150EA6 /* KMBatchProcessingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMBatchProcessingView.swift; sourceTree = "<group>"; };
 		AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMBatchProcessingView.xib; sourceTree = "<group>"; };
+		AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchProcessingNumTableCell.swift; sourceTree = "<group>"; };
+		AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchProcessingNumTableCell.xib; sourceTree = "<group>"; };
 		AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMThumbnailManager.swift; sourceTree = "<group>"; };
 		AD8E48982D153D200055D3E6 /* KMOCRModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOCRModel.swift; sourceTree = "<group>"; };
 		AD8E489C2D1542510055D3E6 /* KMOCRAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOCRAreaView.swift; sourceTree = "<group>"; };
@@ -8698,19 +8706,21 @@
 		AD8B59C52D2B778D00150EA6 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				AD8B59C62D2B778D00150EA6 /* KMBatchProcessingStateTableCell.xib */,
-				AD8B59C72D2B778D00150EA6 /* KMBatchProcessingStateTableCell.swift */,
+				AD8B59D02D2B778D00150EA6 /* KMBatchProcessingColumnHeaderCell.swift */,
+				AD8B59D22D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift */,
+				AD8B59CE2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.xib */,
+				AD8B59D12D2B778D00150EA6 /* KMBatchProcessingNameTableCell.swift */,
+				AD8B59CC2D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib */,
+				AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */,
+				AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */,
+				AD8B59CB2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift */,
 				AD8B59C82D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib */,
-				AD8B59C92D2B778D00150EA6 /* KMBatchProcessingTableRowView.swift */,
+				AD8B59CF2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.swift */,
 				AD8B59CA2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.xib */,
-				AD8B59CB2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift */,
-				AD8B59CC2D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib */,
+				AD8B59C72D2B778D00150EA6 /* KMBatchProcessingStateTableCell.swift */,
+				AD8B59C62D2B778D00150EA6 /* KMBatchProcessingStateTableCell.xib */,
 				AD8B59CD2D2B778D00150EA6 /* KMBatchProcessingTableCell.swift */,
-				AD8B59CE2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.xib */,
-				AD8B59CF2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.swift */,
-				AD8B59D02D2B778D00150EA6 /* KMBatchProcessingColumnHeaderCell.swift */,
-				AD8B59D12D2B778D00150EA6 /* KMBatchProcessingNameTableCell.swift */,
-				AD8B59D22D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift */,
+				AD8B59C92D2B778D00150EA6 /* KMBatchProcessingTableRowView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -13098,6 +13108,7 @@
 				AD8B59EA2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib in Resources */,
 				BB5A9D4F2CB6521400F64C1F /* SettingsWindowController.xib in Resources */,
 				BB1B0AE02B4FC6E900889528 /* KMOpenFileGuidePanel.xib in Resources */,
+				AD8B5A202D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				ADBC373729CA975B00D93208 /* KMCompatative.xcassets in Resources */,
 				F35BC6CC2CA3AD710022CDE9 /* Shaders.bundle in Resources */,
 				ADAFDA102AE8DD6600F084BC /* KMAdvertisementCollectionHeadView.xib in Resources */,
@@ -13682,6 +13693,7 @@
 				BB03D6A12B024AC8008C9976 /* KMPDFEditInsertPageWindow.xib in Resources */,
 				BBA19F3729ADACC5001A285A /* signPicture_nor.pdf in Resources */,
 				BB8AA5402CC66E490084F183 /* PDFImages.xcassets in Resources */,
+				AD8B5A212D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				AD8B59F72D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib in Resources */,
 				AD3AAD312B0B700500DE5FE7 /* KMCompareCoveringView.xib in Resources */,
 				BBE788CA2CBD2463008086E2 /* ListVC.xib in Resources */,
@@ -14135,6 +14147,7 @@
 				AD8B59EC2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib in Resources */,
 				BB5A9D382CB6520100F64C1F /* KMHomeOpenView.xib in Resources */,
 				AD58F4072B14954B00299EE0 /* KMCompareTextHeaderView.xib in Resources */,
+				AD8B5A222D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				9F3BCDCA2CCB749400BDAB67 /* 快速教学.pdf in Resources */,
 				9FBA0F0329015A82001117AF /* KMFastToolCollectionViewItem.xib in Resources */,
 				BB6B49AB2D02A07B003ECD26 /* KMPDFSignatureDrawView.xib in Resources */,
@@ -15532,6 +15545,7 @@
 				AD055EB92B8843FD0035F824 /* SKToolbarItem.m in Sources */,
 				651A59832C8EA210005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				AD055E812B88294F0035F824 /* SKBookmarkController.m in Sources */,
+				AD8B5A1C2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				ADE86AD12B04BAEA00414DFA /* KMCompareFilesView.swift in Sources */,
 				F3D5D2AF2CCCD86400D4F1D5 /* KMNThumbnailBaseViewController+Action.swift in Sources */,
 				9F1F82EA2935D02E0092C4B4 /* KMComboBox.swift in Sources */,
@@ -16410,6 +16424,7 @@
 				ADE3C1AC29A4779E00793B13 /* KMPrintAccessoryController.swift in Sources */,
 				AD07BCB32D02CBB20075054B /* KMCompressSettingModel.swift in Sources */,
 				651559232CCA6E3100C0F0D9 /* KMConvertPPTsWindowController.swift in Sources */,
+				AD8B5A1D2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				BB10FAF72AFE2C2900F18D65 /* KMNumberArrayFormatter.swift in Sources */,
 				BB1413692C69E6CA00BB8E35 /* KMURLConfigManager.swift in Sources */,
 				653647CC2CDCA5DE00CDB13E /* KMBatchOperateBaseWindowController.swift in Sources */,
@@ -17559,6 +17574,7 @@
 				656C1E302CD0745200295F82 /* KMConvertPageRangeSettingItemView.swift in Sources */,
 				ADAAC1662BD645DB001F2DA6 /* KMRecommondPopWindow.m in Sources */,
 				AD8B5A0A2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift in Sources */,
+				AD8B5A1E2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				9F02017B2A1B5C0300C9B673 /* KMAIServerConfig.swift in Sources */,
 				AD8B59F52D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift in Sources */,
 				F39603E92CC641D2003C6F71 /* KMNThumbnailManager.swift in Sources */,

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15793,6 +15793,21 @@
                   endingLineNumber = "29"
                   offsetFromSymbolStart = "244">
                </Location>
+               <Location
+                  uuid = "64B27BD6-6BFD-402B-AB71-BDC116A54CE2 - ef8aabae22ad451"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #2 (PDF_Reader_Pro.KMRemovePasswordView) -&gt; () in PDF_Reader_Pro.KMRemovePasswordWindowController.windowDidLoad() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/RemovePassword/New/KMRemovePasswordWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "29"
+                  endingLineNumber = "29"
+                  offsetFromSymbolStart = "76">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -15931,6 +15946,21 @@
                   endingLineNumber = "25"
                   offsetFromSymbolStart = "636">
                </Location>
+               <Location
+                  uuid = "243CF690-2567-4007-A615-5BE15EAFDE07 - f12b42a881edb7e4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (PDF_Reader_Pro.KMRemovePasswordView, Swift.Array&lt;PDF_Reader_Pro.KMFileAttribute&gt;) -&gt; () in PDF_Reader_Pro.KMRemovePasswordWindowController.windowDidLoad() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/RemovePassword/New/KMRemovePasswordWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "25"
+                  endingLineNumber = "25"
+                  offsetFromSymbolStart = "68">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -18845,6 +18875,21 @@
                   endingLineNumber = "239"
                   offsetFromSymbolStart = "144">
                </Location>
+               <Location
+                  uuid = "19635542-575C-4FC6-A9C4-10B83FD80C0F - a56cf30ab1badafb"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.commandDispatch(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "238"
+                  endingLineNumber = "238"
+                  offsetFromSymbolStart = "568">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -19218,6 +19263,21 @@
                   endingLineNumber = "287"
                   offsetFromSymbolStart = "1176">
                </Location>
+               <Location
+                  uuid = "AD20D381-9DAC-4A3C-BB39-D32DBB1FE0A6 - 4ffc432a058ef3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "static PDF_Reader_Pro.KMTools.parseIndexs(indexs: Swift.Array&lt;Swift.Int&gt;) -&gt; Swift.String"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Common/Tools/KMTools.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "286"
+                  endingLineNumber = "286"
+                  offsetFromSymbolStart = "1228">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -20248,6 +20308,36 @@
                   endingLineNumber = "489"
                   offsetFromSymbolStart = "1232">
                </Location>
+               <Location
+                  uuid = "7FB91844-AFA7-4955-B7FF-B54975D74E23 - 5de2cda0c74246d3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBatchOperateConvertViewController.updateFormatView() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "489"
+                  endingLineNumber = "489"
+                  offsetFromSymbolStart = "924">
+               </Location>
+               <Location
+                  uuid = "7FB91844-AFA7-4955-B7FF-B54975D74E23 - 5de2cda0c74246d3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBatchOperateConvertViewController.updateFormatView() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "489"
+                  endingLineNumber = "489"
+                  offsetFromSymbolStart = "1456">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -31542,6 +31632,21 @@
                   endingLineNumber = "643"
                   offsetFromSymbolStart = "1236">
                </Location>
+               <Location
+                  uuid = "3C0E030B-51BD-41A4-8C06-E8B274CAB778 - 41726cd29ed675b1"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView addImageAnnotation:center:isRemoveBGColor:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListView.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "643"
+                  endingLineNumber = "643"
+                  offsetFromSymbolStart = "1044">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>