fix 首次快捷键失效问题

ming1016 · Apr 22, 2024 · d4e10f7 · d4e10f7
1 parent be59f85
commit d4e10f7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift
@@ -74,7 +74,6 @@ struct InfoListView: View {
                         } label: {
                             Text("检索重置")
                         }
-                        .keyboardShortcut(KeyEquivalent("d"), modifiers: .command)
                     }
                 }
                 ToolbarItem(placement: .primaryAction) {
@@ -95,6 +94,20 @@ struct InfoListView: View {
                     })
                     .disabled(modelContext.undoManager?.canRedo == false)
                 }
+                if searchText != "" || filterCate != "" {
+                    ToolbarItem(placement: .primaryAction) {
+                        Button {
+                            searchText = ""
+                            filterCate = ""
+                        } label: {
+                            Image(systemName: "xmark.circle")
+                            Text("检索")
+                        }
+                        .help("CMD + d")
+                        .keyboardShortcut(KeyEquivalent("d"), modifiers: .command)
+                    }
+                }
+
             }
             .searchable(text: $searchText)
             .onAppear {
@@ -116,7 +129,7 @@ struct InfoListView: View {
         })
         .sheet(isPresented: $showSheet, content: {
             Text("选择一个检索词")
-                .font(.title).bold().padding(10)
+                .font(.title).bold().padding(EdgeInsets(top: 10, leading: 0, bottom: 0, trailing: 0))
             ScrollView(.vertical) {
                 ForEach(parseSearchTerms(), id: \.self) { term in
                     HStack {

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoRowView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoRowView.swift
@@ -49,9 +49,6 @@ struct InfoRowView: View {
                 if info.category != nil {
                     Text(info.category?.name ?? "")
                         .padding(4)
-//                        .background(.tertiary)
-//                        .clipShape(.rect(cornerRadius: 4))
-//                        .foregroundColor(.white)
                         .overlay {
                                 RoundedRectangle(cornerRadius: 4)
                                     .stroke(lineWidth: 1)

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift
@@ -15,7 +15,9 @@ struct InfosView: View {
     @Binding var limit: Int
 
     init(filterCateName: String = "", searchString: String = "", filterStar: Bool = false ,selectInfo: Binding<IOInfo?>, sortOrder: [SortDescriptor<IOInfo>] = [], limit: Binding<Int>) {
+
         var fd = FetchDescriptor<IOInfo>(predicate: #Predicate { info in
+
             if !filterCateName.isEmpty && !searchString.isEmpty {
                 (info.name.localizedStandardContains(searchString)
                 || info.url.localizedStandardContains(searchString)
@@ -29,6 +31,7 @@ struct InfosView: View {
                 || info.url.localizedStandardContains(searchString)
                  || info.des.localizedStandardContains(searchString)
             }
+
         }, sortBy: sortOrder)
         fd.fetchLimit = limit.wrappedValue
         _infos = Query(fd)