Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 01:50:12 +01:00
Code Issues 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 10:57:28 +08:00
parent 0cf13cca8f
commit 1f130d4b1c
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/av/av.go
View file

@ -747,6 +747,29 @@ func (av *AttributeView) GetBlockKey() (ret *Key) {
return return
} }
func (av *AttributeView) GetDuplicateViewName(masterViewName string) string {
count := 1
ret := masterViewName + " (" + strconv.Itoa(count) + ")"
existViewByName := func(name string) bool {
for _, v := range av.Views {
if v.Name == name {
return true
}
}
return false
}
for i := 0; i < 32; i++ {
if !existViewByName(ret) {
return ret
}
count++
ret = masterViewName + " (" + strconv.Itoa(count) + ")"
}
return ret
}
func GetAttributeViewDataPath(avID string) (ret string) { func GetAttributeViewDataPath(avID string) (ret string) {
av := filepath.Join(util.DataDir, "storage", "av") av := filepath.Join(util.DataDir, "storage", "av")
ret = filepath.Join(av, avID+".json") ret = filepath.Join(av, avID+".json")

4
kernel/model/attribute_view.go
View file

@ -687,7 +687,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
attrView.ViewID = view.ID attrView.ViewID = view.ID
view.Icon = masterView.Icon view.Icon = masterView.Icon
view.Name = masterView.Name view.Name = attrView.GetDuplicateViewName(masterView.Name)
view.LayoutType = masterView.LayoutType view.LayoutType = masterView.LayoutType
for _, col := range masterView.Table.Columns { for _, col := range masterView.Table.Columns {
@ -716,7 +716,6 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
}) })
} }
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err { if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}
@ -748,7 +747,6 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: col.ID}) view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: col.ID})
} }
attrView.ViewID = view.ID
if err = av.SaveAttributeView(attrView); nil != err { if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}