Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/15656

Browse source
This commit is contained in:
Daniel 2025-08-22 17:30:40 +08:00
parent 6007cf00b0
commit 53c41561c8
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/model/attribute_view.go
View file

@ -3907,43 +3907,48 @@ func AddAttributeViewKey(avID, keyID, keyName, keyType, keyIcon, previousKeyID s
attrView.KeyValues = append(attrView.KeyValues, &av.KeyValues{Key: key}) attrView.KeyValues = append(attrView.KeyValues, &av.KeyValues{Key: key})
for _, view := range attrView.Views { for _, view := range attrView.Views {
newField := &av.BaseField{ID: key.ID}
if nil != view.Table { if nil != view.Table {
newField.Wrap = view.Table.WrapField
if "" == previousKeyID { if "" == previousKeyID {
if av.LayoutTypeGallery == currentView.LayoutType { if av.LayoutTypeGallery == currentView.LayoutType {
// 如果当前视图是卡片视图则添加到最后 // 如果当前视图是卡片视图则添加到最后
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: &av.BaseField{ID: key.ID}}) view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: newField})
} else { } else {
view.Table.Columns = append([]*av.ViewTableColumn{{BaseField: &av.BaseField{ID: key.ID}}}, view.Table.Columns...) view.Table.Columns = append([]*av.ViewTableColumn{{BaseField: newField}}, view.Table.Columns...)
} }
} else { } else {
added := false added := false
for i, column := range view.Table.Columns { for i, column := range view.Table.Columns {
if column.ID == previousKeyID { if column.ID == previousKeyID {
view.Table.Columns = append(view.Table.Columns[:i+1], append([]*av.ViewTableColumn{{BaseField: &av.BaseField{ID: key.ID}}}, view.Table.Columns[i+1:]...)...) view.Table.Columns = append(view.Table.Columns[:i+1], append([]*av.ViewTableColumn{{BaseField: newField}}, view.Table.Columns[i+1:]...)...)
added = true added = true
break break
} }
} }
if !added { if !added {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: &av.BaseField{ID: key.ID}}) view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: newField})
} }
} }
} }
if nil != view.Gallery { if nil != view.Gallery {
newField.Wrap = view.Gallery.WrapField
if "" == previousKeyID { if "" == previousKeyID {
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: &av.BaseField{ID: key.ID}}) view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
} else { } else {
added := false added := false
for i, field := range view.Gallery.CardFields { for i, field := range view.Gallery.CardFields {
if field.ID == previousKeyID { if field.ID == previousKeyID {
view.Gallery.CardFields = append(view.Gallery.CardFields[:i+1], append([]*av.ViewGalleryCardField{{BaseField: &av.BaseField{ID: key.ID}}}, view.Gallery.CardFields[i+1:]...)...) view.Gallery.CardFields = append(view.Gallery.CardFields[:i+1], append([]*av.ViewGalleryCardField{{BaseField: newField}}, view.Gallery.CardFields[i+1:]...)...)
added = true added = true
break break
} }
} }
if !added { if !added {
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: &av.BaseField{ID: key.ID}}) view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
} }
} }
} }