renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 Supports specifying the notebook to save new docs https://github.com/siyuan-note/siyuan/issues/10671

Browse Source
This commit is contained in:
Daniel
2024-04-25 11:18:34 +08:00
parent 882883a9cc
commit f0fd493c4e
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
kernel/api/filetree.go
View File

@@ -704,10 +704,18 @@ func getDocCreateSavePath(c *gin.Context) {
notebook := arg["notebook"].(string)
box := model.Conf.Box(notebook)
var docCreateSaveBox string
docCreateSavePathTpl := model.Conf.FileTree.DocCreateSavePath
if nil != box {
docCreateSaveBox = box.GetConf().DocCreateSaveBox
docCreateSavePathTpl = box.GetConf().DocCreateSavePath
}
if "" == docCreateSaveBox {
docCreateSaveBox = model.Conf.FileTree.DocCreateSaveBox
}
if "" == docCreateSaveBox {
docCreateSaveBox = notebook
}
if "" == docCreateSavePathTpl {
docCreateSavePathTpl = model.Conf.FileTree.DocCreateSavePath
}
@@ -719,14 +727,16 @@ func getDocCreateSavePath(c *gin.Context) {
docCreateSavePathTpl = "/Untitled"
}
p, err := model.RenderGoTemplate(docCreateSavePathTpl)
docCreateSavePath, err := model.RenderGoTemplate(docCreateSavePathTpl)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = map[string]interface{}{
"path": p,
"box": docCreateSaveBox,
"path": docCreateSavePath,
}
}
@@ -741,22 +751,31 @@ func getRefCreateSavePath(c *gin.Context) {
notebook := arg["notebook"].(string)
box := model.Conf.Box(notebook)
refCreateSavePath := model.Conf.FileTree.RefCreateSavePath
var refCreateSaveBox string
refCreateSavePathTpl := model.Conf.FileTree.RefCreateSavePath
if nil != box {
refCreateSavePath = box.GetConf().RefCreateSavePath
refCreateSaveBox = box.GetConf().RefCreateSaveBox
refCreateSavePathTpl = box.GetConf().RefCreateSavePath
}
if "" == refCreateSavePath {
refCreateSavePath = model.Conf.FileTree.RefCreateSavePath
if "" == refCreateSaveBox {
refCreateSaveBox = model.Conf.FileTree.RefCreateSaveBox
}
if "" == refCreateSaveBox {
refCreateSaveBox = notebook
}
if "" == refCreateSavePathTpl {
refCreateSavePathTpl = model.Conf.FileTree.RefCreateSavePath
}
p, err := model.RenderGoTemplate(refCreateSavePath)
refCreateSavePath, err := model.RenderGoTemplate(refCreateSavePathTpl)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = map[string]interface{}{
"path": p,
"box": refCreateSaveBox,
"path": refCreateSavePath,
}
}