【注释】修复“图形注释，属性面板修改颜色，无效”

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -1718,10 +1718,22 @@ let KMColorPickerViewHeight: CGFloat = 64
         var fillColor = NSColor.clear
         var red: CGFloat = 0.0, green: CGFloat = 0.0, blue: CGFloat = 0.0, opacity: CGFloat = 0.0
 
-        if let fillColorPickerColor = fillColorPickerView.color {
-            annotationModel?.setColor(fillColorPickerColor)
+        if let borderColor = borderColorPickerView.color {
+            borderColor.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &opacity)
+            let color = NSColor(calibratedRed: red, green: green, blue: blue, alpha: opacity)
+            fillColor = color
+        }
+
+        if annotationType == .freeText {
+            if let fillColorPickerColor = fillColorPickerView.color {
+                annotationModel?.setColor(fillColorPickerColor)
 //                annotationModel?.setOpacity(opacity)
+            }
+        } else {
+            annotationModel?.setColor(fillColor)
+            annotationModel?.setOpacity(opacity)
         }
+
         updateAnnotation(.color)
     }