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

🎨 Improve database template empty date rendering https://github.com/siyuan-note/siyuan/issues/10830

Browse source
This commit is contained in:
Daniel 2024-04-02 20:24:10 +08:00
parent e12ed21c65
commit 6eb52835da
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/model/attribute_view.go
View file

@ -808,9 +808,13 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
if 0 < len(rowValue.Values) {
v := rowValue.Values[0]
if av.KeyTypeNumber == v.Type {
dataModel[rowValue.Key.Name] = v.Number.Content
if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = v.Number.Content
}
} else if av.KeyTypeDate == v.Type {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
if nil != v.Date && v.Date.IsNotEmpty {
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 {
// 模板使用汇总时支持数字计算

8
kernel/treenode/node.go
View file

@ -1078,9 +1078,13 @@ func renderTemplateCol(ial map[string]string, rowValues []*av.KeyValues, tplCont
if 0 < len(rowValue.Values) {
v := rowValue.Values[0]
if av.KeyTypeNumber == v.Type {
dataModel[rowValue.Key.Name] = v.Number.Content
if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = v.Number.Content
}
} else if av.KeyTypeDate == v.Type {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
if nil != v.Date && v.Date.IsNotEmpty {
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 {
// 汇总数字时仅取第一个数字填充模板