chart

ming1016 · Mar 26, 2024 · a342635 · a342635
1 parent 70df848
commit a342635
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/SwiftPamphletApp/App/SwiftPamphletAppApp.swift b/SwiftPamphletApp/App/SwiftPamphletAppApp.swift
@@ -17,8 +17,8 @@ struct SwiftPamphletAppApp: App {
     var body: some Scene {
         WindowGroup {
 //            SwiftPamphletApp() // 老版本
-//            HomeView() // 新版本
-            PlayWeatherView()
+            HomeView() // 新版本
+//            PlayWeatherView()
                 .modelContainer(for: [IOInfo.self, DeveloperModel.self], isUndoEnabled: true)
 
         }

diff --git a/SwiftPamphletApp/InfoOrganizer/Category/CategoryListView.swift b/SwiftPamphletApp/InfoOrganizer/Category/CategoryListView.swift
@@ -22,25 +22,29 @@ struct CategoryListView: View {
                 }
             }
         }
-        ScrollView(.horizontal) {
-            Chart {
-                ForEach(cates) { cate in
-                    BarMark(
-                        x: .value("名字", cate.name),
-                        y: .value("数量", cate.infos?.count ?? 0)
-                    )
-                    .foregroundStyle(.orange)
-                    .symbol(.circle)
-                    .interpolationMethod(.catmullRom)
-                }
-            }
-            .chartXAxis {
-                AxisMarks(values: .automatic(minimumStride: 10)) { _ in
-                    AxisGridLine()
-                    AxisTick()
-
-                }
+        GroupBox("图表显示") {
+            Chart(cates) { cate in
+//                BarMark(
+//                    x: .value("数量", cate.infos?.count ?? 0),
+//                    y: .value("名字", cate.name)
+//                )
+//                .annotation(position: .overlay, alignment: .trailing, spacing: 3) {
+//                    Text("\(cate.infos?.count ?? 0)")
+//                        .font(.footnote)
+//                        .foregroundColor(light: .white, dark: .white)
+//                }
+                SectorMark(angle: .value("数量", cate.infos?.count ?? 0), innerRadius: .ratio(0.5),
+                           angularInset: 1.5)
+                    .foregroundStyle(by: .value("名字", cate.name))
+                    .annotation(position: .overlay, alignment: .trailing, spacing: 3) {
+                        Text("\(cate.infos?.count ?? 0)")
+                            .font(.footnote)
+                            .foregroundColor(light: .white, dark: .white)
+                    }
             }
+            .chartXAxis(.hidden)
+//            .chartYAxis(.hidden)
+//            .aspectRatio(1, contentMode: .fit)
         }
 
     }

diff --git a/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift b/SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift
@@ -19,7 +19,7 @@ struct InfosView: View {
             if !filterCateName.isEmpty && !searchString.isEmpty {
                 (info.name.localizedStandardContains(searchString)
                 || info.url.localizedStandardContains(searchString)
-                 || info.des.localizedStandardContains(searchString)) && info.category?.name == filterCateName && info.star == filterStar
+                 || info.des.localizedStandardContains(searchString)) && info.category?.name == filterCateName
             } else if !filterCateName.isEmpty {
                 info.category?.name == filterCateName
             } else if searchString.isEmpty {