From 8b12b51c52ee6993ae53554eb7b11a8fb2d8dd97 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 25 Dec 2023 12:06:53 +0800
Subject: [PATCH 1/3] :art: Add Relation column to database table view
 https://github.com/siyuan-note/siyuan/issues/9888

---
 kernel/model/attribute_view.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index d96fb75c7..a4cd1e6e9 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -878,6 +878,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
 	// operation.IsTwoWay 是否双向关联
 	// operation.BackRelationKeyID 双向关联的目标关联列 ID
 	// operation.Name 双向关联的目标关联列名称
+	// operation.Format 源 av 关联列名称
 
 	srcAv, err := av.ParseAttributeView(operation.AvID)
 	if nil != err {
@@ -934,6 +935,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
 			srcRel.BackKeyID = ""
 		}
 		keyValues.Key.Relation = srcRel
+		keyValues.Key.Name = operation.Format
 
 		break
 	}
@@ -950,9 +952,9 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
 		if operation.IsTwoWay {
 			name := strings.TrimSpace(operation.Name)
 			if "" == name {
-				name = srcAv.Name
+				name = srcAv.Name + " " + operation.Format
 			}
-			backRelKey.Name = name
+			backRelKey.Name = strings.TrimSpace(name)
 		}
 	}
 
@@ -960,7 +962,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
 		if operation.IsTwoWay {
 			name := strings.TrimSpace(operation.Name)
 			if "" == name {
-				name = srcAv.Name
+				name = srcAv.Name + " " + operation.Format
 			}
 
 			destAv.KeyValues = append(destAv.KeyValues, &av.KeyValues{

From 3de21e0a9ec040496892b0d94475f2c760ea7e10 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 25 Dec 2023 12:32:13 +0800
Subject: [PATCH 2/3] :art: Network assets to local assets ignore webpage

---
 kernel/model/assets.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/model/assets.go b/kernel/model/assets.go
index 244d461f7..99d6ebba6 100644
--- a/kernel/model/assets.go
+++ b/kernel/model/assets.go
@@ -325,6 +325,11 @@ func NetAssets2LocalAssets(rootID string) (err error) {
 			request := browserClient.R()
 			request.SetRetryCount(1).SetRetryFixedInterval(3 * time.Second)
 			resp, reqErr := request.Get(u)
+			if strings.Contains(strings.ToLower(resp.GetContentType()), "text/html") {
+				// 忽略超链接网页
+				return ast.WalkContinue
+			}
+
 			if nil != reqErr {
 				logging.LogErrorf("download network asset [%s] failed: %s", u, reqErr)
 				return ast.WalkContinue

From 741c2764a4ca48af7871df28d55ba162e0d66a2f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 25 Dec 2023 12:35:09 +0800
Subject: [PATCH 3/3] :art: `Convert network assets to local` no longer process
 webpage https://github.com/siyuan-note/siyuan/issues/9965

---
 kernel/model/assets.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/assets.go b/kernel/model/assets.go
index 99d6ebba6..855c877d4 100644
--- a/kernel/model/assets.go
+++ b/kernel/model/assets.go
@@ -326,7 +326,7 @@ func NetAssets2LocalAssets(rootID string) (err error) {
 			request.SetRetryCount(1).SetRetryFixedInterval(3 * time.Second)
 			resp, reqErr := request.Get(u)
 			if strings.Contains(strings.ToLower(resp.GetContentType()), "text/html") {
-				// 忽略超链接网页
+				// 忽略超链接网页 `Convert network assets to local` no longer process webpage https://github.com/siyuan-note/siyuan/issues/9965
 				return ast.WalkContinue
 			}