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

🎨 编辑器支持属性视图 - 表格 https://github.com/siyuan-note/siyuan/issues/7536

Browse source
This commit is contained in:
Liang Ding 2023-03-03 15:01:42 +08:00
parent 6b086ed1d3
commit 832f31cbb3
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 111 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/model/attribute_view.go
View file

@ -28,6 +28,17 @@ import (
"github.com/siyuan-note/siyuan/kernel/treenode"
)
func RenderAttributeView(avID string) (dom string) {
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return
}
_ = attrView
return
}
func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr) {
firstSrcID := operation.SrcIDs[0]
tree, err := tx.loadTree(firstSrcID)
@ -38,7 +49,7 @@ func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr)
avID := operation.ParentID
for _, id := range operation.SrcIDs {
if err = addAttributeViewBlock(id, avID, tree); nil != err {
if err = addAttributeViewBlock(id, avID, tree, tx); nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: avID, msg: err.Error()}
}
}
@ -55,7 +66,7 @@ func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr)
avID := operation.ParentID
for _, id := range operation.SrcIDs {
if err = removeAttributeViewBlock(id, avID, tree); nil != err {
if err = removeAttributeViewBlock(id, avID, tree, tx); nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: avID}
}
}
@ -82,7 +93,7 @@ func AddAttributeViewColumn(name string, typ string, columnIndex int, avID strin
return
}
func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree) (err error) {
func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (err error) {
node := treenode.GetNodeInTree(tree, blockID)
if nil == node {
err = ErrBlockNotFound
@ -105,7 +116,7 @@ func removeAttributeViewBlock(blockID, avID string, tree *parse.Tree) (err error
return
}
func addAttributeViewBlock(blockID, avID string, tree *parse.Tree) (err error) {
func addAttributeViewBlock(blockID, avID string, tree *parse.Tree, tx *Transaction) (err error) {
node := treenode.GetNodeInTree(tree, blockID)
if nil == node {
err = ErrBlockNotFound
@ -138,20 +149,20 @@ func addAttributeViewBlock(blockID, avID string, tree *parse.Tree) (err error) {
row := av.NewRow()
row.Cells = append(row.Cells, &av.Cell{Value: blockID})
if 1 < len(attrView.Columns) {
attrs := parse.IAL2Map(node.KramdownIAL)
// 将列作为属性添加到块中
attrs := parse.IAL2Map(node.KramdownIAL)
for _, col := range attrView.Columns[1:] {
colName := col.Name
attrs[colName] = ""
}
if err = setNodeAttrs(node, tree, attrs); nil != err {
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
return
}
}
attrView.Rows = append(attrView.Rows, row)
err = av.SaveAttributeView(attrView)
return
}