From d5cd9e671b859a49001df614e78a4e5703e396a3 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 13 Apr 2024 22:38:47 +0800
Subject: [PATCH 1/3] :bug: https://github.com/siyuan-note/siyuan/issues/11015

---
 kernel/av/sort.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/av/sort.go b/kernel/av/sort.go
index 04d79587b..37c36aea8 100644
--- a/kernel/av/sort.go
+++ b/kernel/av/sort.go
@@ -233,8 +233,8 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
 			}
 			oContent := strings.TrimSpace(oContentBuf.String())
 
-			v1, ok1 := util.Convert2Float(value.Template.Content)
-			v2, ok2 := util.Convert2Float(other.Template.Content)
+			v1, ok1 := util.Convert2Float(vContent)
+			v2, ok2 := util.Convert2Float(oContent)
 			if ok1 && ok2 {
 				if v1 > v2 {
 					return 1
@@ -262,8 +262,8 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
 			}
 			oContent := strings.TrimSpace(oContentBuf.String())
 
-			v1, ok1 := util.Convert2Float(value.Template.Content)
-			v2, ok2 := util.Convert2Float(other.Template.Content)
+			v1, ok1 := util.Convert2Float(vContent)
+			v2, ok2 := util.Convert2Float(oContent)
 			if ok1 && ok2 {
 				if v1 > v2 {
 					return 1

From 4e63228c2da6a51f3b975d53de083322d028c095 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 13 Apr 2024 23:33:40 +0800
Subject: [PATCH 2/3] :bug: https://github.com/siyuan-note/siyuan/issues/11018

---
 kernel/model/attribute_view.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 24a177923..df37a8699 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -3003,6 +3003,12 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 		return
 	}
 
+	if "" == val.ID {
+		// 有时前端会误调用该接口（比如创建完快速切换），这里判断一下，避免误更新刚刚创建的值
+		// https://github.com/siyuan-note/siyuan/issues/11018
+		return
+	}
+
 	if av.KeyTypeNumber == val.Type {
 		if nil != val.Number && !val.Number.IsNotEmpty {
 			val.Number.Content = 0

From 5c77101271ac0f1cc20a1ec29c98272476d27847 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 13 Apr 2024 23:36:13 +0800
Subject: [PATCH 3/3] :bug: https://github.com/siyuan-note/siyuan/issues/11018

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

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index df37a8699..d3cfdbd71 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -3005,7 +3005,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 
 	if "" == val.ID {
 		// 有时前端会误调用该接口（比如创建完快速切换），这里判断一下，避免误更新刚刚创建的值
-		// https://github.com/siyuan-note/siyuan/issues/11018
+		// Primary key value unexpectedly updated when database adds row https://github.com/siyuan-note/siyuan/issues/11018
 		return
 	}