diff --git a/kernel/model/import.go b/kernel/model/import.go index 472c92b4e29..b6c65166845 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -124,12 +124,17 @@ func ImportSY(zipPath, boxID, toPath string) (err error) { if !entering { return ast.WalkContinue } - if ast.NodeBlockRefID == n.Type { - newDefID := blockIDs[n.TokensStr()] + if treenode.IsBlockRef(n) { + defID, _, _ := treenode.GetBlockRef(n) + newDefID := blockIDs[defID] if "" != newDefID { - n.Tokens = []byte(newDefID) - } else { - logging.LogWarnf("not found def [" + n.TokensStr() + "]") + if ast.NodeBlockRef == n.Type { + if id := n.ChildByType(ast.NodeBlockRefID); nil != id { + id.Tokens = []byte(newDefID) + } + } else { + n.TextMarkBlockRefID = newDefID + } } } else if ast.NodeBlockQueryEmbedScript == n.Type { for oldID, newID := range blockIDs {