修复书签问题

ming1016 · Nov 19, 2024 · 241220a · 241220a
1 parent 5139425
commit 241220a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 45 deletions.
diff --git a/SwiftPamphletApp/Guide/Bookmark/View/BookmarkListView.swift b/SwiftPamphletApp/Guide/Bookmark/View/BookmarkListView.swift
@@ -12,32 +12,24 @@ struct BookmarkListView: View {
     @Environment(\.modelContext) var modelContext
     @Query(BookmarkModel.all) var bms: [BookmarkModel]
 //    var bms: [BookmarkModel] = [BookmarkModel]() // 测试空数据用
+    @Binding var selectedItem: L?
     @State private var limit: Int = 50
     @State private var trigger = false
     var body: some View {
-        List {
+        List(selection: $selectedItem) {
             ForEach(bms) { bm in
-                NavigationLink(
-                    destination: GuideDetailView(
-                        t: bm.name,
-                        icon: bm.icon,
-                        plName: bm.pamphletName,
-                        limit: $limit,
-                        trigger: $trigger
-                    )
-                ) {
-                    HStack {
-                        if bm.icon.isEmpty == false {
-                            Image(systemName: bm.icon)
-                                .foregroundStyle(Color.secondary)
-                        }
-                        Text(bm.name)
-                        Spacer()
-                        Image(systemName: "bookmark")
-                            .foregroundStyle(.secondary)
-                            .font(.footnote)
+                HStack {
+                    if bm.icon.isEmpty == false {
+                        Image(systemName: bm.icon)
+                            .foregroundStyle(Color.secondary)
                     }
+                    Text(bm.name)
+                    Spacer()
+                    Image(systemName: "bookmark")
+                        .foregroundStyle(.secondary)
+                        .font(.footnote)
                 }
+                .tag(L(t: bm.name, icon: bm.icon))
                 .contextMenu {
                     Button("前移") {
                         bm.updateDate = Date.now

diff --git a/SwiftPamphletApp/Guide/View/GuideListView.swift b/SwiftPamphletApp/Guide/View/GuideListView.swift
@@ -13,7 +13,7 @@ struct GuideListView: View {
     @Query(BookmarkModel.all) var bookmarks: [BookmarkModel]
     @State private var apBookmarks: [String] = [String]()
     @State var listModel: GuideListModel
-    @Binding var selectedItem: L? // 改为 L? 类型
+    @Binding var selectedItem: L?
     @AppStorage(SPC.expandedGuideItems) private var expandedItemsString: String = ""
     @State private var expandedItems: Set<String> = []
 

diff --git a/SwiftPamphletApp/HomeUI/DataLink.swift b/SwiftPamphletApp/HomeUI/DataLink.swift
@@ -128,9 +128,17 @@ struct DataLink: Identifiable {
         case "书签":
             switch type {
             case .content:
-                BookmarkListView()
+                BookmarkListView(selectedItem: selectGuideItem)
             case .detail:
-                IntroView()
+                if let item = selectGuideItemBindable {
+                    GuideDetailView(
+                        t: item.t,
+                        icon: item.icon,
+                        plName: "ap",
+                        limit: limit,
+                        trigger: trigger
+                    )
+                }
             }
         default:
             switch type {

diff --git a/SwiftPamphletApp/HomeUI/HomeView.swift b/SwiftPamphletApp/HomeUI/HomeView.swift
@@ -52,28 +52,18 @@ struct HomeView: View {
             }
         } detail: {
             if !selectedDataLinkString.isEmpty {
-                if selectedDataLinkString == "Apple技术", let item = selectedGuideItem {
-                    GuideDetailView(
-                        t: item.t,
-                        icon: item.icon,
-                        plName: "ap",
-                        limit: $limit,
-                        trigger: $trigger
-                    )
-                } else {
-                    DataLink.viewToShow(
-                        for: selectedDataLinkString,
-                        selectInfo: $selectInfo,
-                        selectDev: $selectDev,
-                        selectInfoBindable: selectInfo,
-                        selectDevBindable: selectDev,
-                        selectGuideItem: $selectedGuideItem,
-                        selectGuideItemBindable: selectedGuideItem,
-                        limit: $limit,
-                        trigger: $trigger,
-                        type: .detail
-                    )
-                }
+                DataLink.viewToShow(
+                    for: selectedDataLinkString,
+                    selectInfo: $selectInfo,
+                    selectDev: $selectDev,
+                    selectInfoBindable: selectInfo,
+                    selectDevBindable: selectDev,
+                    selectGuideItem: $selectedGuideItem,
+                    selectGuideItemBindable: selectedGuideItem,
+                    limit: $limit,
+                    trigger: $trigger,
+                    type: .detail
+                )
             } else {
                 IntroView()
             }