Browse Source

:art: Improve db tv filter https://ld246.com/article/1709608533749

Daniel 1 year ago
parent
commit
a9b8290cd0
2 changed files with 9 additions and 3 deletions
  1. 8 2
      kernel/av/filter.go
  2. 1 1
      kernel/model/attribute_view.go

+ 8 - 2
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 {

+ 1 - 1
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)