Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 15:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Clean code

Browse source
This commit is contained in:
Daniel 2024-04-17 18:00:02 +08:00
parent bf1834fa61
commit cd10fcf8f0
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 78 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

76
kernel/model/attribute_view.go
View file

@ -894,50 +894,52 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
} }
for _, rowValue := range rowValues { for _, rowValue := range rowValues {
if 0 < len(rowValue.Values) { if 1 > len(rowValue.Values) {
v := rowValue.Values[0] continue
if av.KeyTypeNumber == v.Type { }
if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = v.Number.Content
}
} else if av.KeyTypeDate == v.Type {
if nil != v.Date {
if v.Date.IsNotEmpty {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
}
if v.Date.IsNotEmpty2 {
dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
}
}
} else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) {
var numbers []float64
var contents []string
for _, content := range v.Rollup.Contents {
if av.KeyTypeNumber == content.Type {
numbers = append(numbers, content.Number.Content)
} else {
contents = append(contents, content.String(true))
}
}
if 0 < len(numbers) { v := rowValue.Values[0]
dataModel[rowValue.Key.Name] = numbers if av.KeyTypeNumber == v.Type {
} else { if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = contents dataModel[rowValue.Key.Name] = v.Number.Content
} }
} else if av.KeyTypeDate == v.Type {
if nil != v.Date {
if v.Date.IsNotEmpty {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
} }
} else if av.KeyTypeRelation == v.Type { if v.Date.IsNotEmpty2 {
if 0 < len(v.Relation.Contents) { dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
var contents []string }
for _, content := range v.Relation.Contents { }
} else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) {
var numbers []float64
var contents []string
for _, content := range v.Rollup.Contents {
if av.KeyTypeNumber == content.Type {
numbers = append(numbers, content.Number.Content)
} else {
contents = append(contents, content.String(true)) contents = append(contents, content.String(true))
} }
}
if 0 < len(numbers) {
dataModel[rowValue.Key.Name] = numbers
} else {
dataModel[rowValue.Key.Name] = contents dataModel[rowValue.Key.Name] = contents
} }
} else {
dataModel[rowValue.Key.Name] = v.String(true)
} }
} else if av.KeyTypeRelation == v.Type {
if 0 < len(v.Relation.Contents) {
var contents []string
for _, content := range v.Relation.Contents {
contents = append(contents, content.String(true))
}
dataModel[rowValue.Key.Name] = contents
}
} else {
dataModel[rowValue.Key.Name] = v.String(true)
} }
} }

76
kernel/treenode/node.go
View file

@ -1039,50 +1039,52 @@ func renderTemplateCol(ial map[string]string, rowValues []*av.KeyValues, tplCont
} }
for _, rowValue := range rowValues { for _, rowValue := range rowValues {
if 0 < len(rowValue.Values) { if 1 > len(rowValue.Values) {
v := rowValue.Values[0] continue
if av.KeyTypeNumber == v.Type { }
if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = v.Number.Content
}
} else if av.KeyTypeDate == v.Type {
if nil != v.Date {
if v.Date.IsNotEmpty {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
}
if v.Date.IsNotEmpty2 {
dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
}
}
} else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) {
var numbers []float64
var contents []string
for _, content := range v.Rollup.Contents {
if av.KeyTypeNumber == content.Type {
numbers = append(numbers, content.Number.Content)
} else {
contents = append(contents, content.String(true))
}
}
if 0 < len(numbers) { v := rowValue.Values[0]
dataModel[rowValue.Key.Name] = numbers if av.KeyTypeNumber == v.Type {
} else { if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = contents dataModel[rowValue.Key.Name] = v.Number.Content
} }
} else if av.KeyTypeDate == v.Type {
if nil != v.Date {
if v.Date.IsNotEmpty {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
} }
} else if av.KeyTypeRelation == v.Type { if v.Date.IsNotEmpty2 {
if 0 < len(v.Relation.Contents) { dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
var contents []string }
for _, content := range v.Relation.Contents { }
} else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) {
var numbers []float64
var contents []string
for _, content := range v.Rollup.Contents {
if av.KeyTypeNumber == content.Type {
numbers = append(numbers, content.Number.Content)
} else {
contents = append(contents, content.String(true)) contents = append(contents, content.String(true))
} }
}
if 0 < len(numbers) {
dataModel[rowValue.Key.Name] = numbers
} else {
dataModel[rowValue.Key.Name] = contents dataModel[rowValue.Key.Name] = contents
} }
} else {
dataModel[rowValue.Key.Name] = v.String(true)
} }
} else if av.KeyTypeRelation == v.Type {
if 0 < len(v.Relation.Contents) {
var contents []string
for _, content := range v.Relation.Contents {
contents = append(contents, content.String(true))
}
dataModel[rowValue.Key.Name] = contents
}
} else {
dataModel[rowValue.Key.Name] = v.String(true)
} }
} }