Browse Source

【注释】修复“日期注释属性面板隐藏笔记编辑框”

wanjun 10 months ago
parent
commit
30b088e449

+ 29 - 25
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -569,46 +569,50 @@ let KMColorPickerViewHeight: CGFloat = 64
         }
         
 //        noteView.isHidden = isannotationMode
-        var noteViewIsHidden = isannotationMode
         
         if annotationType == .signText || annotationType == .signDate {
             if subType == .date {
 //                noteView.isHidden = true
-                noteViewIsHidden = true
+                isannotationMode = true
             } else {
 //                noteView.isHidden = false
-                noteViewIsHidden = false
+                isannotationMode = false
             }
-        }
-        
-        if annotationModel?.annotations != nil {
-//            noteView.isHidden = annotationModel?.annotation==nil
-            noteViewIsHidden = annotationModel?.annotation==nil
         } else {
-            if annotationType == .stamp ||
-                annotationType == .ink ||
-                annotationType == .square ||
-                annotationType == .circle ||
-                annotationType == .arrow ||
-                annotationType == .line ||
-                annotationType == .highlight ||
-                annotationType == .strikeOut ||
-                annotationType == .underline ||
-                annotationType == .freeText {
-//                noteView.isHidden = true
-                noteViewIsHidden = true
+            if annotationModel?.annotations != nil {
+    //            noteView.isHidden = annotationModel?.annotation==nil
+                if (annotationModel?.annotations.count)! > 1 {
+                    isannotationMode = true
+                } else {
+                    isannotationMode = annotationModel?.annotation==nil
+                }
             } else {
-//                noteView.isHidden = annotationModel?.annotation==nil
-                noteViewIsHidden = annotationModel?.annotation==nil
+                if annotationType == .stamp ||
+                    annotationType == .ink ||
+                    annotationType == .square ||
+                    annotationType == .circle ||
+                    annotationType == .arrow ||
+                    annotationType == .line ||
+                    annotationType == .highlight ||
+                    annotationType == .strikeOut ||
+                    annotationType == .underline ||
+                    annotationType == .freeText {
+    //                noteView.isHidden = true
+                    isannotationMode = true
+                } else {
+    //                noteView.isHidden = annotationModel?.annotation==nil
+                    isannotationMode = annotationModel?.annotation==nil
+                }
             }
         }
-        if noteViewIsHidden {
+        
+        if isannotationMode {
             if noteView.isHidden == false {
-                noteView.isHidden = noteViewIsHidden
+                noteView.isHidden = isannotationMode
             }
         } else {
             if noteView.isHidden {
-                noteView.isHidden = noteViewIsHidden
+                noteView.isHidden = isannotationMode
             }
         }
     }