From b40b460f0c2753f04e4a7aa350e3a1976380bd79 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 1 Jul 2022 22:41:28 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=BD=93=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=97=B6=E6=94=AF=E6=8C=81=E5=9C=A8=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=8A/=E4=B8=8B=E6=96=B0=E5=BB=BA=E5=90=8C?= =?UTF-8?q?=E7=BA=A7=E6=96=87=E6=A1=A3=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/5098?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/filetree.go | 9 ++++++++- kernel/model/file.go | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/kernel/api/filetree.go b/kernel/api/filetree.go index e292f5d2f..0b3f8f3ba 100644 --- a/kernel/api/filetree.go +++ b/kernel/api/filetree.go @@ -342,8 +342,15 @@ func createDoc(c *gin.Context) { p := arg["path"].(string) title := arg["title"].(string) md := arg["md"].(string) + sortsArg := arg["sorts"] + var sorts []string + if nil != sortsArg { + for _, sort := range sortsArg.([]interface{}) { + sorts = append(sorts, sort.(string)) + } + } - err := model.CreateDocByMd(notebook, p, title, md) + err := model.CreateDocByMd(notebook, p, title, md, sorts) if nil != err { ret.Code = -1 ret.Msg = err.Error() diff --git a/kernel/model/file.go b/kernel/model/file.go index ccc771402..c89ed3b75 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -920,7 +920,7 @@ func DuplicateDoc(rootID string) (err error) { return } -func CreateDocByMd(boxID, p, title, md string) (err error) { +func CreateDocByMd(boxID, p, title, md string, sorts []string) (err error) { WaitForWritingFiles() box := Conf.Box(boxID) @@ -930,7 +930,13 @@ func CreateDocByMd(boxID, p, title, md string) (err error) { luteEngine := NewLute() dom := luteEngine.Md2BlockDOM(md) - return createDoc(box.ID, p, title, dom) + err = createDoc(box.ID, p, title, dom) + if nil != err { + return + } + + ChangeFileTreeSort(box.ID, sorts) + return } func CreateWithMarkdown(boxID, hPath, md string) (id string, err error) {