Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00: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 00:02:40 +08:00
parent fd3e1d66bd
commit 11a55903f2
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

73
kernel/model/attribute_view.go
View file

@ -561,6 +561,48 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
return
}
func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) {
err := removeAttributeViewColumn(operation)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
}
return
}
func removeAttributeViewColumn(operation *Operation) (err error) {
attrView, err := av.ParseAttributeView(operation.AvID)
if nil != err {
return
}
for i, column := range attrView.Columns {
if column.ID == operation.ID {
attrView.Columns = append(attrView.Columns[:i], attrView.Columns[i+1:]...)
for _, row := range attrView.Rows {
if len(row.Cells) <= i {
continue
}
row.Cells = append(row.Cells[:i], row.Cells[i+1:]...)
}
break
}
}
for _, view := range attrView.Views {
for i, column := range view.Table.Columns {
if column.ID == operation.ID {
view.Table.Columns = append(view.Table.Columns[:i], view.Table.Columns[i+1:]...)
break
}
}
}
err = av.SaveAttributeView(attrView)
return
}
// TODO 下面的方法要重写
func (tx *Transaction) doUpdateAttrViewCell(operation *Operation) (ret *TxErr) {
@ -652,13 +694,6 @@ func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *Tx
return
}
func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) {
err := removeAttributeViewColumn(operation.ID, operation.ParentID)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
}
return
}
func (tx *Transaction) doSetAttrView(operation *Operation) (ret *TxErr) {
err := setAttributeView(operation)
@ -834,30 +869,6 @@ func updateAttributeViewColumnOptions(data interface{}, id, avID string) (err er
return
}
func removeAttributeViewColumn(columnID string, avID string) (err error) {
attrView, err := av.ParseAttributeView(avID)
if nil != err {
return
}
for i, column := range attrView.Columns {
if column.ID == columnID {
attrView.Columns = append(attrView.Columns[:i], attrView.Columns[i+1:]...)
for _, row := range attrView.Rows {
if len(row.Cells) <= i {
continue
}
row.Cells = append(row.Cells[:i], row.Cells[i+1:]...)
}
break
}
}
err = av.SaveAttributeView(attrView)
return
}
func setAttributeView(operation *Operation) (err error) {
avID := operation.ID
attrViewMap, err := av.ParseAttributeViewMap(avID)

4
kernel/model/transaction.go
View file

@ -237,13 +237,13 @@ func performTx(tx *Transaction) (ret *TxErr) {
ret = tx.doAddAttrViewColumn(op)
case "updateAttrViewCol":
ret = tx.doUpdateAttrViewColumn(op)
case "removeAttrViewCol":
ret = tx.doRemoveAttrViewColumn(op)
case "sortAttrViewRow":
ret = tx.doSortAttrViewRow(op)
case "sortAttrViewCol":
ret = tx.doSortAttrViewColumn(op)
// TODO 下面的方法要重写
case "removeAttrViewCol":
ret = tx.doRemoveAttrViewColumn(op)
case "updateAttrViewCell":
ret = tx.doUpdateAttrViewCell(op)
case "setAttrView":