【综合】禅道http://101.132.103.13:7788/zentao/bug-view-3923.html问题修正

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -130,7 +130,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             //                }
             //            }
         } else {
-            if ([newActiveAnnotation isKindOfClass:[CPDFSignatureWidgetAnnotation class]]) {
+            if ([self.activeAnnotation isKindOfClass:[CPDFSignatureWidgetAnnotation class]]) {
                 if (self.toolMode == CFormToolMode) {
                     [self doDragAnnotationWithEvent:theEvent forAnnotation:self.activeAnnotation];
                 } else {
@@ -3936,9 +3936,9 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
         newActiveAnnotation = nil;
     }
     
-    if (([newActiveAnnotation isForm]) && self.toolMode != CFormToolMode) {
-        newActiveAnnotation = nil;
-    }
+//    if (([newActiveAnnotation isForm]) && self.toolMode != CFormToolMode) {
+//        newActiveAnnotation = nil;
+//    }
     
     if([newActiveAnnotation isKindOfClass:[CPDFInkAnnotation class]]) {
         if(self.annotationType == CAnnotationTypeInk || self.annotationType == CAnnotationTypeEraser)

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m

@@ -703,7 +703,8 @@
         vc.annotationModel = annotationModel;
         vc.pdfView = self.pdfView;
         vc.view.frame = [self viewControllerRect];
-        [self.view addSubview:vc.view];
+        vc.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+        self.propertiesBox.contentView = vc.view;
         self.contentViewController = vc;
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMRightSideViewController.swift

@@ -363,6 +363,9 @@ class KMRightSideViewController: NSViewController,CipherTextViewDelegate {
     
     
     @objc func signatureSelectedNotification(_ notification: Notification) {
+        if self.contextBox.contentView != self.annotationProperties.view {
+            self.contextBox.contentView = self.annotationProperties.view
+        }
         let editAnnotation: CPDFAnnotation = notification.object as! CPDFAnnotation
         if self.mainController?.model.rightPanelIsOpen == false {
             self.mainController?.toggleRightPane()