检索可注释掉

ming1016 · Apr 11, 2024 · 0f5a7df · 0f5a7df
1 parent 9d617d3
commit 0f5a7df
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 9 deletions.
diff --git a/SwiftPamphletApp/HomeUI/DataLink.swift b/SwiftPamphletApp/HomeUI/DataLink.swift
@@ -74,12 +74,12 @@ struct DataLink: Identifiable {
 
 extension DataLink {
     static var dataLinks = [
-        DataLink(title: "Github", imageName: "", children: [
-            DataLink(title: "开发/仓库", imageName: "p5"),
-        ]),
         DataLink(title: "资料", imageName: "", children: [
             DataLink(title: "资料整理", imageName: "p11")
         ]),
+        DataLink(title: "Github", imageName: "", children: [
+            DataLink(title: "开发/仓库", imageName: "p5"),
+        ]),
         DataLink(title: "Swift指南", imageName: "", children: [
             DataLink(title: "语法速查", imageName: "p23"),
             DataLink(title: "特性", imageName: "p10"),

diff --git a/SwiftPamphletApp/InfoOrganizer/Category/EditCustomSearchView.swift b/SwiftPamphletApp/InfoOrganizer/Category/EditCustomSearchView.swift
@@ -12,7 +12,7 @@ struct EditCustomSearchView: View {
 
     var body: some View {
         VStack {
-            Text("自定义的搜索关键字，以换行作为间隔")
+            Text("自定检索，换行间隔，同行逗号间隔")
             TextEditor(text: $term)
                 .overlay {
                     Rectangle()

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift b/SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift
@@ -206,6 +206,13 @@ struct EditInfoView: View {
                                                             } label: {
                                                                 Label("设为封面图", image: "doc.text.image")
                                                             }
+                                                            Button {
+                                                                let p = NSPasteboard.general
+                                                                p.declareTypes([.string], owner: nil)
+                                                                p.setString(img.url, forType: .string)
+                                                            } label: {
+                                                                Label("复制图片链接", image: "circle")
+                                                            }
                                                             Button {
                                                                 info.imgs?.remove(at: i)
                                                                 IOImg.delete(img)
@@ -229,6 +236,13 @@ struct EditInfoView: View {
                                                 } label: {
                                                     Label("设为封面图", image: "doc.text.image")
                                                 }
+                                                Button {
+                                                    let p = NSPasteboard.general
+                                                    p.declareTypes([.string], owner: nil)
+                                                    p.setString(img, forType: .string)
+                                                } label: {
+                                                    Label("复制图片链接", image: "circle")
+                                                }
                                             }
                                         }
                                     }

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift
@@ -117,9 +117,18 @@ struct InfoListView: View {
         searchTerms = [String]()
         for t in terms {
             if t.isEmpty == false {
-                searchTerms.append(String(t))
-            }
-        }
+                let tWithoutWhitespaces = t.trimmingCharacters(in: .whitespaces)
+                if tWithoutWhitespaces.hasPrefix("//") { continue }
+                let ts = t.trimmingCharacters(in: .whitespaces).split(separator: ",")
+                if ts.count > 1 {
+                    for oneT in ts {
+                        searchTerms.append(String(oneT.trimmingCharacters(in: .whitespaces)))
+                    }
+                } else {
+                    searchTerms.append(String(tWithoutWhitespaces))
+                }
+            } // end if
+        } // end for
     }
     func customSearchLabel(_ string: String) -> String {
         let strs = string.split(separator: "/")

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoRowView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoRowView.swift
@@ -35,8 +35,14 @@ struct InfoRowView: View {
                     }
 
                 }
-                Text(info.name)
-                    .fixedSize(horizontal: false, vertical: true)
+                VStack(alignment: .leading) {
+                    Text(info.name)
+                        .fixedSize(horizontal: false, vertical: true)
+                    Text(shortDes())
+                        .fixedSize(horizontal: false, vertical: true)
+                        .font(.footnote)
+                        .foregroundColor(light: .secondary, dark: .secondary)
+                }
             }
 
 
@@ -82,6 +88,14 @@ struct InfoRowView: View {
         }
     }
 
+    func shortDes() -> String {
+        let shortDes = info.des.trimmingCharacters(in: .whitespacesAndNewlines).split(separator: "\n")
+        if let re = shortDes.first {
+            return String(re)
+        }
+        return ""
+    }
+
 }