From ca855c1fa54756b5ff9afd1270f4c4d7aa444b9f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 30 Sep 2023 11:57:37 +0800
Subject: [PATCH] :art: Attribute Panel - Database sort attributes by view
 column order https://github.com/siyuan-note/siyuan/issues/9319

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

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 0097bc5cd..ea549adbe 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -76,6 +76,19 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 			}
 		}
 
+		// Attribute Panel - Database sort attributes by view column order https://github.com/siyuan-note/siyuan/issues/9319
+		view, _ := attrView.GetView()
+		if nil != view {
+			sorts := map[string]int{}
+			for i, col := range view.Table.Columns {
+				sorts[col.ID] = i
+			}
+
+			sort.Slice(keyValues, func(i, j int) bool {
+				return sorts[keyValues[i].Key.ID] < sorts[keyValues[j].Key.ID]
+			})
+		}
+
 		ret = append(ret, &BlockAttributeViewKeys{
 			AvID:      avID,
 			AvName:    attrView.Name,