diff --git a/kernel/av/av.go b/kernel/av/av.go index f131890c1..050f09ec8 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -35,6 +35,7 @@ import ( type AttributeView struct { Spec int `json:"spec"` ID string `json:"id"` // 属性视图 ID + Name string `json:"name"` // 属性视图名称 Columns []*Column `json:"columns"` // 表格列名 Rows []*Row `json:"rows"` // 表格行记录 @@ -55,6 +56,7 @@ func NewAttributeView(id string) *AttributeView { return &AttributeView{ Spec: 0, ID: id, + Name: "Table", Columns: []*Column{{ID: ast.NewNodeID(), Name: "Block", Type: ColumnTypeBlock}}, Rows: []*Row{}, Type: AttributeViewTypeTable, diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 2dd101e5a..a5896847c 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -82,7 +82,7 @@ func (tx *Transaction) doUpdateAttrViewCell(operation *Operation) (ret *TxErr) { c.Value = parseCellData(operation.Data, av.ColumnType(operation.Typ)) attrs := parse.IAL2Map(node.KramdownIAL) - attrs["av"+c.ID] = c.Value + attrs[NodeAttrNamePrefixAvCol+c.ID] = c.Value if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err { return } @@ -279,8 +279,8 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transacti if 1 < len(ret.Columns) { attrs := parse.IAL2Map(node.KramdownIAL) for _, col := range ret.Columns[1:] { - attrs["av"+col.ID] = "" // 将列作为属性添加到块中 - row.Cells = append(row.Cells, &av.Cell{ID: ast.NewNodeID(), Value: ""}) + attrs[NodeAttrNamePrefixAvCol+col.ID] = "" // 将列作为属性添加到块中 + row.Cells = append(row.Cells, &av.Cell{ID: ast.NewNodeID()}) } if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err { @@ -300,3 +300,5 @@ func parseCellData(data interface{}, colType av.ColumnType) string { } return "" } + +const NodeAttrNamePrefixAvCol = "av-col-"