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

♻️ Refactor av data structure

Browse source
This commit is contained in:
Daniel 2023-07-12 10:35:17 +08:00
parent 7ca8eab0cd
commit fbd26d1fd6
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 63 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

42
kernel/model/attribute_view.go
View file

@ -58,8 +58,8 @@ func RenderAttributeView(avID string) (viewable av.Viewable, attrView *av.Attrib
view = attrView.Views[0]
}
switch view.Type {
case av.ViewTypeTable:
switch view.CurrentLayoutType {
case av.LayoutTypeTable:
viewable, err = renderAttributeViewTable(attrView, view)
}
@ -70,7 +70,13 @@ func RenderAttributeView(avID string) (viewable av.Viewable, attrView *av.Attrib
}
func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *av.Table, err error) {
ret = view.Table
ret = &av.Table{
ID: view.Table.ID,
Name: view.Name,
Filters: view.Table.Filters,
Sorts: view.Table.Sorts,
}
for _, avRow := range attrView.Rows {
row := &av.TableRow{ID: avRow.ID, Cells: avRow.Cells}
ret.Rows = append(ret.Rows, row)
@ -404,27 +410,32 @@ func sortAttributeViewRow(operation *Operation) (err error) {
return
}
var row *av.Row
view, err := attrView.GetView(operation.ViewID)
if nil != err {
return
}
var rowID string
var index, previousIndex int
for i, r := range attrView.Rows {
if r.ID == operation.ID {
row = r
for i, r := range view.Table.RowIDs {
if r == operation.ID {
rowID = r
index = i
break
}
}
if nil == row {
if "" == rowID {
return
}
attrView.Rows = append(attrView.Rows[:index], attrView.Rows[index+1:]...)
for i, r := range attrView.Rows {
if r.ID == operation.PreviousID {
view.Table.RowIDs = append(view.Table.RowIDs[:index], view.Table.RowIDs[index+1:]...)
for i, r := range view.Table.RowIDs {
if r == operation.PreviousID {
previousIndex = i + 1
break
}
}
attrView.Rows = util.InsertElem(attrView.Rows, previousIndex, row)
view.Table.RowIDs = util.InsertElem(view.Table.RowIDs, previousIndex, rowID)
err = av.SaveAttributeView(attrView)
return
@ -444,6 +455,11 @@ func sortAttributeViewColumn(operation *Operation) (err error) {
return
}
view, err := attrView.GetView(operation.ViewID)
if nil != err {
return
}
var col *av.Column
var index, previousIndex int
for i, column := range attrView.Columns {
@ -561,7 +577,6 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
return
}
func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) {
err := removeAttributeViewColumn(operation)
if nil != err {
@ -694,7 +709,6 @@ func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *Tx
return
}
func (tx *Transaction) doSetAttrView(operation *Operation) (ret *TxErr) {
err := setAttributeView(operation)
if nil != err {