Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 In some cases, the primary key sorting of the database panel fails https://github.com/siyuan-note/siyuan/issues/11621

Browse source
This commit is contained in:
Daniel 2024-06-03 11:35:43 +08:00
parent 06993bddd5
commit 02fe7b966c
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

43
kernel/model/attribute_view.go
View file

@ -649,6 +649,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
} }
// 字段排序 // 字段排序
refreshAttrViewKeyIDs(attrView)
sorts := map[string]int{} sorts := map[string]int{}
for i, k := range attrView.KeyIDs { for i, k := range attrView.KeyIDs {
sorts[k] = i sorts[k] = i
@ -2449,24 +2450,7 @@ func SortAttributeViewKey(avID, keyID, previousKeyID string) (err error) {
return return
} }
existKeyIDs := map[string]bool{} refreshAttrViewKeyIDs(attrView)
for _, keyValues := range attrView.KeyValues {
existKeyIDs[keyValues.Key.ID] = true
}
for k, _ := range existKeyIDs {
if !gulu.Str.Contains(k, attrView.KeyIDs) {
attrView.KeyIDs = append(attrView.KeyIDs, k)
}
}
var tmp []string
for _, k := range attrView.KeyIDs {
if ok := existKeyIDs[k]; ok {
tmp = append(tmp, k)
}
}
attrView.KeyIDs = tmp
var currentKeyID string var currentKeyID string
var idx, previousIndex int var idx, previousIndex int
@ -2495,6 +2479,29 @@ func SortAttributeViewKey(avID, keyID, previousKeyID string) (err error) {
return return
} }
func refreshAttrViewKeyIDs(attrView *av.AttributeView) {
// 订正 keyIDs 数据
existKeyIDs := map[string]bool{}
for _, keyValues := range attrView.KeyValues {
existKeyIDs[keyValues.Key.ID] = true
}
for k, _ := range existKeyIDs {
if !gulu.Str.Contains(k, attrView.KeyIDs) {
attrView.KeyIDs = append(attrView.KeyIDs, k)
}
}
var tmp []string
for _, k := range attrView.KeyIDs {
if ok := existKeyIDs[k]; ok {
tmp = append(tmp, k)
}
}
attrView.KeyIDs = tmp
}
func (tx *Transaction) doAddAttrViewColumn(operation *Operation) (ret *TxErr) { func (tx *Transaction) doAddAttrViewColumn(operation *Operation) (ret *TxErr) {
var icon string var icon string
if nil != operation.Data { if nil != operation.Data {