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

🎨 Database gallery view https://github.com/siyuan-note/siyuan/issues/10414

Browse source
This commit is contained in:
Daniel 2025-06-08 11:01:21 +08:00
parent e11f93e9f1
commit d80bed7b85
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 49 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/av/av.go
View file

@ -189,7 +189,7 @@ type View struct {
Gallery *LayoutGallery `json:"gallery,omitempty"` // 画廊布局
}
// LayoutType 描述了视图布局的类型。
// LayoutType 描述了视图布局类型。
type LayoutType string
const (
@ -621,6 +621,7 @@ func getI18nName(name string) string {
var (
ErrViewNotFound = errors.New("view not found")
ErrKeyNotFound = errors.New("key not found")
ErrWrongLayoutType = errors.New("wrong layout type")
)
const (

49
kernel/model/attribute_view.go
View file

@ -1559,16 +1559,53 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
return
}
view := av.NewTableView()
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
var view *av.View
switch operation.Layout {
case av.LayoutTypeTable:
view = av.NewTableView()
switch firstView.LayoutType {
case av.LayoutTypeTable:
for _, col := range firstView.Table.Columns {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: col.ID})
}
for _, rowID := range firstView.Table.RowIDs {
view.Table.RowIDs = append(view.Table.RowIDs, rowID)
}
case av.LayoutTypeGallery:
for _, field := range firstView.Gallery.CardFields {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: field.ID})
}
for _, cardID := range firstView.Gallery.CardIDs {
view.Table.RowIDs = append(view.Table.RowIDs, cardID)
}
}
case av.LayoutTypeGallery:
view = av.NewGalleryView()
switch firstView.LayoutType {
case av.LayoutTypeTable:
for _, col := range firstView.Table.Columns {
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{ID: col.ID})
}
for _, rowID := range firstView.Table.RowIDs {
view.Gallery.CardIDs = append(view.Gallery.CardIDs, rowID)
}
case av.LayoutTypeGallery:
for _, field := range firstView.Gallery.CardFields {
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{ID: field.ID})
}
for _, cardID := range firstView.Gallery.CardIDs {
view.Gallery.CardIDs = append(view.Gallery.CardIDs, cardID)
}
}
default:
err = av.ErrWrongLayoutType
logging.LogErrorf("wrong layout type [%s] for attribute view [%s]", operation.Layout, avID)
return
}
view.Table.RowIDs = firstView.Table.RowIDs
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)

1
kernel/model/transaction.go
View file

@ -1482,6 +1482,7 @@ type Operation struct {
IsTwoWay bool `json:"isTwoWay"` // 属性视图关联列是否是双向关系
BackRelationKeyID string `json:"backRelationKeyID"` // 属性视图关联列回链关联列的 ID
RemoveDest bool `json:"removeDest"` // 属性视图删除关联目标
Layout av.LayoutType `json:"layout"` // 属性视图布局类型
}
type Transaction struct {