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

🎨 Template supports numerical calculations when using rollup https://github.com/siyuan-note/siyuan/issues/10810

Browse source
This commit is contained in:
Daniel 2024-03-31 23:32:00 +08:00
parent 5e7d2341f4
commit c559ac45be
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/model/attribute_view.go
View file

@ -811,6 +811,13 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
dataModel[rowValue.Key.Name] = v.Number.Content dataModel[rowValue.Key.Name] = v.Number.Content
} else if av.KeyTypeDate == v.Type { } else if av.KeyTypeDate == v.Type {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) 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
}
} else { } else {
dataModel[rowValue.Key.Name] = v.String() dataModel[rowValue.Key.Name] = v.String()
} }

5
kernel/treenode/node.go
View file

@ -1081,6 +1081,11 @@ func renderTemplateCol(ial map[string]string, rowValues []*av.KeyValues, tplCont
dataModel[rowValue.Key.Name] = v.Number.Content dataModel[rowValue.Key.Name] = v.Number.Content
} else if av.KeyTypeDate == v.Type { } else if av.KeyTypeDate == v.Type {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) 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 {
// 汇总数字时仅取第一个数字填充模板
dataModel[rowValue.Key.Name] = v.Rollup.Contents[0].Number.Content
}
} else { } else {
dataModel[rowValue.Key.Name] = v.String() dataModel[rowValue.Key.Name] = v.String()
} }