【2025】【综合】

1、贝茨码命名调整
2、右边属性栏展示优化
3、画笔快捷键完善

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

@@ -60,6 +60,8 @@
         }
     }
     
+    BOOL isShiftPressed = (modifiers & NSEventModifierFlagShift) == NSEventModifierFlagShift;
+    
     BOOL isContinue = YES;
     if([self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewKeyDownIsContinue:theEvent:)]) {
         isContinue = [self.pdfListViewDelegate PDFListViewKeyDownIsContinue:self theEvent:theEvent];
@@ -99,7 +101,7 @@
         [self setNeedsDisplayAnnotationViewForVisiblePages];
     } else if ([self.activeAnnotation isMovable] && isArrow && ((modifiers & ~NSEventModifierFlagShift) == 0)) {
         [self doMoveActiveAnnotationForKey:eventChar byAmount:(modifiers & NSEventModifierFlagShift) ? 10.0 : 1.0];
-    } else if (self.toolMode == CEditPDFToolMode) {
+    } else if (self.toolMode == CEditPDFToolMode && theEvent.keyCode == 53) {
         CAddEditingAreaType addType = [self shouAddEditAreaType];
         if (self.editingAreas.count > 0) {
             [self updateEditingAreas:nil];
@@ -181,6 +183,16 @@
         if (self.pdfListViewDelegate && [self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewMeasureCancel:)]) {
             [self.pdfListViewDelegate PDFListViewMeasureCancel:self];
         }
+    } else if (self.annotationType == CAnnotationTypeInk) {
+        if (theEvent.keyCode == 24 && isShiftPressed == YES) {
+            CGFloat defaultValue = [CPDFInkAnnotation defaultLineWidth];
+            defaultValue = min(18, defaultValue+1);
+            [CPDFInkAnnotation updateDefault_LineWidth:defaultValue];
+        } else if (theEvent.keyCode == 24 && isShiftPressed == YES) {
+            CGFloat defaultValue = [CPDFInkAnnotation defaultLineWidth];
+            defaultValue = max(0, defaultValue-1);
+            [CPDFInkAnnotation updateDefault_LineWidth:defaultValue];
+        }
     }
 }
 

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Bates/KMBatesManager.swift

@@ -45,8 +45,8 @@ class KMBatesManager: NSObject {
     func fetchBatesAvailableName() -> String {
         var availableIndex = 0
         for item in datas {
-            if item.name.hasPrefix("Bates") {
-                if let index = Int(item.name.dropFirst("Bates".count)), index >= availableIndex {
+            if item.name.hasPrefix("Bates-") {
+                if let index = Int(item.name.dropFirst("Bates-".count)), index >= availableIndex {
                     availableIndex = index + 1
                 }
             }

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

@@ -5429,7 +5429,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                 if self.viewManager.isPDFReadMode {
                     viewManager.showRightSide = false
                 } else {
-                    viewManager.showRightSide = true
+                    
                 }
             }
             refreshToolbarRightViewInfo()