github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 03:49:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Subdocuments created by the database are not displayed in the doc tree https://github.com/siyuan-note/siyuan/issues/9091

Browse Source
This commit is contained in:
Daniel 2023-09-05 16:52:25 +08:00
parent 09f91258a1
commit f80ae732b9
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/api/filetree.go
View File

@ -481,10 +481,10 @@ func createDocWithMd(c *gin.Context) {
parentID = parentIDArg.(string) parentID = parentIDArg.(string)
} }
showInDocTree := true hidden := true
showInDocTreeArg := arg["showInDocTree"] hiddenArg := arg["hidden"]
if nil != showInDocTreeArg { if nil != hiddenArg {
showInDocTree = showInDocTreeArg.(bool) hidden = hiddenArg.(bool)
} }
hPath := arg["path"].(string) hPath := arg["path"].(string)
@ -502,7 +502,7 @@ func createDocWithMd(c *gin.Context) {
hPath = "/" + hPath hPath = "/" + hPath
} }
id, err := model.CreateWithMarkdown(notebook, hPath, markdown, parentID, showInDocTree) id, err := model.CreateWithMarkdown(notebook, hPath, markdown, parentID, hidden)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -510,7 +510,7 @@ func createDocWithMd(c *gin.Context) {
} }
ret.Data = id ret.Data = id
if !showInDocTree { if !hidden {
return return
} }

8
kernel/model/file.go
View File

@ -1011,7 +1011,7 @@ func CreateDocByMd(boxID, p, title, md string, sorts []string) (tree *parse.Tree
return return
} }
func CreateWithMarkdown(boxID, hPath, md, parentID string, showInDocTree bool) (id string, err error) { func CreateWithMarkdown(boxID, hPath, md, parentID string, hidden bool) (id string, err error) {
box := Conf.Box(boxID) box := Conf.Box(boxID)
if nil == box { if nil == box {
err = errors.New(Conf.Language(0)) err = errors.New(Conf.Language(0))
@ -1021,7 +1021,7 @@ func CreateWithMarkdown(boxID, hPath, md, parentID string, showInDocTree bool) (
WaitForWritingFiles() WaitForWritingFiles()
luteEngine := util.NewLute() luteEngine := util.NewLute()
dom := luteEngine.Md2BlockDOM(md, false) dom := luteEngine.Md2BlockDOM(md, false)
id, _, err = createDocsByHPath(box.ID, hPath, dom, parentID, showInDocTree) id, _, err = createDocsByHPath(box.ID, hPath, dom, parentID, hidden)
return return
} }
@ -1469,7 +1469,7 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
return return
} }
func createDoc(boxID, p, title, dom string, showInDocTree bool) (tree *parse.Tree, err error) { func createDoc(boxID, p, title, dom string, hidden bool) (tree *parse.Tree, err error) {
title = gulu.Str.RemoveInvisible(title) title = gulu.Str.RemoveInvisible(title)
if 512 < utf8.RuneCountInString(title) { if 512 < utf8.RuneCountInString(title) {
// 限制笔记本名和文档名最大长度为 `512` https://github.com/siyuan-note/siyuan/issues/6299 // 限制笔记本名和文档名最大长度为 `512` https://github.com/siyuan-note/siyuan/issues/6299
@ -1541,7 +1541,7 @@ func createDoc(boxID, p, title, dom string, showInDocTree bool) (tree *parse.Tre
tree.Root.AppendChild(treenode.NewParagraph()) tree.Root.AppendChild(treenode.NewParagraph())
} }
if !showInDocTree { if !hidden {
tree.Root.SetIALAttr("custom-hidden", "true") tree.Root.SetIALAttr("custom-hidden", "true")
} }

8
kernel/model/path.go
View File

@ -33,7 +33,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/util" "github.com/siyuan-note/siyuan/kernel/util"
) )
func createDocsByHPath(boxID, hPath, content, parentID string, showInDocTree bool) (id string, existed bool, err error) { func createDocsByHPath(boxID, hPath, content, parentID string, hidden bool) (id string, existed bool, err error) {
hPath = strings.TrimSuffix(hPath, ".sy") hPath = strings.TrimSuffix(hPath, ".sy")
pathBuilder := bytes.Buffer{} pathBuilder := bytes.Buffer{}
pathBuilder.WriteString("/") pathBuilder.WriteString("/")
@ -51,7 +51,7 @@ func createDocsByHPath(boxID, hPath, content, parentID string, showInDocTree boo
// 如果父文档存在且 ID 一致，则直接在父文档下创建 // 如果父文档存在且 ID 一致，则直接在父文档下创建
id = ast.NewNodeID() id = ast.NewNodeID()
p := strings.TrimSuffix(preferredParent.Path, ".sy") + "/" + id + ".sy" p := strings.TrimSuffix(preferredParent.Path, ".sy") + "/" + id + ".sy"
if _, err = createDoc(boxID, p, name, content, showInDocTree); nil != err { if _, err = createDoc(boxID, p, name, content, hidden); nil != err {
return return
} }
} }
@ -68,11 +68,11 @@ func createDocsByHPath(boxID, hPath, content, parentID string, showInDocTree boo
pathBuilder.WriteString(id) pathBuilder.WriteString(id)
docP := pathBuilder.String() + ".sy" docP := pathBuilder.String() + ".sy"
if isNotLast { if isNotLast {
if _, err = createDoc(boxID, docP, part, "", showInDocTree); nil != err { if _, err = createDoc(boxID, docP, part, "", hidden); nil != err {
return return
} }
} else { } else {
if _, err = createDoc(boxID, docP, part, content, showInDocTree); nil != err { if _, err = createDoc(boxID, docP, part, content, hidden); nil != err {
return return
} }
} }