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

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

Browse source
This commit is contained in:
Vanessa 2024-03-20 22:52:16 +08:00
commit 19b307bfa4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/av/value.go
View file

@ -205,10 +205,6 @@ func (value *Value) IsEdited() bool {
return value.CreatedAt != value.UpdatedAt
}
func (value *Value) IsGenerated() bool {
return KeyTypeUpdated == value.Type || KeyTypeCreated == value.Type
}
func (value *Value) IsEmpty() bool {
switch value.Type {
case KeyTypeBlock:

1
kernel/model/attribute_view.go
View file

@ -367,6 +367,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
for _, blockValue := range destAv.GetBlockKeyValues().Values {
blocks[blockValue.BlockID] = blockValue
}
kv.Values[0].Relation.Contents = nil // 先清空 https://github.com/siyuan-note/siyuan/issues/10670
for _, bID := range kv.Values[0].Relation.BlockIDs {
kv.Values[0].Relation.Contents = append(kv.Values[0].Relation.Contents, blocks[bID])
}