Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-23 07:24:07 +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-13 00:08:10 +08:00
parent b1619fe155
commit 74d10b7e97
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 90 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/av/table.go
View file

@ -17,7 +17,6 @@
package av
import (
"github.com/88250/lute/ast"
"math"
"sort"
"strings"
@ -259,13 +258,6 @@ type TableRow struct {
Cells []*TableCell `json:"cells"`
}
func NewTableRow() *TableRow {
return &TableRow{
ID: ast.NewNodeID(),
Cells: []*TableCell{},
}
}
func (table *Table) GetType() LayoutType {
return LayoutTypeTable
}

185
kernel/model/attribute_view.go
View file

@ -101,7 +101,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
}
}
for _, row := range rows {
for rowID, row := range rows {
var tableRow av.TableRow
for _, col := range ret.Columns {
var tableCell *av.TableCell
@ -121,6 +121,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
ValueType: col.Type,
}
}
tableRow.ID = rowID
tableRow.Cells = append(tableRow.Cells, tableCell)
}
ret.Rows = append(ret.Rows, &tableRow)
@ -715,6 +716,89 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error)
return
}
func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColumnOptions(operation)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
}
return
}
func updateAttributeViewColumnOptions(operation *Operation) (err error) {
attrView, err := av.ParseAttributeView(operation.AvID)
if nil != err {
return
}
jsonData, err := gulu.JSON.MarshalJSON(operation.Data)
if nil != err {
return
}
options := []*av.KeySelectOption{}
if err = gulu.JSON.UnmarshalJSON(jsonData, &options); nil != err {
return
}
for _, keyValues := range attrView.KeyValues {
if keyValues.Key.ID == operation.ID {
keyValues.Key.Options = options
err = av.SaveAttributeView(attrView)
return
}
}
return
}
//func (tx *Transaction) doRemoveAttrViewColOption(operation *Operation) (ret *TxErr) {
// err := removeAttributeViewColumnOption(operation)
// if nil != err {
// return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
// }
// return
//}
//
//func removeAttributeViewColumnOption(operation *Operation) (err error) {
// avID := operation.ParentID
// attrView, err := av.ParseAttributeView(avID)
// if nil != err {
// return
// }
//
// optName := operation.Data.(string)
//
// key := attrView.GetKey(operation.ID)
// key.
//
// for _, row := range attrView.Rows {
// for i, cell := range row.Cells {
// if colIndex != i {
// continue
// }
//
// if nil != cell.Value {
// if nil != cell.Value.MSelect && 0 < len(cell.Value.MSelect) && nil != cell.Value.MSelect[0] {
// if optName == cell.Value.MSelect[0].Content {
// cell.Value = nil
// break
// }
// } else if nil != cell.Value.MSelect {
// for j, opt := range cell.Value.MSelect {
// if optName == opt.Content {
// cell.Value.MSelect = append(cell.Value.MSelect[:j], cell.Value.MSelect[j+1:]...)
// break
// }
// }
// }
// }
// break
// }
// }
//
// err = av.SaveAttributeView(attrView)
// return
//}
// TODO 下面的方法要重写
//func (tx *Transaction) doUpdateAttrViewColOption(operation *Operation) (ret *TxErr) {
@ -725,21 +809,7 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error)
// return
//}
//
//func (tx *Transaction) doRemoveAttrViewColOption(operation *Operation) (ret *TxErr) {
// err := removeAttributeViewColumnOption(operation)
// if nil != err {
// return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
// }
// return
//}
//
//func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *TxErr) {
// err := updateAttributeViewColumnOptions(operation.Data, operation.ID, operation.ParentID)
// if nil != err {
// return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
// }
// return
//}
//
//func updateAttributeViewColumnOption(operation *Operation) (err error) {
// avID := operation.ParentID
@ -823,89 +893,6 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error)
// return
//}
//
//func removeAttributeViewColumnOption(operation *Operation) (err error) {
// avID := operation.ParentID
// attrView, err := av.ParseAttributeView(avID)
// if nil != err {
// return
// }
//
// colID := operation.ID
// optName := operation.Data.(string)
//
// var colIndex int
// for i, col := range attrView.Columns {
// if col.ID != colID {
// continue
// }
//
// colIndex = i
//
// for j, opt := range col.Options {
// if opt.Name != optName {
// continue
// }
//
// col.Options = append(col.Options[:j], col.Options[j+1:]...)
// break
// }
// break
// }
//
// for _, row := range attrView.Rows {
// for i, cell := range row.Cells {
// if colIndex != i {
// continue
// }
//
// if nil != cell.Value {
// if nil != cell.Value.MSelect && 0 < len(cell.Value.MSelect) && nil != cell.Value.MSelect[0] {
// if optName == cell.Value.MSelect[0].Content {
// cell.Value = nil
// break
// }
// } else if nil != cell.Value.MSelect {
// for j, opt := range cell.Value.MSelect {
// if optName == opt.Content {
// cell.Value.MSelect = append(cell.Value.MSelect[:j], cell.Value.MSelect[j+1:]...)
// break
// }
// }
// }
// }
// break
// }
// }
//
// err = av.SaveAttributeView(attrView)
// return
//}
//
//func updateAttributeViewColumnOptions(data interface{}, id, avID string) (err error) {
// attrView, err := av.ParseAttributeView(avID)
// if nil != err {
// return
// }
//
// jsonData, err := gulu.JSON.MarshalJSON(data)
// if nil != err {
// return
// }
//
// options := []*av.ColumnSelectOption{}
// if err = gulu.JSON.UnmarshalJSON(jsonData, &options); nil != err {
// return
// }
//
// for _, col := range attrView.Columns {
// if col.ID == id {
// col.Options = options
// err = av.SaveAttributeView(attrView)
// return
// }
// }
// return
//}
const (
NodeAttrNameAVs = "custom-avs"

9
kernel/model/transaction.go
View file

@ -245,11 +245,10 @@ func performTx(tx *Transaction) (ret *TxErr) {
ret = tx.doSortAttrViewColumn(op)
case "updateAttrViewCell":
ret = tx.doUpdateAttrViewCell(op)
// TODO 下面的方法要重写
//case "updateAttrViewColOptions":
// ret = tx.doUpdateAttrViewColOptions(op)
//case "removeAttrViewColOption":
// ret = tx.doRemoveAttrViewColOption(op)
case "updateAttrViewColOptions":
ret = tx.doUpdateAttrViewColOptions(op)
//case "removeAttrViewColOption":
//ret = tx.doRemoveAttrViewColOption(op)
//case "updateAttrViewColOption":
// ret = tx.doUpdateAttrViewColOption(op)
}