fix
This commit is contained in:
parent
070f928d88
commit
505bf5f3ff
@ -17,7 +17,7 @@ struct DateNavView: View {
|
|||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .center) {
|
VStack(alignment: .center) {
|
||||||
ForEach(navModel.dateModels, id: \.year) { model in
|
ForEach(navModel.dateModels) { model in
|
||||||
VStack(alignment: .leading, spacing: 10) {
|
VStack(alignment: .leading, spacing: 10) {
|
||||||
Text(model.year)
|
Text(model.year)
|
||||||
HStack {
|
HStack {
|
||||||
@ -35,6 +35,9 @@ struct DateNavView: View {
|
|||||||
.task {
|
.task {
|
||||||
await self.navModel.loadDateCells()
|
await self.navModel.loadDateCells()
|
||||||
}
|
}
|
||||||
|
.onAppear {
|
||||||
|
print("group_id is: \(selectGroupId)")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -90,15 +93,21 @@ extension DateNavView {
|
|||||||
@Observable
|
@Observable
|
||||||
final class DateNavModel {
|
final class DateNavModel {
|
||||||
|
|
||||||
struct DateModel: Codable {
|
struct DateModel: Codable, Identifiable {
|
||||||
struct Month: Codable {
|
struct Month: Codable {
|
||||||
let id: String
|
let id: String
|
||||||
let name: String
|
let name: String
|
||||||
let disabled: Bool
|
let disabled: Bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let id = UUID().uuidString
|
||||||
let year: String
|
let year: String
|
||||||
let months: [Month]
|
let months: [Month]
|
||||||
|
|
||||||
|
enum CodingKeys: String, CodingKey {
|
||||||
|
case year
|
||||||
|
case months
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var dateModels: [DateModel]
|
var dateModels: [DateModel]
|
||||||
|
|||||||
@ -154,8 +154,9 @@ struct IndexView: View {
|
|||||||
case .group(let group):
|
case .group(let group):
|
||||||
Text(group.groupName)
|
Text(group.groupName)
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
showDateNavPopover = true
|
|
||||||
selectGroupId = group.groupId
|
selectGroupId = group.groupId
|
||||||
|
print("current group_id: \(self.selectGroupId)")
|
||||||
|
showDateNavPopover = true
|
||||||
}
|
}
|
||||||
case .item(let item):
|
case .item(let item):
|
||||||
VStack(alignment: .center) {
|
VStack(alignment: .center) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user