From 0f24054d3d42b6ff659ad8e37d196144696d1540 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 21 Sep 2025 22:22:45 +0800
Subject: [PATCH 1/2] :art: Database asset fields support filtering
 https://github.com/siyuan-note/siyuan/issues/11967

Signed-off-by: Daniel <845765@qq.com>
---
 kernel/av/filter.go | 61 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index 6584f9f59..8dbe5d32b 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -153,10 +153,9 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
 		return !value.IsEmpty()
 	}
 
+	// 单独处理汇总
 	if nil != value.Rollup && KeyTypeRollup == value.Type && nil != filter.Value && KeyTypeRollup == filter.Value.Type &&
 		nil != filter.Value.Rollup && 0 < len(filter.Value.Rollup.Contents) {
-		// 单独处理汇总类型的比较
-
 		key, _ := attrView.GetKey(value.KeyID)
 		if nil == key {
 			return false
@@ -214,10 +213,9 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
 		}
 	}
 
+	// 单独处理关联
 	if nil != value.Relation && KeyTypeRelation == value.Type && nil != filter.Value && KeyTypeRelation == filter.Value.Type &&
 		nil != filter.Value.Relation && 0 < len(filter.Value.Relation.BlockIDs) {
-		// 单独处理关联类型的比较
-
 		for _, relationValue := range value.Relation.Contents {
 			filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}}
 
@@ -247,6 +245,61 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
 			return false
 		}
 	}
+
+	// 单独处理资源
+	if nil != value.MAsset && KeyTypeMAsset == value.Type && nil != filter.Value && KeyTypeMAsset == filter.Value.Type && 0 < len(filter.Value.MAsset) {
+		key, _ := attrView.GetKey(value.KeyID)
+		if nil == key {
+			return false
+		}
+
+		switch filter.Qualifier {
+		case FilterQuantifierUndefined, FilterQuantifierAny:
+			for _, asset := range value.MAsset {
+				switch asset.Type {
+				case AssetTypeFile:
+					if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) ||
+						filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return true
+					}
+				case AssetTypeImage:
+					if filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return true
+					}
+				}
+			}
+		case FilterQuantifierAll:
+			for _, asset := range value.MAsset {
+				switch asset.Type {
+				case AssetTypeFile:
+					if !filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) &&
+						!filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return false
+					}
+				case AssetTypeImage:
+					if !filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return false
+					}
+				}
+			}
+			return true
+		case FilterQuantifierNone:
+			for _, asset := range value.MAsset {
+				switch asset.Type {
+				case AssetTypeFile:
+					if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) ||
+						filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return false
+					}
+				case AssetTypeImage:
+					if filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+						return false
+					}
+				}
+			}
+			return true
+		}
+	}
 	return value.filter(filter.Value, filter.RelativeDate, filter.RelativeDate2, filter.Operator)
 }
 

From ae737173b41a187149a3e0cee9a4d5b49886d6b7 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 21 Sep 2025 22:23:05 +0800
Subject: [PATCH 2/2] :art: Clean code

Signed-off-by: Daniel <845765@qq.com>
---
 kernel/av/filter.go | 2 +-
 kernel/av/sort.go   | 2 +-
 kernel/av/value.go  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index 8dbe5d32b..5a2a24d24 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -26,7 +26,7 @@ import (
 
 // ViewFilter 描述了视图过滤规则的结构。
 type ViewFilter struct {
-	Column        string           `json:"column"`                  // 列（字段）ID
+	Column        string           `json:"column"`                  // 字段（列）ID
 	Qualifier     FilterQuantifier `json:"quantifier,omitempty"`    // 量词
 	Operator      FilterOperator   `json:"operator"`                // 操作符
 	Value         *Value           `json:"value"`                   // 过滤值
diff --git a/kernel/av/sort.go b/kernel/av/sort.go
index e0aeecb30..800b02b2a 100644
--- a/kernel/av/sort.go
+++ b/kernel/av/sort.go
@@ -27,7 +27,7 @@ import (
 
 // ViewSort 描述了视图排序规则的结构。
 type ViewSort struct {
-	Column string    `json:"column"` // 列（字段）ID
+	Column string    `json:"column"` // 字段（列）ID
 	Order  SortOrder `json:"order"`  // 排序顺序
 }
 
diff --git a/kernel/av/value.go b/kernel/av/value.go
index 7a9b26abc..de963c034 100644
--- a/kernel/av/value.go
+++ b/kernel/av/value.go
@@ -702,7 +702,7 @@ type ValuePhone struct {
 type AssetType string
 
 const (
-	AssetTypeFile  = "file"
+	AssetTypeFile  = "file" // 链接也使用文件类型
 	AssetTypeImage = "image"
 )