【2025】【Edit】背景&水印逻辑调整

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

@@ -388,6 +388,9 @@ class KMBackgroundPropertyController: NSViewController {
     @objc func checkBoxClicked(_ sender: ComponentCheckBox) {
         if sender == appearanceScaleCheckbox {
             backgroundData.isScale = appearanceScaleCheckbox.properties.checkboxType == .selected ? true : false
+            if backgroundData.isScale == false {
+                backgroundData.scale = 1
+            }
         }
         reloadData()
         

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

@@ -96,6 +96,10 @@ class KMNWatermarkPropertyController: NSViewController {
  
     weak open var delegate: KMNWatermarkPropertyControllerDelegate?
 
+    /**
+     1、新增模板：新增完成后，重置缓存数据
+     2、修改模板：
+     */
     //MARK: - func
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -473,7 +477,9 @@ class KMNWatermarkPropertyController: NSViewController {
     }
     
     func clearData() {
-        watermarkData = KMWatermarkModel()
+        KMWatermarkManager.defaultManager.defaultWatermarkData = KMWatermarkModel.defaultWDData()
+        
+        watermarkData = KMWatermarkManager.defaultManager.defaultWatermarkData
         
         reloadData()
     }
@@ -565,6 +571,8 @@ class KMNWatermarkPropertyController: NSViewController {
                 weakSelf.watermarkData.watermarkName = string ?? ""
                 if KMWatermarkManager.defaultManager.addWatermark(watermark: weakSelf.watermarkData) == true {
                     weakSelf.delegate?.watermarkPropertyControllerSaveTemplateSuccess?(weakSelf, weakSelf.watermarkData)
+                    
+                    weakSelf.clearData()
                 }
             }
         }