🎨 Supports multiple views for the database https://github.com/siyuan-note/siyuan/issues/9751

This commit is contained in:
Daniel 2023-11-30 23:19:43 +08:00
parent eb6af31572
commit 19475004b4
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 10 additions and 9 deletions

View file

@ -64,7 +64,7 @@ func ShallowCloneAttributeView(av *AttributeView) (ret *AttributeView) {
view.ID = ast.NewNodeID()
ret.ViewID = view.ID
} else {
view = NewView()
view, _ = NewView()
ret.ViewID = view.ID
ret.Views = append(ret.Views, view)
}
@ -559,9 +559,9 @@ const (
LayoutTypeTable LayoutType = "table" // 属性视图类型 - 表格
)
func NewView() *View {
func NewView() (view *View, blockKey *Key) {
name := "Table"
return &View{
view = &View{
ID: ast.NewNodeID(),
Name: name,
LayoutType: LayoutTypeTable,
@ -572,6 +572,9 @@ func NewView() *View {
Sorts: []*ViewSort{},
},
}
blockKey = NewKey(ast.NewNodeID(), "Block", "", KeyTypeBlock)
view.Table.Columns = []*ViewTableColumn{{ID: blockKey.ID}}
return
}
// Viewable 描述了视图的接口。
@ -585,16 +588,14 @@ type Viewable interface {
}
func NewAttributeView(id string) (ret *AttributeView) {
view := NewView()
key := NewKey(ast.NewNodeID(), "Block", "", KeyTypeBlock)
view, blockKey := NewView()
ret = &AttributeView{
Spec: 0,
ID: id,
KeyValues: []*KeyValues{{Key: key}},
KeyValues: []*KeyValues{{Key: blockKey}},
ViewID: view.ID,
Views: []*View{view},
}
view.Table.Columns = []*ViewTableColumn{{ID: key.ID}}
return
}

View file

@ -294,7 +294,7 @@ func RenderAttributeView(avID, viewID string) (viewable av.Viewable, attrView *a
func renderAttributeView(attrView *av.AttributeView, viewID string) (viewable av.Viewable, err error) {
if 1 > len(attrView.Views) {
view := av.NewView()
view, _ := av.NewView()
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err {

View file

@ -294,7 +294,7 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
return &TxErr{code: TxErrCodeBlockNotFound, id: avID}
}
view := av.NewView()
view, _ := av.NewView()
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID