From 755e9e0af37ad3257073cf3f6ff21d5971c887aa Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 30 Dec 2023 20:49:57 +0800
Subject: [PATCH 1/2] :art: Add Rollup column to database table view
 https://github.com/siyuan-note/siyuan/issues/9958

---
 kernel/model/attribute_view.go | 7 ++++++-
 kernel/treenode/node.go        | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index c9ca55fb2..855d01185 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -794,6 +794,11 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
 					if nil == destVal {
 						continue
 					}
+					if av.KeyTypeNumber == destVal.Type {
+						destVal.Number.Format = rollupKey.NumberFormat
+						destVal.Number.FormatNumber()
+					}
+
 					cell.Value.Rollup.Contents = append(cell.Value.Rollup.Contents, destVal.String())
 				}
 			case av.KeyTypeRelation: // 渲染关联列
@@ -901,7 +906,7 @@ func updateAttributeViewColRollup(operation *Operation) (err error) {
 		KeyID:         operation.KeyID,
 	}
 
-	if nil != operation.Data && "" != operation.Data.(string) {
+	if nil != operation.Data {
 		data := operation.Data.(map[string]interface{})
 		if nil != data["calc"] {
 			calcData, jsonErr := gulu.JSON.MarshalJSON(data["calc"])
diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go
index cd9640336..bbf792455 100644
--- a/kernel/treenode/node.go
+++ b/kernel/treenode/node.go
@@ -753,6 +753,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
 					if nil == destVal {
 						continue
 					}
+					if av.KeyTypeNumber == destVal.Type {
+						destVal.Number.Format = rollupKey.NumberFormat
+						destVal.Number.FormatNumber()
+					}
 					cell.Value.Rollup.Contents = append(cell.Value.Rollup.Contents, destVal.String())
 				}
 			case av.KeyTypeRelation: // 渲染关联列

From 224aec150784bf72acff91c6a2b43e34c3469ccc Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 30 Dec 2023 21:15:53 +0800
Subject: [PATCH 2/2] :art: The primary key are no longer shown in the
 attribute panel database https://github.com/siyuan-note/siyuan/issues/10027

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

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 855d01185..31f9cbb3d 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -198,6 +198,11 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 
 		var keyValues []*av.KeyValues
 		for _, kv := range attrView.KeyValues {
+			if av.KeyTypeBlock == kv.Key.Type {
+				// The primary key are no longer shown in the attribute panel database https://github.com/siyuan-note/siyuan/issues/10027
+				continue
+			}
+
 			kValues := &av.KeyValues{Key: kv.Key}
 			for _, v := range kv.Values {
 				if v.BlockID == blockID {