mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-18 15:40:12 +01:00
🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15528
This commit is contained in:
parent
6b8bd6e8f2
commit
9eec8510b7
1 changed files with 10 additions and 9 deletions
|
|
@ -2969,11 +2969,7 @@ func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID,
|
||||||
|
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
for _, src := range srcs {
|
for _, src := range srcs {
|
||||||
srcID := src["id"].(string)
|
boundBlockID := ""
|
||||||
if !ast.IsNodeIDPattern(srcID) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
srcItemID := ast.NewNodeID()
|
srcItemID := ast.NewNodeID()
|
||||||
if nil != src["itemID"] {
|
if nil != src["itemID"] {
|
||||||
srcItemID = src["itemID"].(string)
|
srcItemID = src["itemID"].(string)
|
||||||
|
|
@ -2982,14 +2978,19 @@ func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID,
|
||||||
isDetached := src["isDetached"].(bool)
|
isDetached := src["isDetached"].(bool)
|
||||||
var tree *parse.Tree
|
var tree *parse.Tree
|
||||||
if !isDetached {
|
if !isDetached {
|
||||||
|
boundBlockID = src["id"].(string)
|
||||||
|
if !ast.IsNodeIDPattern(boundBlockID) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
var loadErr error
|
var loadErr error
|
||||||
if nil != tx {
|
if nil != tx {
|
||||||
tree, loadErr = tx.loadTree(srcID)
|
tree, loadErr = tx.loadTree(boundBlockID)
|
||||||
} else {
|
} else {
|
||||||
tree, loadErr = LoadTreeByBlockID(srcID)
|
tree, loadErr = LoadTreeByBlockID(boundBlockID)
|
||||||
}
|
}
|
||||||
if nil != loadErr {
|
if nil != loadErr {
|
||||||
logging.LogErrorf("load tree [%s] failed: %s", srcID, loadErr)
|
logging.LogErrorf("load tree [%s] failed: %s", boundBlockID, loadErr)
|
||||||
return loadErr
|
return loadErr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2998,7 +2999,7 @@ func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID,
|
||||||
if nil != src["content"] {
|
if nil != src["content"] {
|
||||||
srcContent = src["content"].(string)
|
srcContent = src["content"].(string)
|
||||||
}
|
}
|
||||||
if avErr := addAttributeViewBlock(now, avID, dbBlockID, groupID, previousItemID, srcItemID, srcID, srcContent, isDetached, ignoreDefaultFill, tree, tx); nil != avErr {
|
if avErr := addAttributeViewBlock(now, avID, dbBlockID, groupID, previousItemID, srcItemID, boundBlockID, srcContent, isDetached, ignoreDefaultFill, tree, tx); nil != avErr {
|
||||||
return avErr
|
return avErr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue