From 307eab1b35aabd46fd66be9ed24ea6fed827abf3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 31 Mar 2023 11:52:56 +0800 Subject: [PATCH 1/3] :art: Flashcard new/review card limit support configure to 0 Fix https://github.com/siyuan-note/siyuan/issues/7841 --- app/src/config/flashcard.ts | 8 ++++---- kernel/api/setting.go | 8 ++++---- kernel/model/conf.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/config/flashcard.ts b/app/src/config/flashcard.ts index 5f83aa391..f3b4c34da 100644 --- a/app/src/config/flashcard.ts +++ b/app/src/config/flashcard.ts @@ -8,13 +8,13 @@ export const flashcard = { responsiveHTML = `
${window.siyuan.languages.flashcardNewCardLimit}
- +
${window.siyuan.languages.flashcardNewCardLimitTip}
${window.siyuan.languages.flashcardReviewCardLimit}
- +
${window.siyuan.languages.flashcardReviewCardLimitTip}
`; /// #else @@ -24,7 +24,7 @@ export const flashcard = {
${window.siyuan.languages.flashcardNewCardLimitTip}
- + `; /// #endif return `${responsiveHTML} diff --git a/kernel/api/setting.go b/kernel/api/setting.go index 1f7d03610..a5c1594c3 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -95,12 +95,12 @@ func setFlashcard(c *gin.Context) { return } - if 1 > flashcard.NewCardLimit { - flashcard.NewCardLimit = 1 + if 0 > flashcard.NewCardLimit { + flashcard.NewCardLimit = 20 } - if 1 > flashcard.ReviewCardLimit { - flashcard.ReviewCardLimit = 1 + if 0 > flashcard.ReviewCardLimit { + flashcard.ReviewCardLimit = 200 } model.Conf.Flashcard = flashcard diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 2b0c3956e..38dbc8bcd 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -321,10 +321,10 @@ func InitConf() { if nil == Conf.Flashcard { Conf.Flashcard = conf.NewFlashcard() } - if 1 > Conf.Flashcard.NewCardLimit { + if 0 > Conf.Flashcard.NewCardLimit { Conf.Flashcard.NewCardLimit = 20 } - if 1 > Conf.Flashcard.ReviewCardLimit { + if 0 > Conf.Flashcard.ReviewCardLimit { Conf.Flashcard.ReviewCardLimit = 200 } From 9d0051a1908d3cb09a235922a58b3f937c2d0381 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 31 Mar 2023 15:39:28 +0800 Subject: [PATCH 2/3] :memo: All local features are free, even for commercial use. --- README.md | 2 +- README_zh_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ce70f7f7..67ddaaeb5 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ WYSIWYG. ### Free -All local features are free. +All local features are free, even for commercial use. * Content block * Block-level reference and two-way links diff --git a/README_zh_CN.md b/README_zh_CN.md index 3ecfb06fb..511aabded 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -27,7 +27,7 @@ ### 免费 -所有本地功能都是免费的。 +所有本地功能都是免费的，即使是在商业环境下使用。 * 内容块 * 块级引用和双向链接 From 10f991c42a56d41ca65f70e566696334747fabdc Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 31 Mar 2023 15:44:48 +0800 Subject: [PATCH 3/3] :art: PDF export supports setting footer https://github.com/siyuan-note/siyuan/issues/7478 --- kernel/conf/export.go | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/conf/export.go b/kernel/conf/export.go index f63c7e43d..5b3773845 100644 --- a/kernel/conf/export.go +++ b/kernel/conf/export.go @@ -28,6 +28,7 @@ type Export struct { FileAnnotationRefMode int `json:"fileAnnotationRefMode"` // 文件标注引用导出模式，0：文件名 - 页码 - 锚文本，1：仅锚文本 PandocBin string `json:"pandocBin"` // Pandoc 可执行文件路径 MarkdownYFM bool `json:"markdownYFM"` // Markdown 导出时是否添加 YAML Front Matter https://github.com/siyuan-note/siyuan/issues/7727 + PDFFooter string `json:"pdfFooter"` // PDF 导出时页脚内容 } func NewExport() *Export {