Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-14 11:14:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Daniel 2023-12-01 09:17:44 +08:00
parent 46e566cbfd
commit 5f04af1afe
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/av/av.go
View file

@ -64,7 +64,7 @@ func ShallowCloneAttributeView(av *AttributeView) (ret *AttributeView) {
view.ID = ast.NewNodeID()
ret.ViewID = view.ID
} else {
view, _ = NewView(ast.NewNodeID())
view, _ = NewTableViewWithBlockKey(ast.NewNodeID())
ret.ViewID = view.ID
ret.Views = append(ret.Views, view)
}
@ -559,7 +559,22 @@ const (
LayoutTypeTable LayoutType = "table" // 属性视图类型 - 表格
)
func NewView(blockKeyID string) (view *View, blockKey *Key) {
func NewTableView() (ret *View) {
ret = &View{
ID: ast.NewNodeID(),
Name: "Table",
LayoutType: LayoutTypeTable,
Table: &LayoutTable{
Spec: 0,
ID: ast.NewNodeID(),
Filters: []*ViewFilter{},
Sorts: []*ViewSort{},
},
}
return
}
func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey *Key) {
name := "Table"
view = &View{
ID: ast.NewNodeID(),
@ -588,7 +603,7 @@ type Viewable interface {
}
func NewAttributeView(id string) (ret *AttributeView) {
view, blockKey := NewView(ast.NewNodeID())
view, blockKey := NewTableViewWithBlockKey(ast.NewNodeID())
ret = &AttributeView{
Spec: 0,
ID: id,

15
kernel/model/attribute_view.go
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(ast.NewNodeID())
view, _ := av.NewTableViewWithBlockKey(ast.NewNodeID())
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err {
@ -666,16 +666,21 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
bKey := attrView.GetBlockKey()
if nil == bKey {
logging.LogErrorf("get block key failed: %s", avID)
firstView := attrView.Views[0]
if nil == firstView {
logging.LogErrorf("get first view failed: %s", avID)
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
view, _ := av.NewView(bKey.ID)
view := av.NewTableView()
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
for _, col := range firstView.Table.Columns {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: col.ID})
}
if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}