Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/7455

Browse source
This commit is contained in:
Vanessa 2023-02-26 11:34:30 +08:00
parent 76e7e7d074
commit 69139f530d
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/card/openCard.ts
View file

@ -54,6 +54,11 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
${window.siyuan.languages.noDueCard}
</div>
<div class="fn__flex card__action${blocks.length === 0 ? " fn__none" : ""}">
<button class="b3-button b3-button--cancel" disabled="disabled" data-type="-2" style="width: 25%;min-width: 86px;display: flex">
<svg><use xlink:href="#iconLeft"></use></svg>
(p)
</button>
<span class="fn__space"></span>
<button data-type="-1" class="b3-button fn__flex-1">${window.siyuan.languages.cardShowAnswer} (${window.siyuan.languages.space})</button>
</div>
<div class="fn__flex card__action fn__none">
@ -143,8 +148,10 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
type = "2";
} else if (event.detail === "4" || event.detail === ";") {
type = "3";
} else if (event.detail === "s") {
} else if (event.detail === " ") {
type = "-1";
}else if (event.detail === "p") {
type = "-2";
}
}
if (!type) {
@ -168,6 +175,20 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
actionElements[1].classList.remove("fn__none");
return;
}
if (type === "-2") {
if (index > 0) {
index--;
editor.protyle.element.classList.add("card__block--hide");
nextCard({
countElement,
editor,
actionElements,
index,
blocks
})
}
return;
}
if (["0", "1", "2", "3"].includes(type)) {
fetchPost("/api/riff/reviewRiffCard", {
deckID: blocks[index].deckID,
@ -239,6 +260,11 @@ const nextCard = (options: {
options.editor.protyle.element.nextElementSibling.classList.add("fn__none");
options.countElement.lastElementChild.innerHTML = `<span>${options.index + 1}</span>/${options.blocks.length}`;
options.countElement.classList.remove("fn__none");
if (options.index === 0) {
options.actionElements[0].firstElementChild.setAttribute("disabled", "disabled");
} else{
options.actionElements[0].firstElementChild.removeAttribute("disabled");
}
fetchPost("/api/filetree/getDoc", {
id: options.blocks[options.index].blockID,
mode: 0,

2
app/src/util/globalShortcut.ts
View file

@ -384,7 +384,7 @@ export const globalShortcut = () => {
if (!event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey &&
!["INPUT", "TEXTAREA"].includes((event.target as HTMLElement).tagName) &&
["1", "2", "3", "4", "j", "k", "l", ";", "s"].includes(event.key.toLowerCase())) {
["1", "2", "3", "4", "j", "k", "l", ";", "s", " ", "p"].includes(event.key.toLowerCase())) {
const openCardDialog = window.siyuan.dialogs.find(item => {
if (item.element.getAttribute("data-key") === window.siyuan.config.keymap.general.riffCard.custom) {
return true;