Browse Source

:art: Flashcard new/review card limit support configure to 0 Fix https://github.com/siyuan-note/siyuan/issues/7841

Liang Ding 2 years ago
parent
commit
307eab1b35
3 changed files with 10 additions and 10 deletions
  1. 4 4
      app/src/config/flashcard.ts
  2. 4 4
      kernel/api/setting.go
  3. 2 2
      kernel/model/conf.go

+ 4 - 4
app/src/config/flashcard.ts

@@ -8,13 +8,13 @@ export const flashcard = {
         responsiveHTML = `<div class="b3-label">
     ${window.siyuan.languages.flashcardNewCardLimit}
     <div class="fn__hr"></div>
-    <input class="b3-text-field fn__flex-center fn__block" id="newCardLimit" step="1" min="1" type="number"${window.siyuan.config.flashcard.newCardLimit ? " checked" : "" } value="${window.siyuan.config.flashcard.newCardLimit}"/>
+    <input class="b3-text-field fn__flex-center fn__block" id="newCardLimit" step="1" min="0" type="number"${window.siyuan.config.flashcard.newCardLimit ? " checked" : "" } value="${window.siyuan.config.flashcard.newCardLimit}"/>
     <div class="b3-label__text">${window.siyuan.languages.flashcardNewCardLimitTip}</div>
 </div>
 <div class="b3-label">
     ${window.siyuan.languages.flashcardReviewCardLimit}
     <div class="fn__hr"></div>
-    <input class="b3-text-field fn__flex-center fn__block" id="reviewCardLimit" step="1" min="1" type="number"${window.siyuan.config.flashcard.reviewCardLimit ? " checked" : ""} value="${window.siyuan.config.flashcard.reviewCardLimit}"/>
+    <input class="b3-text-field fn__flex-center fn__block" id="reviewCardLimit" step="1" min="0" type="number"${window.siyuan.config.flashcard.reviewCardLimit ? " checked" : ""} value="${window.siyuan.config.flashcard.reviewCardLimit}"/>
     <div class="b3-label__text">${window.siyuan.languages.flashcardReviewCardLimitTip}</div>
 </div>`;
         /// #else
@@ -24,7 +24,7 @@ export const flashcard = {
         <div class="b3-label__text">${window.siyuan.languages.flashcardNewCardLimitTip}</div>
     </div>
     <span class="fn__space"></span>
-    <input class="b3-text-field fn__flex-center fn__size200" id="newCardLimit" step="1" min="1" type="number"${window.siyuan.config.flashcard.newCardLimit ? " checked" : "" } value="${window.siyuan.config.flashcard.newCardLimit}"/>
+    <input class="b3-text-field fn__flex-center fn__size200" id="newCardLimit" step="1" min="0" type="number"${window.siyuan.config.flashcard.newCardLimit ? " checked" : "" } value="${window.siyuan.config.flashcard.newCardLimit}"/>
 </label>
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
@@ -32,7 +32,7 @@ export const flashcard = {
         <div class="b3-label__text">${window.siyuan.languages.flashcardReviewCardLimitTip}</div>
     </div>
     <span class="fn__space"></span>
-    <input class="b3-text-field fn__flex-center fn__size200" id="reviewCardLimit" step="1" min="1" type="number"${window.siyuan.config.flashcard.reviewCardLimit ? " checked" : ""} value="${window.siyuan.config.flashcard.reviewCardLimit}"/>
+    <input class="b3-text-field fn__flex-center fn__size200" id="reviewCardLimit" step="1" min="0" type="number"${window.siyuan.config.flashcard.reviewCardLimit ? " checked" : ""} value="${window.siyuan.config.flashcard.reviewCardLimit}"/>
 </label>`;
         /// #endif
         return `${responsiveHTML}

+ 4 - 4
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

+ 2 - 2
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
 	}