From 828eeee4be54dc333169e92e03eaba46a499a478 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 4 Oct 2023 11:32:25 +0800 Subject: [PATCH] :sparkles: fix https://github.com/siyuan-note/siyuan/issues/9005 --- app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/assets/scss/business/_card.scss | 4 ++++ app/src/card/openCard.ts | 11 +++++++++-- app/src/config/flashcard.ts | 9 +++++++++ app/src/config/search.ts | 6 ++++-- app/src/types/index.d.ts | 1 + 10 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 8587c9595..019895b81 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -165,6 +165,8 @@ "flashcardListTip": "After enabling, the first list item of a list is recognized as a question, and the rest of the lite items are recognized as answers", "flashcardSuperBlock": "Super Block Carding", "flashcardSuperBlockTip": "After enabling, the first child block of a super block is recognized as a question, and the rest of the child blocks are recognized as answers", + "flashcardHeading": "Heading Block Carding", + "flashcardHeadingTip": "After enabling, the heading block is recognized as a question, and the rest of the child blocks are recognized as answers", "flashcardDeck": "Deck", "flashcardDeckTip": "After enabling, the card deck classification is supported. This is a historical compatibility option, it is not recommended to enable it unless necessary, and it is recommended to use Quick make card", "flashcardFSRSParamRequestRetention": "FSRS Request Retention", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 94766745b..d5dad7418 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -165,6 +165,8 @@ "flashcardListTip": "Después de habilitar, el primer elemento de una lista se reconoce como una pregunta, y el resto de los elementos básicos se reconocen como respuestas", "flashcardSuperBlock": "Carda de súper bloque", "flashcardSuperBlockTip": "Después de habilitar, el primer bloque secundario de un súper bloque se reconoce como una pregunta y el resto de los bloques secundarios se reconocen como respuestas", + "flashcardHeading": "Tarjeta de bloque de encabezado", + "flashcardHeadingTip": "Después de habilitarlo, el bloque de encabezado se reconoce como una pregunta y el resto de los bloques secundarios se reconocen como respuestas", "flashcardDeck": "Mazo", "flashcardDeckTip": "Después de habilitar, se admite la clasificación del mazo de cartas. Esta es una opción de compatibilidad histórica, no se recomienda habilitarla a menos que sea necesario, y se recomienda usar Quick make card", "flashcardFSRSParamRequestRetention": "Retención de solicitud FSRS", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 36a729da5..8158167d9 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -165,6 +165,8 @@ "flashcardListTip": "Après l'activation, le premier élément d'une liste est reconnu comme une question, et le reste des éléments légers sont reconnus comme des réponses", "flashcardSuperBlock": "Carte Super Block", "flashcardSuperBlockTip": "Après l'activation, le premier bloc enfant d'un super bloc est reconnu comme une question, et les autres blocs enfants sont reconnus comme des réponses", + "flashcardHeading": "Carte de bloc d'en-tête", + "flashcardHeadingTip": "Après activation, le bloc d'en-tête est reconnu comme une question et le reste des blocs enfants sont reconnus comme des réponses", "flashcardDeck": "Deck", "flashcardDeckTip": "Après l'activation, la classification du jeu de cartes est prise en charge. Il s'agit d'une option de compatibilité historique, il n'est pas recommandé de l'activer sauf si nécessaire, et il est recommandé d'utiliser Quick make card", "flashcardFSRSParamRequestRetention": "Rétention des requêtes FSRS", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index df86e6170..c795dfb99 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -165,6 +165,8 @@ "flashcardListTip": "啟用後支持列表塊制卡，列表的第一個列表項被識別為問題，子列表識別為答案", "flashcardSuperBlock": "超級塊制卡", "flashcardSuperBlockTip": "啟用後支持超級塊制卡，超級塊的第一個子塊被識別為問題，其餘子塊識別為答案", + "flashcardHeading": "標題塊製卡", + "flashcardHeadingTip": "啟用後支援標題區塊製卡，標題區塊被識別為問題，其餘子區塊識別為答案", "flashcardDeck": "卡包", "flashcardDeckTip": "啟用後支持卡包分類。這是一個歷史兼容選項，如無必要建議不要啟用，推薦使用 快速制卡", "flashcardFSRSParamRequestRetention": "FSRS Request Retention", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 6c156b455..aa0feaa90 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -165,6 +165,8 @@ "flashcardListTip": "启用后支持列表块制卡，列表的第一个列表项被识别为问题，子列表识别为答案", "flashcardSuperBlock": "超级块制卡", "flashcardSuperBlockTip": "启用后支持超级块制卡，超级块的第一个子块被识别为问题，其余子块识别为答案", + "flashcardHeading": "标题块制卡", + "flashcardHeadingTip": "启用后支持标题块制卡，标题块被识别为问题，其余子块识别为答案", "flashcardDeck": "卡包", "flashcardDeckTip": "启用后支持卡包分类。这是一个历史兼容选项，如无必要建议不要启用，推荐使用 快速制卡", "flashcardFSRSParamRequestRetention": "FSRS Request Retention", diff --git a/app/src/assets/scss/business/_card.scss b/app/src/assets/scss/business/_card.scss index fa06cf5ec..8c7d0fdc8 100644 --- a/app/src/assets/scss/business/_card.scss +++ b/app/src/assets/scss/business/_card.scss @@ -81,6 +81,10 @@ &--hidesb .protyle-wysiwyg > .sb > div:nth-of-type(n+2):not(.protyle-attr) { display: none; } + + &--hideh .protyle-wysiwyg > div[data-type="NodeHeading"] ~ div { + display: none; + } } } diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 8586e8377..990b9172c 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -57,7 +57,11 @@ export const genCardHTML = (options: { /// #endif return `
${iconsHTML} -
+
🔮
${window.siyuan.languages.noDueCard} @@ -320,7 +324,7 @@ export const bindCardEvent = (options: { if (actionElements[0].classList.contains("fn__none")) { return; } - editor.protyle.element.classList.remove("card__block--hidemark", "card__block--hideli", "card__block--hidesb"); + editor.protyle.element.classList.remove("card__block--hidemark", "card__block--hideli", "card__block--hidesb", "card__block--hideh"); actionElements[0].classList.add("fn__none"); actionElements[1].querySelectorAll(".b3-button").forEach((element, btnIndex) => { element.previousElementSibling.textContent = options.blocks[index].nextDues[btnIndex]; @@ -460,6 +464,9 @@ const nextCard = (options: { if (window.siyuan.config.flashcard.superBlock) { options.editor.protyle.element.classList.add("card__block--hidesb"); } + if (window.siyuan.config.flashcard.heading) { + options.editor.protyle.element.classList.add("card__block--hideh"); + } if (window.siyuan.config.flashcard.list) { options.editor.protyle.element.classList.add("card__block--hideli"); } diff --git a/app/src/config/flashcard.ts b/app/src/config/flashcard.ts index c15a6fc19..ad62f708d 100644 --- a/app/src/config/flashcard.ts +++ b/app/src/config/flashcard.ts @@ -19,6 +19,14 @@ export const flashcard = { +