【书签】添加书签

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -661,6 +661,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
             bookmarkSheetController = KMBookmarkSheetController.showBookmarkSheetController(type: .bookmark)
         }
         
+        bookmarkSheetController?.stringValue = self.displayName
         bookmarkSheetController?.cancelAction = { [unowned self] controller, type in
             
         }
@@ -689,9 +690,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
             }
 
             if let bookmark = bookmark {
-                if let mutableChildren = folder?.mutableArrayValue(forKey: "children") as? NSMutableArray {
-                    mutableChildren.add(bookmark)
-                }
+                folder?.children.append(bookmark)
             }
         }
     }

PDF Office/PDF Master/Class/PDFTools/KMBookmark/Controller/KMBookmarkSheetController.swift

@@ -18,7 +18,12 @@ class KMBookmarkSheetController: NSWindowController {
     var cancelAction: KMBookmarkSheetControllerCancelAction?
     
     var type: KMBookmarkType = .bookmark
-
+    var stringValue: String = "" {
+        didSet {
+            self.bookmarkSheetView?.bookmarkTextField.stringValue = stringValue
+        }
+    }
+    
     static func showBookmarkSheetController(type: KMBookmarkType) -> KMBookmarkSheetController {
         let controller = KMBookmarkSheetController.init(windowNibName: "KMBookmarkSheetController")
         
@@ -30,6 +35,7 @@ class KMBookmarkSheetController: NSWindowController {
     
     override func windowDidLoad() {
         self.bookmarkSheetView.type = type
+        self.bookmarkSheetView.bookmarkTextField.stringValue = stringValue
         self.bookmarkSheetView.cancelAction = { [unowned self] view, type in
             self.cancelAction?(self, type)
             self.window?.close()
@@ -37,6 +43,7 @@ class KMBookmarkSheetController: NSWindowController {
         
         self.bookmarkSheetView.doneAction = { [unowned self] view, type, label in
             self.doneAction?(self, type, label)
+            self.window?.close()
         }
     }