diff --git a/app/src/config/fileTree.ts b/app/src/config/fileTree.ts index 7912d4a5b..9dc0c57de 100644 --- a/app/src/config/fileTree.ts +++ b/app/src/config/fileTree.ts @@ -94,7 +94,7 @@ export const fileTree = {
${window.siyuan.languages.recentDocsMaxCountTip}
- +
${window.siyuan.languages.fileTree12} diff --git a/app/src/mobile/settings/fileTree.ts b/app/src/mobile/settings/fileTree.ts index dabfc46a5..764de1b14 100644 --- a/app/src/mobile/settings/fileTree.ts +++ b/app/src/mobile/settings/fileTree.ts @@ -57,7 +57,7 @@ export const initFileTree = () => {
${window.siyuan.languages.recentDocsMaxListCount} - +
${window.siyuan.languages.recentDocsMaxListCountTip}
diff --git a/kernel/api/setting.go b/kernel/api/setting.go index 0362a1fbd..b6f888d45 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -423,6 +423,10 @@ func setFiletree(c *gin.Context) { if 32 < fileTree.MaxOpenTabCount { fileTree.MaxOpenTabCount = 32 } + + if conf.MinFileTreeRecentDocsListCount > fileTree.RecentDocsMaxListCount { + fileTree.RecentDocsMaxListCount = conf.MinFileTreeRecentDocsListCount + } if conf.MaxFileTreeRecentDocsListCount < fileTree.RecentDocsMaxListCount { fileTree.RecentDocsMaxListCount = conf.MaxFileTreeRecentDocsListCount } diff --git a/kernel/conf/filetree.go b/kernel/conf/filetree.go index 31f7e430f..4548571b5 100644 --- a/kernel/conf/filetree.go +++ b/kernel/conf/filetree.go @@ -54,4 +54,7 @@ func NewFileTree() *FileTree { } } -const MaxFileTreeRecentDocsListCount = 256 +const ( + MinFileTreeRecentDocsListCount = 32 + MaxFileTreeRecentDocsListCount = 256 +) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 96ddc99f1..fd3b32196 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -236,8 +236,8 @@ func InitConf() { Conf.FileTree.CreateDocAtTop = func() *bool { b := true; return &b }() } - if 1 > Conf.FileTree.RecentDocsMaxListCount { - Conf.FileTree.RecentDocsMaxListCount = 32 + if conf.MinFileTreeRecentDocsListCount > Conf.FileTree.RecentDocsMaxListCount { + Conf.FileTree.RecentDocsMaxListCount = conf.MinFileTreeRecentDocsListCount } if conf.MaxFileTreeRecentDocsListCount < Conf.FileTree.RecentDocsMaxListCount { Conf.FileTree.RecentDocsMaxListCount = conf.MaxFileTreeRecentDocsListCount