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

🐛 The save path is incorrect when creating a sub-doc by ref in a doc with the same name https://github.com/siyuan-note/siyuan/issues/8138

Browse source
This commit is contained in:
Daniel 2024-09-23 12:07:50 +08:00
parent d21b122429
commit 5ad9de9541
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/path.go
View file

@ -45,8 +45,8 @@ func createDocsByHPath(boxID, hPath, content, parentID, id string) (retID string
// 在指定了父文档 ID 的情况下优先查找父文档 // 在指定了父文档 ID 的情况下优先查找父文档
parentHPath, name := path.Split(hPath) parentHPath, name := path.Split(hPath)
parentHPath = strings.TrimSuffix(parentHPath, "/") parentHPath = strings.TrimSuffix(parentHPath, "/")
preferredParent := treenode.GetBlockTreeRootByHPathPreferredParentID(boxID, parentHPath, parentID) preferredParent := treenode.GetBlockTreeByHPathPreferredParentID(boxID, parentHPath, parentID)
if nil != preferredParent && preferredParent.ID == parentID { if nil != preferredParent && preferredParent.RootID == parentID {
// 如果父文档存在且 ID 一致，则直接在父文档下创建 // 如果父文档存在且 ID 一致，则直接在父文档下创建
p := strings.TrimSuffix(preferredParent.Path, ".sy") + "/" + id + ".sy" p := strings.TrimSuffix(preferredParent.Path, ".sy") + "/" + id + ".sy"
if _, err = createDoc(boxID, p, name, content); err != nil { if _, err = createDoc(boxID, p, name, content); err != nil {

4
kernel/treenode/blocktree.go
View file

@ -258,10 +258,10 @@ func GetBlockTreeRootsByHPath(boxID, hPath string) (ret []*BlockTree) {
return return
} }
func GetBlockTreeRootByHPathPreferredParentID(boxID, hPath, preferredParentID string) (ret *BlockTree) { func GetBlockTreeByHPathPreferredParentID(boxID, hPath, preferredParentID string) (ret *BlockTree) {
hPath = gulu.Str.RemoveInvisible(hPath) hPath = gulu.Str.RemoveInvisible(hPath)
var roots []*BlockTree var roots []*BlockTree
sqlStmt := "SELECT * FROM blocktrees WHERE box_id = ? AND hpath = ? AND parent_id = ? AND type = 'd'" sqlStmt := "SELECT * FROM blocktrees WHERE box_id = ? AND hpath = ? AND parent_id = ? LIMIT 1"
rows, err := db.Query(sqlStmt, boxID, hPath, preferredParentID) rows, err := db.Query(sqlStmt, boxID, hPath, preferredParentID)
if err != nil { if err != nil {
logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err) logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)