🎨 Support database date field relative to today's filtering https://github.com/siyuan-note/siyuan/issues/10451

This commit is contained in:
Daniel 2024-03-03 22:48:58 +08:00
parent 7956a60dcc
commit 061380744b
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017

View File

@ -294,7 +294,7 @@ func (value *Value) CompareOperator(filter *ViewFilter, attrView *AttributeView,
} }
func (value *Value) compareOperator(filter *ViewFilter) bool { func (value *Value) compareOperator(filter *ViewFilter) bool {
if nil == filter || nil == filter.Value { if nil == filter || (nil == filter.Value && nil == filter.RelativeDate) {
return true return true
} }
@ -403,7 +403,6 @@ func (value *Value) compareOperator(filter *ViewFilter) bool {
// 计算今天的起始时间 // 计算今天的起始时间
relativeTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) relativeTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
} }
case RelativeDateUnitWeek: case RelativeDateUnitWeek:
relativeTime = now.AddDate(0, 0, count*7*int(direction)) relativeTime = now.AddDate(0, 0, count*7*int(direction))
if FilterOperatorIsBetween == operator && RelativeDateDirectionThis == direction { if FilterOperatorIsBetween == operator && RelativeDateDirectionThis == direction {