Browse Source

【fix】【测量】小窗时,点击更多中的测量按钮,必现崩溃

tangchao 6 months ago
parent
commit
6faf09621c

+ 4 - 4
PDF Office/PDF Master/Class/Common/Tools/KMAlertTool.swift

@@ -89,10 +89,10 @@ class KMAlertTool: NSObject {
         }
         
         // 参数有效性检查
-        guard !buttons.isEmpty else {
-            assertionFailure("Buttons array should not be empty")
-            return .abort
-        }
+//        guard !buttons.isEmpty else {
+//            assertionFailure("Buttons array should not be empty")
+//            return .abort
+//        }
         
         let alert = NSAlert()
         alert.alertStyle = style

+ 8 - 8
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -2259,7 +2259,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(_itemAction)
             
-            let menuItem = NSMenuItem.init(title: "Bates Number", action: #selector(_menuItemAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Compare", comment: ""), action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Side-by-Side View", comment: ""), action: #selector(_comparisonAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Compare by File Overlay", comment: ""), action: #selector(_comparisonAction), target: self, tag: 2)
@@ -2275,7 +2275,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(batesMenuAction)
             
-            let menuItem = NSMenuItem.init(title: "Bates Numbers", action: #selector(batesMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: "Bates Numbers", action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Add Bates Numbers", comment: ""), action: #selector(_batesAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Remove Bates Numbers", comment: ""), action: #selector(_batesAction), target: self, tag: 2)
@@ -2292,7 +2292,7 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageExpandLeft
             item?.needExpandAction = true
             
-            let menuItem = NSMenuItem.init(title: "AI Tools", action: #selector(batesMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: "AI Tools", action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("AI Summarize", comment: ""), action: #selector(_AIAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("AI Rewrite", comment: ""), action: #selector(_AIAction), target: self, tag: 2)
@@ -2311,7 +2311,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(headerfooterMenuAction)
             
-            let menuItem = NSMenuItem.init(title: "Header & Footer", action: #selector(headerfooterMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: "Header & Footer", action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Add Header & Footer", comment: ""), action: #selector(_headerfooterAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Remove Header & Footer", comment: ""), action: #selector(_headerfooterAction), target: self, tag: 2)
@@ -2330,7 +2330,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(backgroundMenuAction)
             
-            let menuItem = NSMenuItem.init(title: "Background", action: #selector(backgroundMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: "Background", action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Add Background", comment: ""), action: #selector(_backgroundAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Remove Background", comment: ""), action: #selector(_backgroundAction), target: self, tag: 2)
@@ -2349,7 +2349,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(watermarkMenuAction)
             
-            let menuItem = NSMenuItem.init(title: "Watermark", action: #selector(watermarkMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: "Watermark", action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Add Watermark", comment: ""), action: #selector(_watermarkAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Remove Watermark", comment: ""), action: #selector(_watermarkAction), target: self, tag: 2)
@@ -2375,7 +2375,7 @@ extension KMToolbarViewController {
             item?.needExpandAction = true
 //            item?.btnAction = #selector(secureMenuAction)
             
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("Security", comment: ""), action: #selector(secureMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Security", comment: ""), action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Set Passwords", comment: ""), action: #selector(_secureAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Remove Security", comment: ""), action: #selector(_secureAction), target: self, tag: 2)
@@ -2395,7 +2395,7 @@ extension KMToolbarViewController {
             item?.titleName = NSLocalizedString("Measure", comment: "")
             item?.boxImagePosition = .imageExpandLeft
             item?.needExpandAction = true
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("Measure", comment: ""), action: #selector(measureMenuAction), target: self)
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Measure", comment: ""), action: nil, target: self)
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("Line", comment: ""), action: #selector(_measureAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("Multilines", comment: ""), action: #selector(_measureAction), target: self, tag: 2)