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

🎨 Improve database template field to use relation/rollup field Fix https://github.com/siyuan-note/siyuan/issues/11029

Browse source
This commit is contained in:
Daniel 2024-04-14 21:26:02 +08:00
parent 077944bb43
commit 1ae39777a6
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/treenode/node.go
View file

@ -1050,9 +1050,30 @@ func renderTemplateCol(ial map[string]string, rowValues []*av.KeyValues, tplCont
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
} }
} else if av.KeyTypeRollup == v.Type { } else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) && av.KeyTypeNumber == v.Rollup.Contents[0].Type { if 0 < len(v.Rollup.Contents) {
// 汇总数字时仅取第一个数字填充模板 var numbers []float64
dataModel[rowValue.Key.Name] = v.Rollup.Contents[0].Number.Content 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) {
dataModel[rowValue.Key.Name] = numbers
} else {
dataModel[rowValue.Key.Name] = contents
}
}
} 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 { } else {
dataModel[rowValue.Key.Name] = v.String(true) dataModel[rowValue.Key.Name] = v.String(true)