🎨 Documents created via the database are no longer automatically hidden Fix https://github.com/siyuan-note/siyuan/issues/9298

This commit is contained in:
Daniel 2023-09-27 16:11:18 +08:00
parent 4c47fdbdb1
commit 3842a17d07
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 10 additions and 25 deletions

View file

@ -422,7 +422,6 @@ ${genHintItemHTML(item)}
const realFileName = fileNames.length === 1 ? fileNames[0] : fileNames[1]; const realFileName = fileNames.length === 1 ? fileNames[0] : fileNames[1];
getSavePath(protyle.path, protyle.notebookId, (pathString) => { getSavePath(protyle.path, protyle.notebookId, (pathString) => {
fetchPost("/api/filetree/createDocWithMd", { fetchPost("/api/filetree/createDocWithMd", {
hidden: false,
notebook: protyle.notebookId, notebook: protyle.notebookId,
path: pathPosix().join(pathString, realFileName), path: pathPosix().join(pathString, realFileName),
parentID: protyle.block.rootID, parentID: protyle.block.rootID,

View file

@ -481,12 +481,6 @@ func createDocWithMd(c *gin.Context) {
parentID = parentIDArg.(string) parentID = parentIDArg.(string)
} }
hidden := true
hiddenArg := arg["hidden"]
if nil != hiddenArg {
hidden = hiddenArg.(bool)
}
hPath := arg["path"].(string) hPath := arg["path"].(string)
markdown := arg["markdown"].(string) markdown := arg["markdown"].(string)
@ -502,7 +496,7 @@ func createDocWithMd(c *gin.Context) {
hPath = "/" + hPath hPath = "/" + hPath
} }
id, err := model.CreateWithMarkdown(notebook, hPath, markdown, parentID, hidden) id, err := model.CreateWithMarkdown(notebook, hPath, markdown, parentID)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -510,10 +504,6 @@ func createDocWithMd(c *gin.Context) {
} }
ret.Data = id ret.Data = id
if !hidden {
return
}
box := model.Conf.Box(notebook) box := model.Conf.Box(notebook)
b, _ := model.GetBlock(id, nil) b, _ := model.GetBlock(id, nil)
p := b.Path p := b.Path

View file

@ -1019,7 +1019,7 @@ func CreateDocByMd(boxID, p, title, md string, sorts []string) (tree *parse.Tree
luteEngine := util.NewLute() luteEngine := util.NewLute()
dom := luteEngine.Md2BlockDOM(md, false) dom := luteEngine.Md2BlockDOM(md, false)
tree, err = createDoc(box.ID, p, title, dom, true) tree, err = createDoc(box.ID, p, title, dom)
if nil != err { if nil != err {
return return
} }
@ -1028,7 +1028,7 @@ func CreateDocByMd(boxID, p, title, md string, sorts []string) (tree *parse.Tree
return return
} }
func CreateWithMarkdown(boxID, hPath, md, parentID string, hidden bool) (id string, err error) { func CreateWithMarkdown(boxID, hPath, md, parentID string) (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))
@ -1038,7 +1038,7 @@ func CreateWithMarkdown(boxID, hPath, md, parentID string, hidden bool) (id stri
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, hidden) id, _, err = createDocsByHPath(box.ID, hPath, dom, parentID)
return return
} }
@ -1442,7 +1442,7 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
return return
} }
id, existed, err := createDocsByHPath(box.ID, hPath, "", "", true) id, existed, err := createDocsByHPath(box.ID, hPath, "", "")
if nil != err { if nil != err {
return return
} }
@ -1487,7 +1487,7 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
return return
} }
func createDoc(boxID, p, title, dom string, hidden bool) (tree *parse.Tree, err error) { func createDoc(boxID, p, title, dom string) (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
@ -1559,10 +1559,6 @@ func createDoc(boxID, p, title, dom string, hidden bool) (tree *parse.Tree, err
tree.Root.AppendChild(treenode.NewParagraph()) tree.Root.AppendChild(treenode.NewParagraph())
} }
if !hidden {
tree.Root.SetIALAttr("custom-hidden", "true")
}
transaction := &Transaction{DoOperations: []*Operation{{Action: "create", Data: tree}}} transaction := &Transaction{DoOperations: []*Operation{{Action: "create", Data: tree}}}
PerformTransactions(&[]*Transaction{transaction}) PerformTransactions(&[]*Transaction{transaction})
WaitForWritingFiles() WaitForWritingFiles()

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, hidden bool) (id string, existed bool, err error) { func createDocsByHPath(boxID, hPath, content, parentID string) (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, hidden bool) (id
// 如果父文档存在且 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, hidden); nil != err { if _, err = createDoc(boxID, p, name, content); nil != err {
return return
} }
} }
@ -68,11 +68,11 @@ func createDocsByHPath(boxID, hPath, content, parentID string, hidden bool) (id
pathBuilder.WriteString(id) pathBuilder.WriteString(id)
docP := pathBuilder.String() + ".sy" docP := pathBuilder.String() + ".sy"
if isNotLast { if isNotLast {
if _, err = createDoc(boxID, docP, part, "", hidden); nil != err { if _, err = createDoc(boxID, docP, part, ""); nil != err {
return return
} }
} else { } else {
if _, err = createDoc(boxID, docP, part, content, hidden); nil != err { if _, err = createDoc(boxID, docP, part, content); nil != err {
return return
} }
} }