From 1276dd8f9accc5772b2935dd5ec04c1b80690ebf Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 26 Jul 2023 23:31:14 +0800 Subject: [PATCH] :art: Attribute View date column filter https://github.com/siyuan-note/siyuan/issues/8756 --- kernel/av/table.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/av/table.go b/kernel/av/table.go index d8d06a144..d4282eec2 100644 --- a/kernel/av/table.go +++ b/kernel/av/table.go @@ -192,10 +192,12 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool case FilterOperatorIsLessOrEqual: return value.Date.Content <= other.Date.Content case FilterOperatorIsBetween: + start := value.Date.Content <= other.Date.Content + end := true if value.Date.HasEndDate { - // TODO: date filter (between) + end = value.Date.Content2 >= other.Date.Content2 } - return value.Date.Content >= other.Date.Content && value.Date.Content <= other.Date.Content2 + return start && end case FilterOperatorIsEmpty: return 0 == value.Date.Content case FilterOperatorIsNotEmpty: