Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Oct 11, 2024
2 parents 5a6581a + 49f1440 commit 5cc97c3
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions kernel/model/push_reload.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,22 +236,15 @@ func refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees m
// 2. 更新属性视图主键内容
var parents []*ast.Node
for _, updatedDefNode := range updatedDefNodes {
parent := updatedDefNode.Parent
for ; nil != parent && ast.NodeDocument != parent.Type && parent.IsContainerBlock(); parent = parent.Parent {
if ast.NodeDocument != parent.Type && parent.IsContainerBlock() && treenode.FirstLeafBlock(parent) == updatedDefNode {
parents = append(parents, parent)
}
for parent := updatedDefNode.Parent; nil != parent && ast.NodeDocument != parent.Type; parent = parent.Parent {
parents = append(parents, parent)
}
}
for _, parent := range parents {
updatedDefNodes[parent.ID] = parent
}

for _, updatedDefNode := range updatedDefNodes {
if nil != updatedDefNode.Parent && ast.NodeDocument != updatedDefNode.Parent.Type &&
updatedDefNode.Parent.IsContainerBlock() && treenode.FirstLeafBlock(updatedDefNode.Parent) == updatedDefNode {
updatedDefNode = updatedDefNode.Parent
}
avs := updatedDefNode.IALAttr(av.NodeAttrNameAvs)
if "" == avs {
continue
Expand Down

0 comments on commit 5cc97c3

Please sign in to comment.