【2025】【PDFView】注释选中相关逻辑调整

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

@@ -5207,7 +5207,15 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                 if ([annotation annotationShouldDisplay] && NSIntersectsRect(annotation.bounds, selectBounds) &&
                     ![annotation isKindOfClass:[CPDFLinkAnnotation class]] &&
                     ![annotation isKindOfClass:[CPDFRedactAnnotation class]]) {
-                    [self.activeAnnotations addObject:annotation];
+                    if(self.toolMode == CFormToolMode) {
+                        if(annotation.isForm == YES) {
+                            [self.activeAnnotations addObject:annotation];
+                        }
+                    } else {
+                        if(annotation.isForm == NO) {
+                            [self.activeAnnotations addObject:annotation];
+                        }
+                    }
                     if([self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewChangeatioActiveAnnotations:forActiveAnnotations:isRightMenu:)])
                         [self.pdfListViewDelegate PDFListViewChangeatioActiveAnnotations:self forActiveAnnotations:self.activeAnnotations isRightMenu:NO];
                 }

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -2048,7 +2048,7 @@ struct KMNMWCFlags {
             updateContentEditPopWinodwFrame()
             
             popVC.paneCallback = {[weak self] isOpen in
-                if isOpen == true && self?.viewManager.showRightSide == false {
+                if isOpen == true {
                     self?.viewManager.showRightSide = false
                 } else {
                     self?.viewManager.showRightSide = true

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift

@@ -1346,10 +1346,10 @@ extension KMPDFToolbarController: KMRedactToolbarControllerDelegate {
             }
             if UserDefaults.standard.object(forKey: "kExitRedactAlert") != nil {
                 //退出
-                viewManager?.subToolMode = .None
-                cancelSelectedSecondToolbarItems(.Protect)
-                delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Exit_Identifier)
-                reloadData()
+                self.viewManager?.subToolMode = .None
+                self.cancelSelectedSecondToolbarItems(.Protect)
+                self.delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Exit_Identifier)
+                self.reloadData()
                 return
             }
             let alert = NSAlert()
@@ -1369,10 +1369,10 @@ extension KMPDFToolbarController: KMRedactToolbarControllerDelegate {
                 }
                 
                 //退出
-                viewManager?.subToolMode = .None
-                cancelSelectedSecondToolbarItems(.Protect)
-                delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Exit_Identifier)
-                reloadData()
+                self.viewManager?.subToolMode = .None
+                self.cancelSelectedSecondToolbarItems(.Protect)
+                self.delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Exit_Identifier)
+                self.reloadData()
             } else if response.rawValue == 1001 {
                 //取消
                 
@@ -1389,9 +1389,9 @@ extension KMPDFToolbarController: KMRedactToolbarControllerDelegate {
             if UserDefaults.standard.object(forKey: "kApplyRedactAlert") != nil {
                 //应用
                 self.viewManager?.subToolMode = .None
-                cancelSelectedSecondToolbarItems(.Protect)
-                delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Apply_Identifier)
-                reloadData()
+                self.cancelSelectedSecondToolbarItems(.Protect)
+                self.delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Apply_Identifier)
+                self.reloadData()
                 return
             }
             let alert = NSAlert()
@@ -1411,10 +1411,10 @@ extension KMPDFToolbarController: KMRedactToolbarControllerDelegate {
                 }
                 
                 //应用
-                viewManager?.subToolMode = .None
-                cancelSelectedSecondToolbarItems(.Protect)
-                delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Apply_Identifier)
-                reloadData()
+                self.viewManager?.subToolMode = .None
+                self.cancelSelectedSecondToolbarItems(.Protect)
+                self.delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, KMPDFToolbar_protect_redact_Apply_Identifier)
+                self.reloadData()
             } else if response.rawValue == 1001 {
                 //取消