【2025】【组件库】

1、选择组件库修改
2、PDF模式判断完善

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Select/ComponentSelect.swift

@@ -20,7 +20,6 @@ import AppKit
     
     @objc optional func componentSelectTextDidEndEditing(_ view: ComponentSelect, removeUnit text: String?)
     
-    
     @objc optional func componentSelectDidMouseDown(_ view: ComponentSelect, with event: NSEvent)
     
     @objc optional func componentSelectDidMouseUp(_ view: ComponentSelect, with event: NSEvent)
@@ -385,8 +384,6 @@ public class ComponentSelect: ComponentBaseXibView {
         
         properties.text = inputField.stringValue
         
-        selItemProperty = nil
-        
         delegate?.componentSelectTextDidChange?(self)
         
     }

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

@@ -592,9 +592,13 @@ struct KMNMWCFlags {
                     listView.toolMode = .CEditPDFToolMode
                     listView.configPDFEditingInfo()
                 }
-                listView.setShouAddEdit([])
-                listView.change([.text, .image])
                 
+                let editingPDFLoadType: CEditingLoadType = listView.editingPDFLoadType()
+                if editingPDFLoadType.contains(.text) == false && editingPDFLoadType.contains(.image) == false {
+                    listView.setShouAddEdit([])
+                    
+                    listView.change([.text, .image])
+                }
             } else if subToolMode == .Edit_text {
                 if listView.toolMode != .CEditPDFToolMode {
                     listView.toolMode = .CEditPDFToolMode
@@ -4450,9 +4454,9 @@ extension KMMainViewController: KMEditToolbarViewDelegate {
             alert.runModal()
             return
         }
-        let pageString = view.pageRangeSelectView.getSelectedPageString(listView.document, pageIndex)
+        var pageString = view.pageRangeSelectView.getSelectedPageString(listView.document, pageIndex)
         if isCurrentPage {
-            
+            pageString = String(format: "%ld", listView.currentPageIndex)
         }
         if view.editType == .watermark {
             if let model = watermarkViewController?.currentWatermarkData {

PDF Office/PDF Master/KMClass/Tools/CustomViews/KMPageRangeSelectView/KMPageRangeSelectView.swift

@@ -120,7 +120,8 @@ class KMPageRangeSelectView: NSView {
         return pageIndexString
     }
     
-    func getSelectedPageIndex(_ document: CPDFDocument) -> ([Int], Bool) {
+    //获取页码信息，
+    func getSelectedPageIndex(_ document: CPDFDocument) -> ([Int], isCurrentpage: Bool) {
         let pageRangeSelectIndex = pageSelectView.indexOfSelect()
         
         let fileAttribute = KMNFileAttribute()