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

🎨 Improve database field default filling https://github.com/siyuan-note/siyuan/issues/11966

Browse source
This commit is contained in:
Daniel 2025-08-12 10:59:14 +08:00
parent e103b5c2f0
commit 120b0c1e57
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/model/attribute_view.go
View file

@ -86,10 +86,6 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
}
nearItem := getNearItem(attrView, view, groupView, previousItemID)
filterKeyIDs := map[string]bool{}
for _, f := range view.Filters {
filterKeyIDs[f.Column] = true
}
// 对库中存在模板字段和汇总字段的情况进行处理（尽量从临近项获取新值，获取不到的话直接返回）
existSpecialField := false
@ -111,20 +107,30 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
}
}
filterKeyIDs := map[string]bool{}
for _, filter := range view.Filters {
filterKeyIDs[filter.Column] = true
keyValues, _ := attrView.GetKeyValues(filter.Column)
if nil == keyValues {
continue
}
var newValue *av.Value
if nil != nearItem {
// 存在临近项时优先通过临近项获取新值
newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
} else {
// 不存在临近项时通过过滤条件计算新值
switch keyValues.Key.Type {
case av.KeyTypeNumber:
newValue = filter.GetAffectValue(keyValues.Key, addingItemID)
if nil == newValue {
newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
}
default:
if nil != nearItem {
newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
} else {
newValue = filter.GetAffectValue(keyValues.Key, addingItemID)
}
}
if nil != newValue {
ret[keyValues.Key.ID] = newValue
}