소스 검색

【文字图片编辑】退出编辑模式 自动保存

lizhe 1 년 전
부모
커밋
e836b27de1

+ 3 - 2
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -35,7 +35,7 @@ extension CAnnotationType {
     @objc optional func showPDFViewPrintViewController()
     @objc optional func showPDFViewPrintViewController()
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, zoomModel selectedTag:Int)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, zoomModel selectedTag:Int)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, zoomSting : String)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, zoomSting : String)
-    @objc optional func mainToolDidClicked(_ toolController: KMToolbarController, _ type: KMToolbarViewType, _ item: KMToolBoxItem, _ pages: [Int])
+    @objc optional func mainToolDidClicked(_ toolController: KMToolbarController, _ beforeType: KMToolbarViewType, _ type: KMToolbarViewType, _ item: KMToolBoxItem, _ pages: [Int])
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareDocument item:NSMenuItem)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareDocument item:NSMenuItem)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareFlatten item:NSMenuItem)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareFlatten item:NSMenuItem)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareOriginalPDF item:NSMenuItem)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, shareOriginalPDF item:NSMenuItem)
@@ -543,6 +543,7 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
     }
     }
     
     
     func toolbarViewController(_ viewController: KMToolbarViewController, clickMode toolMode: KMToolbarViewType, toolbar toolbarItem: KMToolBoxItem, _ pages: [Int]) {
     func toolbarViewController(_ viewController: KMToolbarViewController, clickMode toolMode: KMToolbarViewType, toolbar toolbarItem: KMToolBoxItem, _ pages: [Int]) {
+        let beforeModel = KMToolbarViewType(rawValue: self.lastItemBox.clickButton.tag) ?? .None
         if self.lastItemBox != nil {
         if self.lastItemBox != nil {
             if (toolbarItem.isSelected && toolMode.isToolMode()) {
             if (toolbarItem.isSelected && toolMode.isToolMode()) {
                 // no nothings
                 // no nothings
@@ -581,7 +582,7 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
         }
         }
         self.toolbarType = toolMode
         self.toolbarType = toolMode
         
         
-        self.delegate?.mainToolDidClicked?(self, toolMode, toolbarItem, pages)
+        self.delegate?.mainToolDidClicked?(self, beforeModel, toolMode, toolbarItem, pages)
     }
     }
     
     
     func toolbarViewController(_ viewController: KMToolbarViewController, rightPanel toolbarItem: KMToolBoxItem) {
     func toolbarViewController(_ viewController: KMToolbarViewController, rightPanel toolbarItem: KMToolBoxItem) {

+ 8 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2043,8 +2043,15 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         // 0 : Scan  1:OCR Text
         // 0 : Scan  1:OCR Text
     }
     }
     
     
-    func mainToolDidClicked(_ toolController: KMToolbarController, _ type: KMToolbarViewType, _ item: KMToolBoxItem , _ pages: [Int]) {
+    func mainToolDidClicked(_ toolController: KMToolbarController, _ beforeType: KMToolbarViewType, _ type: KMToolbarViewType, _ item: KMToolBoxItem , _ pages: [Int]) {
         print("mainToolDidClicked")
         print("mainToolDidClicked")
+        
+        if beforeType == .editPDF {
+            self.asyncSaveDocument { params in
+                
+            }
+        }
+        
         if(type != .Page) {
         if(type != .Page) {
             if (hasEnterPageEdit()) {
             if (hasEnterPageEdit()) {
                 self.exitPageEdit()
                 self.exitPageEdit()