【2025】【综合】自测细节处理

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Dropdown/ComponentDropdownTool/ComponentDropdownTool.swift

@@ -130,6 +130,11 @@ public class ComponentDropdownTool: ComponentBaseXibView {
             fillColor = properties.propertyInfo.color_active
             textColor = properties.propertyInfo.textColor_Active
         }
+        if let image = properties.arrowIcon {
+            dropImage.image = image
+        } else {
+            dropImage.image = ComponentLibrary.shared.image(forResource: "suffix")
+        }
         if properties.isDisabled == true {
             fillColor = properties.propertyInfo.color_dis
             textColor = properties.propertyInfo.textColor_dis

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Background/Views/KMBackgroundPropertyController.swift

@@ -548,6 +548,11 @@ extension KMBackgroundPropertyController: ComponentCColorDelegate {
         
         delegate?.backgroundPropertyControllerDidUpdate?(self)
     }
+    
+    func componentCColorGroupColorsUpdates(_ view: NSView, _ colors: [NSColor]) {
+        KMAnnotationPropertiesColorManager.manager.updateDefaultColors(colors, forKey: KM_Background_default_ColorsKey)
+    }
+    
 }
 
 //MARK: - ComponentSelectDelegate

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Watermark/Views/KMNWatermarkPropertyController.swift

@@ -729,6 +729,11 @@ extension KMNWatermarkPropertyController: ComponentCColorDelegate {
         
         delegate?.watermarkPropertyControllerDidUpdate?(self)
     }
+    
+    func componentCColorGroupColorsUpdates(_ view: NSView, _ colors: [NSColor]) {
+        KMAnnotationPropertiesColorManager.manager.updateDefaultColors(colors, forKey: KM_Watermark_default_ColorsKey)
+    }
+    
 }
 
 //MARK: - ComponentSelectDelegate

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

@@ -5293,6 +5293,8 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                 pdfToolbarController?.cancelSelectedSecondToolbarItems(viewManager.toolMode)
                 pdfToolbarController?.refreshSecondToolbarItemsState()
             }
+            
+            cancelMeasureType()
         } else if annotationType == .measureLine ||
                     annotationType == .measurePolyLine ||
                     annotationType == .measurePolyGon ||
@@ -5904,7 +5906,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
         }
     }
     
-    func pdfListViewSplitModeShowBar()->Bool {
+    func pdfListViewSplitModeShowBar() -> Bool {
         return viewManager.splitShowBottomBar
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift

@@ -1159,6 +1159,8 @@ extension KMPDFToolbarController: KMPDFSecToolbarControllerDelegate {
                 value.identifier == KMPDFToolbar_edit_Bates_Identifier {
                 if viewManager?.subToolMode != .None {
                     viewManager?.subToolMode = .None
+                    
+                    controller.refreshToolbarModeInfo()
                 }
                 delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, value.identifier)
             }

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/Model/KMPDFToolbarManager.swift

@@ -117,25 +117,25 @@ class KMPDFToolbarManager: NSObject {
     
     let edit_crop_Property = ComponentButtonProperty(type: .text_gray_opacity, size: .xs, showLeftIcon: true, buttonText: KMLocalizedString("Crop"), icon: NSImage(named: "edit_crop"), identifier: KMPDFToolbar_edit_crop_Identifier)
     
-    let edit_watermark_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Watermark"), leftIcon: NSImage(named: "edit_watermark"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
+    let edit_watermark_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Watermark"), leftIcon: NSImage(named: "edit_watermark"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: KMPDFToolbar_edit_Watermark_Identifier)
     var edit_watermark_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Watermark"), identifier: KMPDFToolbar_edit_addWatermark_Identifier)
     var edit_watermark_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Watermark"), identifier: KMPDFToolbar_edit_removeWatermark_Identifier)
     var edit_watermark_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Watermarks"), identifier: KMPDFToolbar_edit_batch_AddWatermark_Identifier)
     var edit_watermark_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Watermarks"), identifier: KMPDFToolbar_edit_batchRemoveWatermark_Identifier)
     
-    let edit_background_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Background"), leftIcon: NSImage(named: "edit_background"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
+    let edit_background_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Background"), leftIcon: NSImage(named: "edit_background"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: KMPDFToolbar_edit_BG_Identifier)
     var edit_bg_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Background"), identifier: KMPDFToolbar_edit_addBG_Identifier)
     var edit_bg_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Background"), identifier: KMPDFToolbar_edit_removeBG_Identifier)
     var edit_bg_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Background"), identifier: KMPDFToolbar_edit_batch_AddBG_Identifier)
     var edit_bg_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Background"), identifier: KMPDFToolbar_edit_batchRemoveBG_Identifier)
     
-    let edit_headerfooter_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Header & Footer"), leftIcon: NSImage(named: "edit_headerfooter"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
+    let edit_headerfooter_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Header & Footer"), leftIcon: NSImage(named: "edit_headerfooter"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: KMPDFToolbar_edit_HF_Identifier)
     var edit_hf_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Header & Footer"), identifier: KMPDFToolbar_edit_addHF_Identifier)
     var edit_hf_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Header & Footer"), identifier: KMPDFToolbar_edit_removeHF_Identifier)
     var edit_hf_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Header & Footer"), identifier: KMPDFToolbar_edit_batch_AddHF_Identifier)
     var edit_hf_batchRemove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Remove Header & Footer"), identifier: KMPDFToolbar_edit_batchRemoveHF_Identifier)
     
-    let edit_bates_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Bates Numbers"), leftIcon: NSImage(named: "edit_bates"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: "")
+    let edit_bates_Property = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Bates Numbers"), leftIcon: NSImage(named: "edit_bates"), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"), identifier: KMPDFToolbar_edit_Bates_Identifier)
     var edit_bates_add_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Add Bates Numbers"), identifier: KMPDFToolbar_edit_addBates_Identifier)
     var edit_bates_remove_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Remove Bates Numbers"), identifier: KMPDFToolbar_edit_removeBates_Identifier)
     var edit_bates_batchAdd_Property: ComponentMenuitemProperty = ComponentMenuitemProperty(text: KMLocalizedString("Batch Add Bates Numbers"), identifier: KMPDFToolbar_edit_batch_AddBates_Identifier)