0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 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 08:55:32 +08:00
parent 33585ae173
commit ee9844c379
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 66 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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()
view, _ = NewView(ast.NewNodeID())
ret.ViewID = view.ID
ret.Views = append(ret.Views, view)
}
@ -559,7 +559,7 @@ const (
LayoutTypeTable LayoutType = "table" // 属性视图类型 - 表格
)
func NewView() (view *View, blockKey *Key) {
func NewView(blockKeyID string) (view *View, blockKey *Key) {
name := "Table"
view = &View{
ID: ast.NewNodeID(),
@ -572,8 +572,8 @@ func NewView() (view *View, blockKey *Key) {
Sorts: []*ViewSort{},
},
}
blockKey = NewKey(ast.NewNodeID(), "Block", "", KeyTypeBlock)
view.Table.Columns = []*ViewTableColumn{{ID: blockKey.ID}}
blockKey = NewKey(blockKeyID, "Block", "", KeyTypeBlock)
view.Table.Columns = []*ViewTableColumn{{ID: blockKeyID}}
return
}
@ -588,7 +588,7 @@ type Viewable interface {
}
func NewAttributeView(id string) (ret *AttributeView) {
view, blockKey := NewView()
view, blockKey := NewView(ast.NewNodeID())
ret = &AttributeView{
Spec: 0,
ID: id,
@ -721,6 +721,16 @@ func (av *AttributeView) GetBlockKeyValues() (ret *KeyValues) {
return
}
func (av *AttributeView) GetBlockKey() (ret *Key) {
for _, kv := range av.KeyValues {
if KeyTypeBlock == kv.Key.Type {
ret = kv.Key
return
}
}
return
}
func GetAttributeViewDataPath(avID string) (ret string) {
av := filepath.Join(util.DataDir, "storage", "av")
ret = filepath.Join(av, avID+".json")

52
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()
view, _ := av.NewView(ast.NewNodeID())
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err {
@ -633,6 +633,56 @@ func getRowBlockValue(keyValues []*av.KeyValues) (ret *av.Value) {
return
}
func (tx *Transaction) doRemoveAttrViewView(operation *Operation) (ret *TxErr) {
var err error
avID := operation.AvID
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeBlockNotFound, id: avID}
}
viewID := operation.ID
for i, view := range attrView.Views {
if viewID == view.ID {
attrView.Views = append(attrView.Views[:i], attrView.Views[i+1:]...)
break
}
}
if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeWriteTree, msg: err.Error(), id: avID}
}
return
}
func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
var err error
avID := operation.AvID
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
bKey := attrView.GetBlockKey()
if nil == bKey {
logging.LogErrorf("get block key failed: %s", avID)
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
view, _ := av.NewView(bKey.ID)
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.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}
}
return
}
func (tx *Transaction) doSetAttrViewName(operation *Operation) (ret *TxErr) {
err := setAttributeViewName(operation)
if nil != err {

44
kernel/model/transaction.go
View file

@ -261,50 +261,6 @@ func performTx(tx *Transaction) (ret *TxErr) {
return
}
func (tx *Transaction) doRemoveAttrViewView(operation *Operation) (ret *TxErr) {
var err error
avID := operation.AvID
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeBlockNotFound, id: avID}
}
viewID := operation.ID
for i, view := range attrView.Views {
if viewID == view.ID {
attrView.Views = append(attrView.Views[:i], attrView.Views[i+1:]...)
break
}
}
if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeWriteTree, msg: err.Error(), id: avID}
}
return
}
func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
var err error
avID := operation.AvID
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeBlockNotFound, id: avID}
}
view, _ := av.NewView()
view.ID = operation.ID
attrView.Views = append(attrView.Views, view)
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrCodeWriteTree, msg: err.Error(), id: avID}
}
return
}
func (tx *Transaction) doMove(operation *Operation) (ret *TxErr) {
var err error
id := operation.ID