0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 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 13:02:06 +08:00
parent bf4ad0972b
commit 077944bb43
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
kernel/model/attribute_view.go
View file

@ -905,11 +905,30 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
}
} else if av.KeyTypeRollup == v.Type {
if 0 < len(v.Rollup.Contents) && av.KeyTypeNumber == v.Rollup.Contents[0].Type {
// 模板使用汇总时支持数字计算
// Template supports numerical calculations when using rollup https://github.com/siyuan-note/siyuan/issues/10810
// 汇总数字时仅取第一个数字填充模板
dataModel[rowValue.Key.Name] = v.Rollup.Contents[0].Number.Content
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) {
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 {
dataModel[rowValue.Key.Name] = v.String(true)