Ver código fonte

【2025】【BOTA】大纲、书签menu菜单问题

dinglingui 1 mês atrás
pai
commit
d4b4893904

+ 1 - 14
PDF Office/PDF Master/KMClass/Left/Bookmark/Controller/KMBookMarkViewController.swift

@@ -115,7 +115,6 @@ class KMBookMarkViewController: KMNBotaBaseViewController {
                 }
 
                 self.menuGroupView_ = ComponentGroup.createFromNib(in: ComponentLibrary.shared.componentBundle())
-                self.menuGroupView_?.clickedAutoHide = false
                 self.menuGroupView_?.groupDelegate = self
                 self.menuGroupView_?.frame = CGRectMake(0, 0, 180, viewHeight)
                 self.menuGroupView_?.updateGroupInfo(menuItemArr)
@@ -637,7 +636,6 @@ extension KMBookMarkViewController : NSTableViewDelegate,NSTableViewDataSource {
                 }
 
                 if self?.groupView != nil {
-                    self?.groupView?.clickedAutoHide = false
                     self?.groupView?.groupDelegate = self
                     self?.groupView?.frame = CGRectMake(0, 0, 180, viewHeight)
                     self?.groupView?.updateGroupInfo(menuItemArr)
@@ -863,7 +861,6 @@ extension KMBookMarkViewController: ComponentGroupDelegate {
         if group == groupView {
             if let selItem = menuItemProperty {
                 if selItem.text == KMLocalizedString("Delete") {
-                    group?.removeFromSuperview()
                     var pageIndexs = IndexSet()
                     for i in bookTableView.selectedRowIndexes {
                         guard let item = dataSource.safe_element(for: i) as? KMBookmarkItem else {
@@ -875,8 +872,6 @@ extension KMBookMarkViewController: ComponentGroupDelegate {
                     }
                     _ = handdler.removeBookmarks(for: pageIndexs)
                 } else if selItem.text == KMLocalizedString("Rename") {
-                    group?.removeFromSuperview()
-                    
                     renameBookAction()
                 } else if selItem.text == KMLocalizedString("Setting Destination") {
                    changeLocationAction()
@@ -906,12 +901,8 @@ extension KMBookMarkViewController: ComponentGroupDelegate {
             }
             let idx = group?.menuItemArr.firstIndex(of: menuI)
             if idx == 0 {
-                group?.removeFromSuperview()
-                
                 addBookmarkAction(addButton_)
             } else if idx == 1 {
-                group?.removeFromSuperview()
-                
                 var indexs = IndexSet()
                 for (i, _) in dataSource.enumerated() {
                     indexs.insert(i)
@@ -921,17 +912,13 @@ extension KMBookMarkViewController: ComponentGroupDelegate {
                     didSelectItem(row: i, event: nil)
                 }
             } else if idx == 2 {
-                group?.removeFromSuperview()
-                
                 deleteBookAction()
             }
         }
     }
     
     func componentGroupDidDismiss(group: ComponentGroup?) {
-        if group == groupView {
-            groupView?.removeFromSuperview()
-        } else if group == searchGroupView {
+         if group == searchGroupView {
             searchGroupTarget?.properties.state = .normal
             searchGroupTarget?.reloadData()
             searchGroupTarget = nil

+ 2 - 9
PDF Office/PDF Master/KMClass/Left/Outline/Controller/KMOutlineViewController.swift

@@ -276,7 +276,6 @@ class KMOutlineViewController: KMNBotaBaseViewController {
         }
         
         if menuGroupView_ != nil {
-            menuGroupView_?.clickedAutoHide = false
             menuGroupView_?.groupDelegate = self
             menuGroupView_?.frame = CGRectMake(0, 0, 180, viewHeight)
             menuGroupView_?.updateGroupInfo(menuItemArr)
@@ -1108,14 +1107,12 @@ extension KMOutlineViewController: ComponentDropdownDelegate {
 extension KMOutlineViewController: ComponentGroupDelegate {
     func componentGroupDidDismiss(group: ComponentGroup?) {
         if group == groupView_ {
-            removeGroupView()
+            moreDropdown_.properties.state = .normal
+            moreDropdown_.reloadData()
         } else if group == menuGroupView_ {
-            group?.removeFromSuperview()
-            menuGroupView_ = nil
         } else if group == searchGroupView {
             searchGroupTarget?.properties.state = .normal
             searchGroupTarget?.reloadData()
-            searchGroupTarget = nil
         }
     }
     
@@ -1143,8 +1140,6 @@ extension KMOutlineViewController: ComponentGroupDelegate {
                 } else if index == 4 {
                     deleteItemAction()
                 } else if index == 6 {
-                    group?.removeFromSuperview()
-                    
                     editItemAction()
                 } else if index == 7 {
                     renameItemAction()
@@ -1155,8 +1150,6 @@ extension KMOutlineViewController: ComponentGroupDelegate {
                 } else if index == 11 {
                     demoteItemAction()
                 }
-                
-                group?.removeFromSuperview()
             }
         } else if group == searchGroupView {
             guard let menuI = menuItemProperty else {