Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-15 19:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-09-07 22:17:43 +08:00
commit 5d92de41cc
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
kernel/model/attribute_view.go
View file

@ -454,7 +454,6 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
blockValues.Values = append(blockValues.Values, value)
attrs := parse.IAL2Map(node.KramdownIAL)
attrs[NodeAttrNamePrefixAvKey+operation.AvID+"-"+blockValues.Key.ID] = "" // 将列作为属性添加到块中
if "" == attrs[NodeAttrNameAvs] {
attrs[NodeAttrNameAvs] = operation.AvID
@ -488,14 +487,14 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
}
func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr) {
err := removeAttributeViewBlock(operation)
err := tx.removeAttributeViewBlock(operation)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID}
}
return
}
func removeAttributeViewBlock(operation *Operation) (err error) {
func (tx *Transaction) removeAttributeViewBlock(operation *Operation) (err error) {
attrView, err := av.ParseAttributeView(operation.AvID)
if nil != err {
return
@ -506,11 +505,36 @@ func removeAttributeViewBlock(operation *Operation) (err error) {
return
}
trees := map[string]*parse.Tree{}
for _, keyValues := range attrView.KeyValues {
tmp := keyValues.Values[:0]
for i, values := range keyValues.Values {
if !gulu.Str.Contains(values.BlockID, operation.SrcIDs) {
tmp = append(tmp, keyValues.Values[i])
} else {
// Remove av block also remove node attr https://github.com/siyuan-note/siyuan/issues/9091#issuecomment-1709824006
if bt := treenode.GetBlockTree(values.BlockID); nil != bt {
tree := trees[bt.RootID]
if nil == tree {
tree, _ = loadTreeByBlockID(values.BlockID)
}
if nil != tree {
trees[bt.RootID] = tree
if node := treenode.GetNodeInTree(tree, values.BlockID); nil != node {
attrs := parse.IAL2Map(node.KramdownIAL)
if ast.NodeDocument == node.Type {
delete(attrs, "custom-hidden")
node.RemoveIALAttr("custom-hidden")
}
delete(attrs, NodeAttrNamePrefixAvKey+operation.AvID+"-"+values.KeyID)
node.RemoveIALAttr(NodeAttrNamePrefixAvKey + operation.AvID + "-" + values.KeyID)
if err = setNodeAttrsWithTx(tx, node, tree, attrs); nil != err {
return
}
}
}
}
}
}
keyValues.Values = tmp
@ -518,13 +542,6 @@ func removeAttributeViewBlock(operation *Operation) (err error) {
for _, blockID := range operation.SrcIDs {
view.Table.RowIDs = gulu.Str.RemoveElem(view.Table.RowIDs, blockID)
if bt := treenode.GetBlockTree(blockID); nil != bt && "d" == bt.Type {
if tree, _ := loadTreeByBlockID(blockID); nil != tree {
tree.Root.RemoveIALAttr("custom-hidden")
writeJSONQueue(tree)
}
}
}
err = av.SaveAttributeView(attrView)

2
kernel/model/blockial.go
View file

@ -175,7 +175,7 @@ func setNodeAttrs0(node *ast.Node, nameValues map[string]string) (oldAttrs map[s
}
for name, value := range nameValues {
if strings.HasPrefix(name, "av") {
if strings.HasPrefix(name, "custom-av") {
// 属性视图设置的属性值可以为空
node.SetIALAttr(name, value)
continue