【2025】【Form】Form初步处理

PDF Office/PDF Master/Class/Common/Category/NSString+KMExtension.swift

@@ -62,8 +62,7 @@ let SKAnnotationTextWidgetDisplayKey = "SKAnnotationTextWidgetDisplayKey"
 let SKAnnotationTextWidgetPrintKey = "SKAnnotationTextWidgetPrintKey"
 let SKAnnotationTextWidgetFontColorKey = "SKAnnotationTextWidgetFontColorKey"
 let SKAnnotationTextWidgetBackgroundColorKey = "SKAnnotationTextWidgetBackgroundColorKey"
-let SKAnnotationTextWidgetFontSizeKey = "SKAnnotationTextWidgetFontSizeKey"
-let SKAnnotationTextWidgetFontNameKey = "SKAnnotationTextWidgetFontNameKey"
+
 let SKAnnotationTextWidgetAlignmenKey = "SKAnnotationTextWidgetAlignmenKey"
 let SKAnnotationTextMultilineKey = "SKAnnotationTextMultilineKey"
 let SKAnnotationTextStringValueKey = "SKAnnotationStringValueMultilineKey"

PDF Office/PDF Master/Class/Common/Category/NSUserDefaults_KMExtension.swift

@@ -7,33 +7,7 @@
 
 import Foundation
 
-extension UserDefaults {
-//    func color(forKey key: String) -> NSColor? {
-//        var color: NSColor?
-//        
-//        if let data = data(forKey: key) {
-//            color = NSUnarchiver.unarchiveObject(with: data) as? NSColor
-//        } else if let array = array(forKey: key), !array.isEmpty {
-//            var red: CGFloat = 1.0, green: CGFloat = 1.0, blue: CGFloat = 1.0, alpha: CGFloat = 1.0
-//            red = array[0] as? CGFloat ?? 0.0
-//            green = array[0] as? CGFloat ?? 0.0
-//            blue = array[0] as? CGFloat ?? 0.0
-//            
-//            if array.count > 2 {
-//                green = array[1] as? CGFloat ?? 0.0
-//                blue = array[2] as? CGFloat ?? 0.0
-//            }
-//            
-//            if array.count == 2 {
-//                alpha = array[1] as? CGFloat ?? 1.0
-//            } else if array.count > 3 {
-//                alpha = array[3] as? CGFloat ?? 1.0
-//            }
-//            color = NSColor(calibratedRed: red, green: green, blue: blue, alpha: alpha)
-//        }
-//        
-//        return color
-//    }
+extension UserDefaults { 
     @objc func color(forKey key: String) -> NSColor? {
         let colorString = self.object(forKey: key) as? AnyObject
         var color: NSColor?
@@ -48,9 +22,7 @@ extension UserDefaults {
     }
     
     @objc func setColor(_ color: NSColor, forKey key: String) {
-//        let colorString = color.toHex(alpha: true)
-//        self.set(colorString, forKey: key)
-//        self.synchronize()
+ 
         let data = NSArchiver.archivedData(withRootObject: color)
         self.set(data, forKey: key)
     }

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationConfig.swift

@@ -169,5 +169,14 @@ extension CPDFAnnotationConfig {
         UserDefaults.standard.synchronize()
     }
     
+    //MARK: - Int
+    class func getDefaultBoolValue(forKey key: String) -> Bool {
+        return UserDefaults.standard.bool(forKey: key)
+    }
+    
+    class func setDefaultBoolValue(_ value: Bool, toKey key: String) {
+        UserDefaults.standard.setValue(value, forKey: key)
+        UserDefaults.standard.synchronize()
+    }
     
 }

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFTextWidgetAnnotation+PDFListView.swift

@@ -1,48 +0,0 @@
-//
-//  CPDFTextWidgetAnnotation+PDFListView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/10/9.
-//
-
-import Foundation
-
-@objc extension CPDFTextWidgetAnnotation {
-    convenience init(PDFListViewNoteWith document: CPDFDocument) {
-        self.init(document: document)
-        if let model = CPDFAnnotationModel(annotationType: .textField) {
-            self.font = NSFont(name: model.fontName(), size: model.fontSize())
-            self.backgroundColor = model.backgroundColor()
-            self.fontColor = model.fontColor()
-            self.isMultiline = model.isMultiline()
-            self.alignment = model.alignment()
-            self.backgroundOpacity = model.backgroundOpacity()
-            self.border = CPDFBorder(style: model.style(), lineWidth: model.lineWidth(), dashPattern: model.dashPattern())
-            
-            self.setFieldName(String(format: "%@%@", "Text Field_", CPDFAnnotationModel.tagString()))
-        }
-    }
-    
-    override func isResizable() -> Bool {
-        return true
-    }
-    
-    override func isMovable() -> Bool {
-        return true
-    }
-    
-    private static var _textW_keys: Set<AnyHashable>?
-    override func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
-        if (CPDFTextWidgetAnnotation._textW_keys == nil) {
-            CPDFTextWidgetAnnotation._textW_keys = super.keysForValuesToObserveForUndo()
-            _ = CPDFTextWidgetAnnotation._textW_keys?.insert(CPDFAnnotationStringValueKey)
-        }
-        return CPDFTextWidgetAnnotation._textW_keys
-    }
-}
-
-@objc extension CPDFTextWidgetAnnotation {
-    override func isConvertibleAnnotation() -> Bool {
-        return true
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFTextWidgetAnnotation+PDFListView.swift

@@ -0,0 +1,185 @@
+//
+//  CPDFTextWidgetAnnotation+PDFListView.swift
+//  PDF Reader Pro
+//
+//  Created by tangchao on 2023/10/9.
+//
+
+import Foundation
+
+@objc extension CPDFTextWidgetAnnotation {
+    
+    convenience init(KMNoteBounds bounds: NSRect, document pdfDocument: CPDFDocument) {
+        self.init(document: pdfDocument)
+        
+        self.bounds = bounds
+        self.isMultiline = CPDFTextWidgetAnnotation.defaultIsMultiLine()
+        
+        self.cFont = CPDFTextWidgetAnnotation.defaultFont()
+        
+        if true {
+            let resultColor = CPDFTextWidgetAnnotation.defaultTextColor()
+            let opacity = resultColor.getAlphaComponent()
+            if opacity < 0.01 {
+                self.fontColor = nil
+            } else {
+                self.fontColor = resultColor
+            }
+        }
+        
+        if true {
+            let resultColor = CPDFTextWidgetAnnotation.defaultBorderColor()
+            let opacity = resultColor.getAlphaComponent()
+            if opacity < 0.01 {
+                self.borderColor = nil
+            } else {
+                self.borderColor = resultColor
+            }
+        }
+        
+        if true {
+            let resultColor = CPDFTextWidgetAnnotation.defaultFillColor()
+            let opacity = resultColor.getAlphaComponent()
+            if opacity < 0.01 {
+                self.backgroundColor = nil
+            } else {
+                self.backgroundColor = resultColor
+            }
+        }
+        
+        self.alignment = CPDFTextWidgetAnnotation.defaultFontAlignment()
+        self.backgroundOpacity = 1
+        self.border = CPDFBorder(style: .solid, lineWidth: 2, dashPattern: [5])
+        
+        self.setFieldName(String(format: "%@%@", "Text Field_", CPDFAnnotationModel.tagString()))
+        self.stringValue = ""
+        
+    }
+    
+    override func isResizable() -> Bool {
+        return true
+    }
+    
+    override func isMovable() -> Bool {
+        return true
+    }
+    
+    private static var _textW_keys: Set<AnyHashable>?
+    override func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
+        if (CPDFTextWidgetAnnotation._textW_keys == nil) {
+            CPDFTextWidgetAnnotation._textW_keys = super.keysForValuesToObserveForUndo()
+            _ = CPDFTextWidgetAnnotation._textW_keys?.insert(CPDFAnnotationStringValueKey)
+        }
+        return CPDFTextWidgetAnnotation._textW_keys
+    }
+
+    override func isConvertibleAnnotation() -> Bool {
+        return true
+    }
+}
+
+//MARK: - DefaultInfo
+extension CPDFTextWidgetAnnotation {
+    
+    class func defaultIsMultiLine() -> Bool {
+         return CPDFAnnotationConfig.getDefaultBoolValue(forKey: CAnnotationTextWidgetMultilineKey)
+    }
+    
+    class func defaultTextColor() -> NSColor {
+        return CPDFAnnotationConfig.getDefaultColor(forKey: CAnnotationTextWidgetFontColorKey) ?? NSColor(red: 1, green: 1, blue: 1, alpha: 1)
+    }
+    
+    class func defaultBorderColor() -> NSColor {
+        return CPDFAnnotationConfig.getDefaultColor(forKey: CAnnotationTextWidgetBorderColorKey) ?? NSColor.clear
+    }
+    
+    class func defaultFillColor() -> NSColor {
+        return CPDFAnnotationConfig.getDefaultColor(forKey: CAnnotationTextWidgetBackgroundColorKey) ?? NSColor.clear
+    }
+    
+    class func defaultFont() -> CPDFFont {
+        return CPDFFont(familyName: CPDFTextWidgetAnnotation.defaultFontName(), fontStyle: CPDFTextWidgetAnnotation.defaultFontStyle())
+    }
+    
+    class func defaultFontName() -> String {
+        return CPDFAnnotationConfig.getDefaultStringValue(forKey: SKAnnotationTextWidgetFontNameKey) ?? "Helvetica"
+    }
+    
+    class func defaultFontStyle() -> String {
+        return CPDFAnnotationConfig.getDefaultStringValue(forKey: SKAnnotationTextWidgetFontStyleKey) ?? "Regular"
+    }
+    
+    class func defaultFontSize() -> CGFloat {
+        return CPDFAnnotationConfig.getDefaultFloatValue(forKey: SKAnnotationTextWidgetFontSizeKey) ?? 12
+    }
+    
+    class func defaultFontAlignment() -> NSTextAlignment {
+        if let styleKey = CPDFAnnotationConfig.getDefaultIntValue(forKey: CAnnotationTextWidgetAlignmenKey) {
+            let style: NSTextAlignment = NSTextAlignment(rawValue: styleKey) ?? .left
+            return style
+        }
+        return .left
+    }
+    
+     
+}
+ 
+//MARK: - Update
+extension CPDFTextWidgetAnnotation {
+ //    if annotation.shouldDisplay() {
+//        if annotation.shouldPrint() {
+//            formFieldIndex = 0
+//        } else {
+//            formFieldIndex = 2
+//        }
+//    } else {
+//        if annotation.shouldPrint() {
+//            formFieldIndex = 3
+//        } else {
+//            formFieldIndex = 1
+//        }
+//    }
+//    defaultValueText = annotation.stringValue
+//    isMultiLine = annotation.isMultiline
+//    
+//    textColor = annotation.color
+//    borderColor = annotation.borderColor
+//    fillColor = annotation.backgroundColor
+//    
+//    fontName = annotation.cFont.familyName
+//    fontStyle = annotation.cFont.styleName
+//    fontSize = annotation.fontSize
+//    alignment = annotation.alignment
+    
+    
+    
+    class func update(_ annotations: [CPDFTextWidgetAnnotation], fieldName name: String?, PDFView pdfView: CPDFListView?) {
+        guard let resultValue = name else {
+            return
+        }
+        guard let pdfView = pdfView else {
+            return
+        }
+        for annotation in annotations {
+            annotation.setFieldName(resultValue)
+         }
+        pdfView.setNeedsDisplayMultiAnnotations(annotations)
+    }
+    
+    class func update(_ annotations: [CPDFTextWidgetAnnotation], textColor color: NSColor?, PDFView pdfView: CPDFListView?) {
+        guard let resultColor = color else {
+            return
+        }
+        guard let pdfView = pdfView else {
+            return
+        }
+        for annotation in annotations {
+            annotation.color = resultColor
+         }
+        pdfView.setNeedsDisplayMultiAnnotations(annotations)
+    }
+    
+    
+    
+    
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFWidgetAnnotation+PDFListView.swift

@@ -68,39 +68,7 @@ import Foundation
         return CPDFWidgetAnnotation._w_keys
     }
     
-    /*
+     
+}
 
-     - (NSString *)fetchFieldName {
-         NSString *annotationType = @"";
-         if ([self isKindOfClass:[CPDFTextWidgetAnnotation class]]) {
-             annotationType = @"Text Field";
-         } else if ([self isKindOfClass:[CPDFButtonWidgetAnnotation class]]) {
-             CPDFButtonWidgetAnnotation *buttonWidget = (CPDFButtonWidgetAnnotation *)self;
-             if (buttonWidget.controlType == 1) {
-                 annotationType = @"Group1";
-             } else if (buttonWidget.controlType == 2) {
-                 annotationType = @"Check Box";
-             } else if (buttonWidget.controlType == 0) {
-                 annotationType = @"Button";
-             }
-         } else if ([self isKindOfClass:[CPDFChoiceWidgetAnnotation class]]) {
-             CPDFChoiceWidgetAnnotation *choiceWidget = (CPDFChoiceWidgetAnnotation *)self;
-             if (choiceWidget.isListChoice) {
-                 annotationType = @"List Box";
-             } else {
-                 annotationType = @"Combo Box";
-             }
-         } else if ([self isKindOfClass:[CPDFSignatureWidgetAnnotation class]]) {
-             annotationType = @"Signature";
-         }
-         NSDateFormatter *formatter = [[NSDateFormatter alloc ] init];
-         [formatter setDateFormat:@"YYYY-MM-dd hh:mm:ss"];
-         NSString *dateString = [formatter stringFromDate:[NSDate date]];
-         return [NSString stringWithFormat:@"%@_%@ %d", annotationType, dateString, rand()%10000];
-     }
 
-     - (NSString *)toolTipsString {
-         return self.toolTips?:@"";
-     }
-     */
-}

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

@@ -4435,26 +4435,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             break;
         case CAnnotationTypeTextField:{
             CPDFTextWidgetAnnotation *textWidget = [[CPDFTextWidgetAnnotation alloc] initWithKMNoteBounds:bounds document:self.document];
-            textWidget.stringValue = NSLocalizedString(@"", nil);
-            NSColor* backgroundColor = [sud colorForKey:CAnnotationTextWidgetBackgroundColorKey];
-            if (backgroundColor) {
-                textWidget.backgroundColor = backgroundColor;
-                textWidget.backgroundOpacity = 1;
-            } else {
-                textWidget.backgroundColor = [NSColor clearColor];
-                textWidget.backgroundOpacity = 0;
-            }
-            
-            NSColor* fontColor = [sud colorForKey:CAnnotationTextWidgetFontColorKey];
-            if (fontColor) {
-                textWidget.fontColor = fontColor;
-            }
-            textWidget.alignment = [sud integerForKey:CAnnotationTextWidgetAlignmenKey];
-            NSFont *font = [sud fontForNameKey:SKAnnotationTextWidgetFontNameKey sizeKey:SKAnnotationTextWidgetFontSizeKey];
-            if (font) {
-                textWidget.font = font;
-            }
-            textWidget.isMultiline = [sud boolForKey:CAnnotationTextWidgetMultilineKey];
+    
             newAnnotation = textWidget;
         }
             break;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CStringConstants.h

@@ -102,6 +102,7 @@ extern NSString *CAnnotationTextWidgetLineWidthKey;
 extern NSString *CAnnotationTextWidgetBorderColorKey;
 extern NSString *SKAnnotationTextWidgetFontNameKey;
 extern NSString *SKAnnotationTextWidgetFontSizeKey;
+extern NSString *SKAnnotationTextWidgetFontStyleKey;
 extern NSString *CAnnotationTextWidgetFontColorKey;
 extern NSString *CAnnotationTextWidgetAlignmenKey;
 extern NSString *CAnnotationTextWidgetBackgroundColorKey;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CStringConstants.m

@@ -96,19 +96,17 @@ NSString *CArrowNoteEndStyleKey = @"CArrowNoteEndStyle";
 //Eraser
 NSString *CLinkNoteTypeKey = @"CLinkNoteTypeKey";
 
-//Form
-NSString *CAnnotationTextWidgetLineStyleKey = @"CAnnotationTextWidgetLineStyle";
-NSString *CAnnotationTextWidgetLineWidthKey = @"CAnnotationTextWidgetLineWidthKey";
+//Form-TextField
+NSString *CAnnotationTextWidgetMultilineKey = @"SKAnnotationTextMultilineKey";
+NSString *CAnnotationTextWidgetFontColorKey = @"SKAnnotationTextWidgetFontColorKey";
 NSString *CAnnotationTextWidgetBorderColorKey = @"CAnnotationTextWidgetBorderColor";
+NSString *CAnnotationTextWidgetBackgroundColorKey = @"SKAnnotationTextWidgetBackgroundColorKey";
 NSString *SKAnnotationTextWidgetFontNameKey = @"SKAnnotationTextWidgetFontNameKey";
+NSString *SKAnnotationTextWidgetFontStyleKey = @"SKAnnotationTextWidgetFontStyleKey";
 NSString *SKAnnotationTextWidgetFontSizeKey = @"SKAnnotationTextWidgetFontSizeKey";
-NSString *CAnnotationTextWidgetFontColorKey = @"SKAnnotationTextWidgetFontColorKey";
 NSString *CAnnotationTextWidgetAlignmenKey = @"SKAnnotationTextWidgetAlignmenKey";
-NSString *CAnnotationTextWidgetBackgroundColorKey = @"SKAnnotationTextWidgetBackgroundColorKey";
-NSString *CAnnotationTextWidgetBackgroundOpacityKey = @"CAnnotationTextWidgetBackgroundOpacity";
-NSString *CAnnotationTextWidgetMultilineKey = @"SKAnnotationTextMultilineKey";
-NSString *CDefaultTextWidgetWidthKey = @"CDefaultTextWidgetWidth";
-NSString *CDefaultTextWidgetHeightKey = @"CDefaultTextWidgetHeight";
+
+
 
 NSString *CAnnotationCheckBoxWidgetLineStyleKey = @"CAnnotationCheckBoxWidgetLineStyle";
 NSString *CAnnotationCheckBoxWidgetLineWidthKey = @"CAnnotationCheckBoxWidgetLineWidth";
@@ -285,3 +283,11 @@ NSString *CMeasureLineFontColorKey = @"CMeasureLineFontColor";
 NSString *CMeasureMultilineFontColorKey = @"CMeasureMultilineFontColor";
 NSString *CMeasurePolygonalFontColorKey = @"CMeasurePolygonalFontColor";
 NSString *CMeasureRectanglesFontColorKey = @"CMeasureRectanglesFontColor";
+
+
+//待删除
+NSString *CAnnotationTextWidgetLineStyleKey = @"CAnnotationTextWidgetLineStyle";
+NSString *CAnnotationTextWidgetLineWidthKey = @"CAnnotationTextWidgetLineWidthKey";
+NSString *CAnnotationTextWidgetBackgroundOpacityKey = @"CAnnotationTextWidgetBackgroundOpacity";
+NSString *CDefaultTextWidgetWidthKey = @"CDefaultTextWidgetWidth";
+NSString *CDefaultTextWidgetHeightKey = @"CDefaultTextWidgetHeight";

PDF Office/PDF Master/Class/Preference/Resource/InitialUserDefaults.plist

@@ -250,8 +250,6 @@
 		<true/>
 		<key>SKAnnotationChoiceListWidgetFontNameKey</key>
 		<string>Helvetica</string>
-		<key>SKAnnotationTextWidgetFontNameKey</key>
-		<string>Helvetica</string>
 		<key>SKAnnotationChoiceWidgetFontNameKey</key>
 		<string>Helvetica</string>
 		<key>KMOCRPlanNumber</key>

PDF Office/PDF Master/Class/Purchase/KMConvertCompareViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -305,7 +305,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                         <rect key="frame" x="0.0" y="0.0" width="620" height="130"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uZ9-Xd-zFp">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uZ9-Xd-zFp">
                                 <rect key="frame" x="38" y="0.0" width="544" height="72"/>
                                 <textFieldCell key="cell" id="CSi-aX-0ZA">
                                     <font key="font" size="16" name="HelveticaNeue"/>
@@ -314,7 +314,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ofv-cY-jIA">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ofv-cY-jIA">
                                 <rect key="frame" x="234" y="87" width="152" height="28"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="PDF to Office" id="nP5-oC-YyB">
                                     <font key="font" metaFont="systemBold" size="24"/>
@@ -376,7 +376,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                 <rect key="frame" x="0.0" y="0.0" width="259" height="60"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oRL-I5-1vl">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oRL-I5-1vl">
                                                         <rect key="frame" x="-2" y="34" width="263" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $1.99 / Month" id="E5k-1z-I1y">
                                                             <font key="font" metaFont="systemBold"/>
@@ -384,7 +384,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hXP-PB-QzC">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hXP-PB-QzC">
                                                         <rect key="frame" x="-2" y="15" width="263" height="14"/>
                                                         <textFieldCell key="cell" alignment="center" title="Billed every 6 months at USD $9.99 " id="Nsx-uo-kS2">
                                                             <font key="font" metaFont="message" size="11"/>
@@ -413,7 +413,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                 <rect key="frame" x="0.0" y="0.0" width="259" height="60"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UTt-pw-QJS">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UTt-pw-QJS">
                                                         <rect key="frame" x="85" y="34" width="89" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $79.99 " id="fWj-VV-IGM">
                                                             <font key="font" metaFont="systemBold"/>
@@ -421,7 +421,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aFH-bb-LZ8">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aFH-bb-LZ8">
                                                         <rect key="frame" x="-2" y="15" width="263" height="14"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="one-time purchase" id="IwS-ck-vrh">
                                                             <font key="font" metaFont="message" size="11"/>
@@ -499,7 +499,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                 <rect key="frame" x="0.0" y="0.0" width="259" height="44"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q1t-qy-vfr">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q1t-qy-vfr">
                                                         <rect key="frame" x="-2" y="14" width="263" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $1.99 / Month" id="rTW-to-cpX">
                                                             <font key="font" metaFont="systemBold"/>
@@ -525,7 +525,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                                 <rect key="frame" x="0.0" y="0.0" width="259" height="44"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX8-P3-9pq">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZX8-P3-9pq">
                                                         <rect key="frame" x="85" y="14" width="89" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $79.99 " id="qul-eJ-utO">
                                                             <font key="font" metaFont="systemBold"/>
@@ -588,7 +588,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                         <rect key="frame" x="0.0" y="0.0" width="73" height="30"/>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="xz5-rR-6su"/>
                                     </imageView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NUu-kd-RA8">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NUu-kd-RA8">
                                         <rect key="frame" x="8" y="7" width="57" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="20% off" id="INT-AL-C6e">
                                             <font key="font" metaFont="system"/>
@@ -615,7 +615,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                                         <rect key="frame" x="0.0" y="0.0" width="73" height="30"/>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="O20-Lh-oxa"/>
                                     </imageView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TD3-Bl-Lhv">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TD3-Bl-Lhv">
                                         <rect key="frame" x="8" y="7" width="57" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="20% off" id="uTK-Tu-RgB">
                                             <font key="font" metaFont="system"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/ViewController/FormProperties/KMAnnotationFromViewController.swift

@@ -107,49 +107,7 @@ import Cocoa
         set {
             _formMode = newValue
             isFromMode = true
-            
-//            let defaults = UserDefaults.standard
-//            var annotation: CPDFWidgetAnnotation?
-//            var backgroundColor: NSColor?
-//            var fontColor: NSColor?
-//            
-//            if formMode == .textField {
-//                annotation = CPDFTextWidgetAnnotation(PDFListViewNoteWith: (pdfView?.document)!)
-//                backgroundColor = defaults.color(forKey: SKAnnotationTextWidgetBackgroundColorKey) ?? NSColor.clear
-//                annotation?.backgroundColor = backgroundColor
-//                fontColor = defaults.color(forKey: SKAnnotationTextWidgetFontColorKey)
-//                annotation?.fontColor = fontColor
-//                (annotation as! CPDFTextWidgetAnnotation).alignment = NSTextAlignment(rawValue: defaults.integer(forKey: SKAnnotationTextWidgetAlignmenKey)) ?? .left
-//                if let font = defaults.font(forNameKey: SKAnnotationTextWidgetFontNameKey, sizeKey: SKAnnotationTextWidgetFontSizeKey) {
-//                    annotation?.font = font
-//                }
-//                if let tAnnotation = annotation as? CPDFTextWidgetAnnotation {
-//                    (annotation as! CPDFTextWidgetAnnotation).isMultiline = defaults.bool(forKey: SKAnnotationTextMultilineKey)
-//                }
-//            } else if formMode == .listMenu {
-//                annotation = CPDFChoiceWidgetAnnotation(PDFListViewNoteWith: (pdfView?.document)!, listChoice: true)
-//                backgroundColor = defaults.color(forKey: SKAnnotationChoiceListWidgetBackgroundColorKey) ?? NSColor.clear
-//                annotation?.backgroundColor = backgroundColor
-//                fontColor = defaults.color(forKey: SKAnnotationChoiceListWidgetFontColorKey)
-//                annotation?.fontColor = fontColor
-//                if let font = defaults.font(forNameKey: SKAnnotationChoiceListWidgetFontNameKey, sizeKey: SKAnnotationChoiceListWidgetFontSizeKey) {
-//                    annotation?.font = font
-//                }
-//            } else if formMode == .comboBox {
-//                annotation = CPDFChoiceWidgetAnnotation(PDFListViewNoteWith: (pdfView?.document)!, listChoice: false)
-//                backgroundColor = defaults.color(forKey: SKAnnotationChoiceWidgetBackgroundColorKey) ?? NSColor.clear
-//                annotation?.backgroundColor = backgroundColor
-//                fontColor = defaults.color(forKey: SKAnnotationChoiceWidgetFontColorKey)
-//                annotation?.fontColor = fontColor
-//                if let font = defaults.font(forNameKey: SKAnnotationChoiceWidgetFontNameKey, sizeKey: SKAnnotationChoiceWidgetFontSizeKey) {
-//                    annotation?.font = font
-//                }
-//            } else {
-//                annotation = CPDFWidgetAnnotation(document: (pdfView?.document)!)
-//            }
-//            
-//            self.annotations = [annotation].compactMap { $0 }
-//            self.annotation = annotations.first
+           
         }
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift

@@ -276,43 +276,35 @@ class FormsTextFieldController: NSViewController {
         
         //General
         
-        
-//        if annotationTextWidget.stringValue != nil {
-//            textFilledPresetValueTextField.stringValue = annotationTextWidget.stringValue // 预设值
-//        }
-        
-//        textFilledAllowNewLineBtn.state = annotationTextWidget.isMultiline ? .on : .off
-        
-//        switch annotationTextWidget.alignment {
-//        case .left:
-//            textFilledAlignmentPopUpBtn.selectItem(at: 0)
-//        case .center:
-//            textFilledAlignmentPopUpBtn.selectItem(at: 2)
-//        case .right:
-//            textFilledAlignmentPopUpBtn.selectItem(at: 1)
-//        default:
-//            break
-//        }
-        
-        
-//        if let fieldName = (annotation as! CPDFWidgetAnnotation).fieldName(), annotations.count == 1 {
-//            self.generalNameTextField.stringValue = fieldName
+        if let annotation = firstAnnotation {
+            name = annotation.fieldName()
+            if annotation.shouldDisplay() {
+                if annotation.shouldPrint() {
+                    formFieldIndex = 0
+                } else {
+                    formFieldIndex = 2
+                }
+            } else {
+                if annotation.shouldPrint() {
+                    formFieldIndex = 3
+                } else {
+                    formFieldIndex = 1
+                }
+            }
+            defaultValueText = annotation.stringValue
+            isMultiLine = annotation.isMultiline
             
-//        if self.annotation!.shouldDisplay() {
-//            if self.annotation!.shouldPrint() {
-//                self.generalFormFieldPopUpButton.selectItem(at: 0)
-//            } else {
-//                self.generalFormFieldPopUpButton.selectItem(at: 2)
-//            }
-//        } else {
-//            if self.annotation!.shouldPrint() {
-//                self.generalFormFieldPopUpButton.selectItem(at: 3)
-//            } else {
-//                self.generalFormFieldPopUpButton.selectItem(at: 1)
-//            }
-//        }
-        
-        
+            textColor = annotation.color
+            borderColor = annotation.borderColor
+            fillColor = annotation.backgroundColor
+            
+            fontName = annotation.cFont.familyName
+            fontStyle = annotation.cFont.styleName
+            fontSize = annotation.fontSize
+            alignment = annotation.alignment
+            
+        }
+         
         
         
     }

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -8477,6 +8477,12 @@
 		9FB220EF2B18639900A5B208 /* Form */ = {
 			isa = PBXGroup;
 			children = (
+				BB6013872AD3A3CB00A76FB2 /* CPDFWidgetAnnotation+PDFListView.swift */,
+				BB60138B2AD3A94200A76FB2 /* CPDFSignatureAnnotation+PDFListView.swift */,
+				BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */,
+				BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */,
+				BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */,
+				BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */,
 				9FB220F02B1863C800A5B208 /* KMAnnotationFromSignature.swift */,
 			);
 			path = Form;
@@ -13431,8 +13437,6 @@
 				F37322B8292DF9410013862C /* CPDFAnnotationModel.m */,
 				BB6F46CA2CF5E605003FCC3C /* CPDFAnnotationConfig.swift */,
 				BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */,
-				BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */,
-				BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */,
 				BBBB6CD52AD150D20035AA66 /* CPDFCircleAnnotation+PDFListView.swift */,
 				BBBB6CD92AD15B900035AA66 /* CPDFFreeTextAnnotation+PDFListView.swift */,
 				BBBB6CDD2AD174080035AA66 /* CPDFInkAnnotation+PDFListView.swift */,
@@ -13440,13 +13444,9 @@
 				BB6719E82AD2A57C003D44D5 /* CPDFLinkAnnotation+PDFListView.swift */,
 				BB5726EF2B20707C0089D283 /* CPDFMarkupAnnotation+PDFListView.swift */,
 				BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */,
-				BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */,
 				BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */,
 				BB671A002AD2D2A0003D44D5 /* CPDFStampAnnotation+PDFListView.swift */,
 				BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */,
-				BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */,
-				BB6013872AD3A3CB00A76FB2 /* CPDFWidgetAnnotation+PDFListView.swift */,
-				BB60138B2AD3A94200A76FB2 /* CPDFSignatureAnnotation+PDFListView.swift */,
 				9FF371C62C69A9E1005F9CC5 /* CPDFPolygonAnnotation+PDFListView.swift */,
 				9FF371C72C69A9E1005F9CC5 /* CPDFPolylineAnnotation+PDFListView.swift */,
 				BB0B30632D098ADD003F54D3 /* CPDFEditArea */,

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4671,13 +4671,13 @@
             filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4999"
-            endingLineNumber = "4999"
+            startingLineNumber = "4980"
+            endingLineNumber = "4980"
             landmarkName = "-doDragTableAnnotationWithEvent:forAnnotation:"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "7271BD77-A3F0-460A-B2AD-989D02740232 - 27f693490f6bbd6c"
+                  uuid = "7271BD77-A3F0-460A-B2AD-989D02740232 - 27f693490f6bb311"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -4687,27 +4687,12 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4999"
-                  endingLineNumber = "4999"
-                  offsetFromSymbolStart = "980">
-               </Location>
-               <Location
-                  uuid = "7271BD77-A3F0-460A-B2AD-989D02740232 - 27f693490f6bbd6c"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[CPDFListView(Event) doDragTableAnnotationWithEvent:forAnnotation:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4999"
-                  endingLineNumber = "4999"
-                  offsetFromSymbolStart = "916">
+                  startingLineNumber = "4980"
+                  endingLineNumber = "4980"
+                  offsetFromSymbolStart = "164">
                </Location>
                <Location
-                  uuid = "7271BD77-A3F0-460A-B2AD-989D02740232 - 27f693490f6bbd6c"
+                  uuid = "7271BD77-A3F0-460A-B2AD-989D02740232 - 27f693490f6bb311"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -4717,8 +4702,8 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4999"
-                  endingLineNumber = "4999"
+                  startingLineNumber = "4980"
+                  endingLineNumber = "4980"
                   offsetFromSymbolStart = "604">
                </Location>
             </Locations>
@@ -4791,49 +4776,17 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "807D7969-D858-460E-AB57-519B3F2571EF"
+            uuid = "B9B107E5-9A01-4F33-BC04-FD197E40CBDF"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "261"
-            endingLineNumber = "261"
-            landmarkName = "reloadData()"
+            startingLineNumber = "4408"
+            endingLineNumber = "4408"
+            landmarkName = "-addFormAnnotationWithType:selection:page:bounds:"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "807D7969-D858-460E-AB57-519B3F2571EF - 8074dc3759597ac3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.FormsTextFieldController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "301"
-                  endingLineNumber = "301"
-                  offsetFromSymbolStart = "5488">
-               </Location>
-               <Location
-                  uuid = "807D7969-D858-460E-AB57-519B3F2571EF - 8074dc37595947ab"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.FormsTextFieldController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "261"
-                  endingLineNumber = "261"
-                  offsetFromSymbolStart = "5396">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>