修补

ming1016 · Mar 13, 2024 · 20eba9c · 20eba9c
1 parent 2bfd014
commit 20eba9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift
@@ -29,6 +29,9 @@ struct InfoListView: View {
                         Menu("Sort", systemImage: "tag") {
 
                             Picker("分类", selection: $filterCate) {
+                                Text("全部")
+                                    .tag("")
+
                                 ForEach(cates) { cate in
                                     Text(cate.name)
                                         .tag(cate.name)
@@ -71,6 +74,8 @@ struct InfoListView: View {
                     ToolbarItem(placement: .navigation) {
                         Menu("Sort", systemImage: "tag") {
                             Picker("分类", selection: $filterCate) {
+                                Text("全部")
+                                    .tag("")
                                 ForEach(cates) { cate in
                                     Text(cate.name)
                                         .tag(cate.name)

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfosFilterWithCateView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfosFilterWithCateView.swift
@@ -22,7 +22,7 @@ struct InfosFilterWithCateView: View {
                 info.category?.name == filterCateName
             }
         }, sortBy: sortOrder)
-        fd.fetchLimit = 1000
+        fd.fetchLimit = 10000
         _infos = Query(fd)
 
         self._selectInfo = selectInfo

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift
@@ -23,7 +23,7 @@ struct InfosView: View {
                  || info.des.localizedStandardContains(searchString)
             }
         }, sortBy: sortOrder)
-        fd.fetchLimit = 1000
+        fd.fetchLimit = 10000
         _infos = Query(fd)
 
         self._selectInfo = selectInfo

diff --git a/SwiftPamphletApp/InfoOrganizer/Model/InfoDataModel.swift b/SwiftPamphletApp/InfoOrganizer/Model/InfoDataModel.swift
@@ -13,7 +13,7 @@ final class IOInfo {
     var name: String = ""
     var url: String = ""
     var des: String = ""
-    var category: IOCategory?
+    var category: IOCategory? = nil// 关系字段，链接 IOCategory
 
     var createDate: Date = Date.now
     var updateDate: Date = Date.now
@@ -43,7 +43,7 @@ final class IOInfo {
 @Model
 class IOCategory {
     var name: String = ""
-    var infos: [IOInfo]? = [IOInfo]()
+    var infos: [IOInfo]? = [IOInfo]() // 关系字段，链接 IOInfo
 
     var createDate: Date = Date.now
     var updateDate: Date = Date.now
@@ -58,7 +58,7 @@ class IOCategory {
     }
 
     static var all: FetchDescriptor<IOCategory> {
-        var fd = FetchDescriptor(sortBy: [SortDescriptor(\IOCategory.updateDate, order: .reverse)])
+        let fd = FetchDescriptor(sortBy: [SortDescriptor(\IOCategory.updateDate, order: .reverse)])
         return fd
     }