github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 19:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-02-24 22:50:33 +08:00
parent 3c655a7df4
commit 0c09b08214
1 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
app/src/card/openCard.ts
View File

@ -119,6 +119,8 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
dialog.element.setAttribute("data-key", window.siyuan.config.keymap.general.riffCard.custom); dialog.element.setAttribute("data-key", window.siyuan.config.keymap.general.riffCard.custom);
const countElement = dialog.element.querySelector('[data-type="count"]'); const countElement = dialog.element.querySelector('[data-type="count"]');
const actionElements = dialog.element.querySelectorAll(".card__action"); const actionElements = dialog.element.querySelectorAll(".card__action");
const selectElement = dialog.element.querySelector("select");
const titleElement = countElement.previousElementSibling;
dialog.element.addEventListener("click", (event) => { dialog.element.addEventListener("click", (event) => {
const viewElement = hasClosestByAttribute(event.target as HTMLElement, "data-type", "view"); const viewElement = hasClosestByAttribute(event.target as HTMLElement, "data-type", "view");
if (viewElement) { if (viewElement) {
@ -127,10 +129,9 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString(); countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString();
}); });
} else { } else {
viewCards(countElement.previousElementSibling.getAttribute("data-id"), viewCards(titleElement.getAttribute("data-id"), titleElement.textContent, (removeResponse) => {
countElement.previousElementSibling.textContent, (removeResponse) => { countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString();
countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString(); }, true);
}, true);
} }
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -181,27 +182,36 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
index++; index++;
editor.protyle.element.classList.add("card__block--hide"); editor.protyle.element.classList.add("card__block--hide");
if (index > blocks.length - 1) { if (index > blocks.length - 1) {
countElement.classList.add("fn__none"); fetchPost(selectElement ? "/api/riff/getRiffDueCards" : "/api/riff/getTreeRiffDueCards", {
editor.protyle.element.classList.add("fn__none"); rootID: titleElement.getAttribute("data-id"),
editor.protyle.element.nextElementSibling.classList.remove("fn__none"); deckID: selectElement?.value
actionElements[0].classList.add("fn__none"); }, (treeCards) => {
actionElements[1].classList.add("fn__none"); index = 0
blocks = treeCards.data
if (treeCards.data.length === 0) {
allDone(countElement, editor, actionElements)
} else {
nextCard({
countElement,
editor,
actionElements,
index,
blocks
})
}
});
return; return;
} }
actionElements[0].classList.remove("fn__none"); nextCard({
actionElements[1].classList.add("fn__none"); countElement,
countElement.lastElementChild.firstElementChild.innerHTML = (index + 1).toString(); editor,
fetchPost("/api/filetree/getDoc", { actionElements,
id: blocks[index].blockID, index,
mode: 0, blocks
size: Constants.SIZE_GET_MAX })
}, (response) => {
onGet(response, editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
});
}); });
} }
}); });
const selectElement = dialog.element.querySelector("select");
if (!selectElement) { if (!selectElement) {
return; return;
} }
@ -211,26 +221,42 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
index = 0; index = 0;
editor.protyle.element.classList.add("card__block--hide"); editor.protyle.element.classList.add("card__block--hide");
if (blocks.length > 0) { if (blocks.length > 0) {
countElement.lastElementChild.innerHTML = `<span>1</span>/${blocks.length}`; nextCard({
countElement.classList.remove("fn__none"); countElement,
editor.protyle.element.classList.remove("fn__none"); editor,
editor.protyle.element.nextElementSibling.classList.add("fn__none"); actionElements,
actionElements[0].classList.remove("fn__none"); index,
actionElements[1].classList.add("fn__none"); blocks
fetchPost("/api/filetree/getDoc", { })
id: blocks[index].blockID,
mode: 0,
size: Constants.SIZE_GET_MAX
}, (response) => {
onGet(response, editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
});
} else { } else {
countElement.classList.add("fn__none"); allDone(countElement, editor, actionElements)
editor.protyle.element.classList.add("fn__none");
editor.protyle.element.nextElementSibling.classList.remove("fn__none");
actionElements[0].classList.add("fn__none");
actionElements[1].classList.add("fn__none");
} }
}); });
}); });
}; };
const nextCard = (options: {
countElement: Element, editor: Protyle, actionElements: NodeListOf<Element>, index: number, blocks: ICard[]
}) => {
options.actionElements[0].classList.remove("fn__none");
options.actionElements[1].classList.add("fn__none");
options.editor.protyle.element.classList.remove("fn__none");
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");
fetchPost("/api/filetree/getDoc", {
id: options.blocks[options.index].blockID,
mode: 0,
size: Constants.SIZE_GET_MAX
}, (response) => {
onGet(response, options.editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
});
}
const allDone = (countElement: Element, editor: Protyle, actionElements: NodeListOf<Element>) => {
countElement.classList.add("fn__none");
editor.protyle.element.classList.add("fn__none");
editor.protyle.element.nextElementSibling.classList.remove("fn__none");
actionElements[0].classList.add("fn__none");
actionElements[1].classList.add("fn__none");
};