github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-12 23:21:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-03-31 23:41:19 +08:00
commit 228acbf1dd
3 changed files with 13 additions and 0 deletions
Show Stats 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()
} }

1
kernel/model/search.go
View File

@ -424,6 +424,7 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
if 0 != groupBy { if 0 != groupBy {
// 按文档分组后不支持替换 Need to be reminded that replacement operations are not supported after grouping by doc https://github.com/siyuan-note/siyuan/issues/10161 // 按文档分组后不支持替换 Need to be reminded that replacement operations are not supported after grouping by doc https://github.com/siyuan-note/siyuan/issues/10161
// 因为分组条件传入以后搜索只能命中文档块，会导致 全部替换 失效
err = errors.New(Conf.Language(221)) err = errors.New(Conf.Language(221))
return return
} }

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()
} }