支持web预览

Author: ming1016

SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift

@@ -21,6 +21,7 @@ struct EditInfoView: View {
     @State var cate:IOCategory? = nil
 
     @State var urlContent = ""
+    @State var selectedTab = 1
 
     var body: some View {
         VStack {
@@ -102,13 +103,27 @@ struct EditInfoView: View {
                     }
                 }
 
-                Section(footer: Text("支持 markdown 格式的文本")) {
+                Section(footer: Text("文本支持 markdown 格式")) {
                     // TODO: markdown 获取图片链接，并能显示
-                    TabView {
+                    TabView(selection: $selectedTab) {
                         TextEditor(text: $info.des)
                             .tabItem { Label("文本", systemImage: "circle") }
+                            .tag(1)
                         WebUIView(html: wrapperHtmlContent(content: MarkdownParser().html(from: info.des)), baseURLStr: "")
                             .tabItem { Label("预览", systemImage: "circle") }
+                            .tag(2)
+                        if !info.url.isEmpty {
+                            WebUIView(urlStr: info.url)
+                                .tabItem { Label("网页", systemImage: "circle") }
+                                .tag(3)
+                        }
+                    }
+                    .onChange(of: info.url) { oldValue, newValue in
+                        if newValue.isEmpty {
+                            selectedTab = 0
+                        } else {
+                            selectedTab = 3
+                        }
                     }
                 }
             } // end form

SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift

@@ -16,7 +16,7 @@ struct InfoListView: View {
 
     @Query(IOCategory.allOrderByName) var cates: [IOCategory]
     @State private var filterCate = ""
-    @State var limit: Int = 100
+    @State var limit: Int = 300
     @State var filterStar: Bool = false
 
     var body: some View {
@@ -33,7 +33,7 @@ struct InfoListView: View {
                             Text("全部")
                         }
                         .tag("")
-                        
+                        Divider()
                         ForEach(cates) { cate in
                             HStack {
                                 if cate.pin == 1 {

SwiftPamphletApp/InfoOrganizer/Info/InfoRowView.swift

@@ -10,6 +10,7 @@ import SwiftUI
 struct InfoRowView: View {
     @State var info: IOInfo
     let selectedInfo: IOInfo?
+    @State private var showAlert = false
 
     var infoColor: Color {
         selectedInfo == info ? Color.white : Color.accentColor
@@ -25,23 +26,40 @@ struct InfoRowView: View {
                     Text(info.category?.name ?? "")
                 }
                 Spacer()
+                
             }
             .foregroundColor(light: .secondary, dark: .secondary)
             Text(info.name)
+            HStack {
+                Text(dateString(date: info.updateDate))
+                    .font(.footnote)
+                Spacer()
+            }
+            .foregroundColor(light: .secondary, dark: .secondary)
         }
         .swipeActions {
             Button(role: .destructive) {
                 IOInfo.delete(info)
             } label: {
                 Label("删除", systemImage: "trash")
             }
+            
         }
         .contextMenu {
             Button("删除") {
                 IOInfo.delete(info)
             }
         }
     }
+    
+    func dateString(date: Date) -> String {
+        var re = ""
+        if date.year != Date.now.year {
+            re += date.year.description + "."
+        }
+        re += date.month.description + "." + date.day.description
+        return re
+    }
 }
 
 

SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift

@@ -45,7 +45,7 @@ struct InfosView: View {
                 .onAppear {
                     if info == infos.last {
                         if limit <= infos.count {
-                            limit += 100
+                            limit += 300
                         }
                     }
                 }