【2025】【Edit】背景模块逻辑交互优化

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Card/ComponentCardWatermark/ComponentCardWMProperty.swift

@@ -15,6 +15,7 @@ public class ComponentCardWMProperty: NSObject {
     public var text: String? //
     public var editIcon: NSImage?
     public var deleteIcon: NSImage?
+    public var hideCheckBox: Bool = true
     
     public var propertyInfo = CardWatermarkPropertyInfo()
     
@@ -22,13 +23,15 @@ public class ComponentCardWMProperty: NSObject {
                 icon: NSImage? = nil,
                 text: String? = nil,
                 editIcon: NSImage? = nil,
-                deleteIcon: NSImage? = nil) {
+                deleteIcon: NSImage? = nil,
+                hideCheckBox: Bool = true) {
         
         self.state = state
         self.icon = icon
         self.text = text
         self.editIcon = editIcon
         self.deleteIcon = deleteIcon
+        self.hideCheckBox = hideCheckBox
         
     }
     

PDF Office/KMComponentLibrary/KMComponentLibrary/View/Card/ComponentCardWatermark/ComponentCardWatermark.swift

@@ -86,6 +86,11 @@ public class ComponentCardWatermark: ComponentBaseXibView {
         deleteButton.properties = deleteButtonProperty
         deleteButton.setTarget(self, action: #selector(buttonClicked(_:)))
         
+        iconImage.wantsLayer = true
+        iconImage.layer?.borderWidth = 1
+        iconImage.layer?.cornerRadius = ComponentLibrary.shared.getComponentValueFromKey("comp-field/radius") as? CGFloat ?? 4
+        iconImage.layer?.borderColor = ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider").cgColor
+
     }
     
     //MARK: - Setter and Getter
@@ -174,7 +179,10 @@ public class ComponentCardWatermark: ComponentBaseXibView {
         } else if properties.state == .pressed {
             checkBoxView.properties.checkboxType = .selected
             checkBoxView.reloadData()
-            checkBoxView.isHidden = false
+            
+            if properties.hideCheckBox == false {
+                checkBoxView.isHidden = false
+            }
             
             editButton.isHidden = false
             deleteButton.isHidden = false

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Background/KMBackgroundController.swift

@@ -180,7 +180,10 @@ extension KMBackgroundController: KMBackgroundPropertyControllerDelegate {
         delegate?.kmBackgroundControllerDidUpdateMode?(self)
         
         templatesController.selectedBackground = data
+        
         reloadData()
+       
+        KMBackgroundManager.defaultManager.defaultModel = KMBackgroundModel()
     }
     
     func backgroundPropertyControllerCancelTemplateEdit(_ controller: KMBackgroundPropertyController) {
@@ -221,7 +224,10 @@ extension KMBackgroundController: KMBGTemplateControllerDelegate {
         delegate?.kmBackgroundControllerDidUpdateMode?(self)
         
         propertyController.backgroundData = KMBackgroundManager.defaultManager.defaultModel
-         
+        
+        templatesController.selectedBackground = nil
+        templatesController.reloadData()
+        
         reloadData()
         
     }
@@ -233,7 +239,9 @@ extension KMBackgroundController: KMBGTemplateControllerDelegate {
         
         propertyController.originalDataDict = KMBackgroundManager.defaultManager.parseModelToDict(model: data)
         propertyController.backgroundData = data
-        propertyController.reloadData()
+        
+        templatesController.selectedBackground = nil
+        templatesController.reloadData()
         
         reloadData()
     }

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

@@ -99,6 +99,8 @@ class KMBGTemplateController: NSViewController {
                 
                 collectionView.selectItems(at: set, scrollPosition: .top)
             }
+        } else {
+            collectionView.deselectAll(nil)
         }
     }
      

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

@@ -22,6 +22,7 @@ import KMComponentLibrary
     //取消修改模板信息
     @objc optional func backgroundPropertyControllerCancelTemplateEdit(_ controller: KMBackgroundPropertyController)
     
+    //修改完成模板信息
     @objc optional func backgroundPropertyControllerFinishTemplateEdit(_ controller: KMBackgroundPropertyController)
     
 }

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMEditToolbarView.swift

@@ -234,6 +234,12 @@ class KMEditToolbarView: BaseXibView {
         
     }
     
+    //MARK: - Mouse
+    override func mouseDown(with event: NSEvent) {
+        super.mouseDown(with: event)
+        
+        self.window?.makeFirstResponder(nil)
+    }
 }
 
 extension KMEditToolbarView: ComponentSelectDelegate {

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

@@ -2903,84 +2903,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "18021D19-EAF7-4279-A121-953E8941B3AE"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2655"
-            endingLineNumber = "2655"
-            landmarkName = "kmEditToolbarViewDidChooseApply(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d45"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.kmEditToolbarViewDidChooseApply(PDF_Reader_Pro.KMEditToolbarView) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2655"
-                  endingLineNumber = "2655"
-                  offsetFromSymbolStart = "2280">
-               </Location>
-               <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d45"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.kmEditToolbarViewDidChooseApply(PDF_Reader_Pro.KMEditToolbarView) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2655"
-                  endingLineNumber = "2655"
-                  offsetFromSymbolStart = "2548">
-               </Location>
-               <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d07"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.kmEditToolbarViewDidChooseApply(PDF_Reader_Pro.KMEditToolbarView) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2657"
-                  endingLineNumber = "2657"
-                  offsetFromSymbolStart = "2628">
-               </Location>
-               <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d45"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.kmEditToolbarViewDidChooseApply(PDF_Reader_Pro.KMEditToolbarView) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2655"
-                  endingLineNumber = "2655"
-                  offsetFromSymbolStart = "1952">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -3025,7 +2947,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4111"
             endingLineNumber = "4111"
-            landmarkName = "enterRedact()"
+            landmarkName = "exitRedact()"
             landmarkType = "7">
             <Locations>
                <Location
@@ -3058,6 +2980,21 @@
                   endingLineNumber = "4111"
                   offsetFromSymbolStart = "6824">
                </Location>
+               <Location
+                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 97602a50cee32218"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.exitRedact() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4111"
+                  endingLineNumber = "4111"
+                  offsetFromSymbolStart = "564">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3106,6 +3043,21 @@
                   endingLineNumber = "4443"
                   offsetFromSymbolStart = "1300">
                </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 7410410640f81fc8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #4 (Swift.Set&lt;Foundation.IndexPath&gt;) -&gt; () in PDF_Reader_Pro.KMMainViewController.enterPageEdit(Swift.Array&lt;Swift.Int&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4443"
+                  endingLineNumber = "4443"
+                  offsetFromSymbolStart = "516">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4206,6 +4158,21 @@
                   endingLineNumber = "1146"
                   offsetFromSymbolStart = "3040">
                </Location>
+               <Location
+                  uuid = "343E7BFB-E0E6-4622-82D3-22CE9BA091CD - 1f09890bef1337ea"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPDFToolbarController.componentGroupDidSelect(group: Swift.Optional&lt;KMComponentLibrary.ComponentGroup&gt;, menuItemProperty: Swift.Optional&lt;KMComponentLibrary.ComponentMenuitemProperty&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1146"
+                  endingLineNumber = "1146"
+                  offsetFromSymbolStart = "4148">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4529,21 +4496,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5463DABB-AD8F-4C5A-98FB-979E4BFED429"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "461"
-            endingLineNumber = "461"
-            landmarkName = "buttonClicked(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>