Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-23 15:34:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-08-13 18:17:30 +08:00
commit 085c72add5
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/attribute_view.go
View file

@ -3083,7 +3083,10 @@ func fillDefaultValue(attrView *av.AttributeView, view, groupView *av.View, prev
keyValues.Values = append(keyValues.Values, newValue)
} else {
newValueRaw := newValue.GetValByType(keyValues.Key.Type)
existingVal.SetValByType(keyValues.Key.Type, newValueRaw)
if av.KeyTypeBlock != existingVal.Type || (av.KeyTypeBlock == existingVal.Type && existingVal.IsDetached) {
// 非主键的值直接覆盖，主键的值只覆盖非绑定块
existingVal.SetValByType(keyValues.Key.Type, newValueRaw)
}
}
}
}