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

🐛 Incorrect results for database rollup field filtering https://github.com/siyuan-note/siyuan/issues/15608

Browse source
This commit is contained in:
Daniel 2025-08-22 16:00:43 +08:00
parent fa7ec5ab95
commit 312be8a019
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 34 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/attribute_view.go
View file

@ -1534,28 +1534,7 @@ func GetBlockAttributeViewKeys(nodeID string) (ret []*BlockAttributeViewKeys) {
}
}
kv.Values[0].Rollup.Contents = nil
for _, bID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID)
if nil != furtherCollection && av.KeyTypeTemplate == destKey.Type {
destVal = furtherCollection.GetValue(bID, destKey.ID)
}
if nil == destVal {
if destAv.ExistItem(bID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
destVal = av.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.Rollup.KeyID, bID, destKey.Type)
}
if nil == destVal {
continue
}
}
if av.KeyTypeNumber == destKey.Type {
destVal.Number.Format = destKey.NumberFormat
destVal.Number.FormatNumber()
}
kv.Values[0].Rollup.Contents = append(kv.Values[0].Rollup.Contents, destVal.Clone())
}
kv.Values[0].Rollup.Contents = av.GetRollupContents(destAv, destKey, relVal.Relation.BlockIDs, furtherCollection)
kv.Values[0].Rollup.RenderContents(kv.Key.Rollup.Calc, destKey)
}
}