From a9b8290cd05e77727f3e1edb9aaa25ddf534e69e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 5 Mar 2024 20:54:39 +0800 Subject: [PATCH] :art: Improve db tv filter https://ld246.com/article/1709608533749 --- kernel/av/filter.go | 10 ++++++++-- kernel/model/attribute_view.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/av/filter.go b/kernel/av/filter.go index c0ca29abd..78566556e 100644 --- a/kernel/av/filter.go +++ b/kernel/av/filter.go @@ -79,8 +79,14 @@ const ( func (filter *ViewFilter) GetAffectValue(key *Key) (ret *Value) { if nil != filter.Value && filter.Value.IsGenerated() { - // 自动生成类型的过滤条件不设置默认值 - return nil + if filter.Value.IsGenerated() { + // 自动生成类型的过滤条件不设置默认值 + return nil + } + if KeyTypeRelation == filter.Value.Type { + // 关联类型的过滤条件不设置默认值 https://ld246.com/article/1709608533749 + return nil + } } if nil == filter.Value && nil != filter.RelativeDate { diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 77acae96b..7a60b687b 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -1841,7 +1841,7 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string, // 如果存在过滤条件,则将过滤条件应用到新添加的块上 view, _ := getAttrViewViewByBlockID(attrView, blockID) - if nil != view && (0 < len(view.Table.Filters) || 0 < len(view.Table.Sorts)) { + if nil != view && 0 < len(view.Table.Filters) { viewable, _ := renderAttributeViewTable(attrView, view) viewable.FilterRows(attrView)