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

🎨 Block data sync to Attribute View https://github.com/siyuan-note/siyuan/issues/8696

Browse source
This commit is contained in:
Daniel 2023-07-07 23:58:32 +08:00
parent aa9c26300b
commit 7cd297e507
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
kernel/model/attribute_view.go
View file

@ -19,12 +19,12 @@ package model
import (
"errors"
"fmt"
"github.com/jinzhu/copier"
"strings"
"github.com/88250/gulu"
"github.com/88250/lute/ast"
"github.com/88250/lute/parse"
"github.com/jinzhu/copier"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/av"
"github.com/siyuan-note/siyuan/kernel/sql"
@ -521,26 +521,27 @@ func addAttributeViewBlock(blockID, previousRowID, avID string, tree *parse.Tree
}
row := av.NewRow()
row.Cells = append(row.Cells, av.NewCellBlock(blockID, getNodeRefText(node)))
if 1 < len(ret.Columns) {
attrs := parse.IAL2Map(node.KramdownIAL)
for _, col := range ret.Columns[1:] {
attrs := parse.IAL2Map(node.KramdownIAL)
for _, col := range ret.Columns {
if av.ColumnTypeBlock != col.Type {
attrs[NodeAttrNamePrefixAvCol+avID+"-"+col.ID] = "" // 将列作为属性添加到块中
row.Cells = append(row.Cells, av.NewCell(col.Type))
}
if "" == attrs[NodeAttrNameAVs] {
attrs[NodeAttrNameAVs] = avID
} else {
avIDs := strings.Split(attrs[NodeAttrNameAVs], ",")
avIDs = append(avIDs, avID)
avIDs = gulu.Str.RemoveDuplicatedElem(avIDs)
attrs[NodeAttrNameAVs] = strings.Join(avIDs, ",")
row.Cells = append(row.Cells, av.NewCellBlock(blockID, getNodeRefText(node)))
}
}
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
return
}
if "" == attrs[NodeAttrNameAVs] {
attrs[NodeAttrNameAVs] = avID
} else {
avIDs := strings.Split(attrs[NodeAttrNameAVs], ",")
avIDs = append(avIDs, avID)
avIDs = gulu.Str.RemoveDuplicatedElem(avIDs)
attrs[NodeAttrNameAVs] = strings.Join(avIDs, ",")
}
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
return
}
if "" == previousRowID {