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

🎨 https://github.com/siyuan-note/siyuan/issues/16730

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-30 17:53:04 +08:00
parent ab43a2d35f
commit 45465e12ef
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/av/filter.go
View file

@ -1005,6 +1005,19 @@ func calcRelativeTimeRegion(count int, unit RelativeDateUnit, direction Relative
return
}
func (filter *ViewFilter) IsValid() bool {
if nil == filter || nil == filter.Value {
return false
}
if FilterOperatorIsEmpty != filter.Operator && FilterOperatorIsNotEmpty != filter.Operator {
if filter.Value.IsEmpty() && nil == filter.RelativeDate {
return false
}
}
return true
}
func (filter *ViewFilter) GetAffectValue(key *Key, addingBlockID string) (ret *Value) {
if nil != filter.Value {
if KeyTypeRelation == filter.Value.Type || KeyTypeTemplate == filter.Value.Type || KeyTypeRollup == filter.Value.Type || KeyTypeUpdated == filter.Value.Type || KeyTypeCreated == filter.Value.Type {

5
kernel/model/attribute_view.go
View file

@ -196,6 +196,11 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
}
newValue := filter.GetAffectValue(keyValues.Key, addingItemID)
if nil == newValue {
if filter.IsValid() {
newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
}
}
if nil != newValue {
if av.KeyTypeDate == keyValues.Key.Type {
if nil != nearItem {