github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 10:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrade database table view

Browse Source
This commit is contained in:
Daniel 2023-12-14 11:23:34 +08:00
parent 8daa98be52
commit 5a59b4c4d6
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kernel/model/attribute_view.go
View File

@ -1089,11 +1089,6 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
return return
} }
view, err := attrView.GetCurrentView()
if nil != err {
return
}
// 不允许重复添加相同的块到属性视图中 // 不允许重复添加相同的块到属性视图中
blockValues := attrView.GetBlockKeyValues() blockValues := attrView.GetBlockKeyValues()
for _, blockValue := range blockValues.Values { for _, blockValue := range blockValues.Values {
@ -1127,17 +1122,24 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
} }
} }
switch view.LayoutType { for _, view := range attrView.Views {
case av.LayoutTypeTable: switch view.LayoutType {
if "" != operation.PreviousID { case av.LayoutTypeTable:
for i, id := range view.Table.RowIDs { if "" != operation.PreviousID {
if id == operation.PreviousID { changed := false
view.Table.RowIDs = append(view.Table.RowIDs[:i+1], append([]string{blockID}, view.Table.RowIDs[i+1:]...)...) for i, id := range view.Table.RowIDs {
break if id == operation.PreviousID {
view.Table.RowIDs = append(view.Table.RowIDs[:i+1], append([]string{blockID}, view.Table.RowIDs[i+1:]...)...)
changed = true
break
}
} }
if !changed {
view.Table.RowIDs = append(view.Table.RowIDs, blockID)
}
} else {
view.Table.RowIDs = append([]string{blockID}, view.Table.RowIDs...)
} }
} else {
view.Table.RowIDs = append([]string{blockID}, view.Table.RowIDs...)
} }
} }
@ -1159,11 +1161,6 @@ func (tx *Transaction) removeAttributeViewBlock(operation *Operation) (err error
return return
} }
view, err := attrView.GetCurrentView()
if nil != err {
return
}
trees := map[string]*parse.Tree{} trees := map[string]*parse.Tree{}
for _, keyValues := range attrView.KeyValues { for _, keyValues := range attrView.KeyValues {
tmp := keyValues.Values[:0] tmp := keyValues.Values[:0]
@ -1210,8 +1207,10 @@ func (tx *Transaction) removeAttributeViewBlock(operation *Operation) (err error
keyValues.Values = tmp keyValues.Values = tmp
} }
for _, blockID := range operation.SrcIDs { for _, view := range attrView.Views {
view.Table.RowIDs = gulu.Str.RemoveElem(view.Table.RowIDs, blockID) for _, blockID := range operation.SrcIDs {
view.Table.RowIDs = gulu.Str.RemoveElem(view.Table.RowIDs, blockID)
}
} }
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)