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

🚨

Browse Source
This commit is contained in:
Vanessa 2022-12-30 01:05:22 +08:00
parent 0df0fa4943
commit 99f16b2a7a
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/card/makeCard.ts
View File

@ -124,7 +124,7 @@ export const makeCard = (nodeElement: Element[]) => {
event.preventDefault(); event.preventDefault();
break; break;
} else if (type === "view") { } else if (type === "view") {
viewCards(target.parentElement.getAttribute("data-id"), target.parentElement.querySelector(".b3-list-item__text").textContent) viewCards(target.parentElement.getAttribute("data-id"), target.parentElement.querySelector(".b3-list-item__text").textContent);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
break; break;
@ -195,7 +195,7 @@ const viewCards = (deckID: string, title: string) => {
width: isMobile() ? "90vw" : "80vw", width: isMobile() ? "90vw" : "80vw",
height: "80vh", height: "80vh",
destroyCallback() { destroyCallback() {
edit.destroy() edit.destroy();
} }
}); });
if (response.data.blocks.length === 0) { if (response.data.blocks.length === 0) {
@ -208,17 +208,17 @@ const viewCards = (deckID: string, title: string) => {
breadcrumbDocName: true breadcrumbDocName: true
}, },
}); });
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id")) getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id"));
const previousElement = dialog.element.querySelector('[data-type="previous"]'); const previousElement = dialog.element.querySelector('[data-type="previous"]');
const nextElement = dialog.element.querySelector('[data-type="next"]'); const nextElement = dialog.element.querySelector('[data-type="next"]');
const listElement = dialog.element.querySelector(".b3-list--background") const listElement = dialog.element.querySelector(".b3-list--background");
if (response.data.pageCount > 1) { if (response.data.pageCount > 1) {
nextElement.removeAttribute("disabled"); nextElement.removeAttribute("disabled");
} }
dialog.element.addEventListener("click", (event) => { dialog.element.addEventListener("click", (event) => {
let target = event.target as HTMLElement; let target = event.target as HTMLElement;
while (target && !dialog.element.isSameNode(target)) { while (target && !dialog.element.isSameNode(target)) {
const type = target.getAttribute("data-type") const type = target.getAttribute("data-type");
if (type === "previous") { if (type === "previous") {
pageIndex--; pageIndex--;
if (pageIndex <= 1) { if (pageIndex <= 1) {
@ -230,10 +230,10 @@ const viewCards = (deckID: string, title: string) => {
} else if (cardsResponse.data.pageCount > 1) { } else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled"); nextElement.removeAttribute("disabled");
} }
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount}` nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks) listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id")) getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id"));
}) });
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
break; break;
@ -246,19 +246,19 @@ const viewCards = (deckID: string, title: string) => {
} else if (cardsResponse.data.pageCount > 1) { } else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled"); nextElement.removeAttribute("disabled");
} }
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount}` nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks) listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id")) getArticle(edit, dialog.element.querySelector(".b3-list-item--focus").getAttribute("data-id"));
}) });
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
break; break;
} else if (type === "card-item") { } else if (type === "card-item") {
const id = target.getAttribute("data-id"); const id = target.getAttribute("data-id");
if (id) { if (id) {
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus") listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
target.classList.add("b3-list-item--focus") target.classList.add("b3-list-item--focus");
getArticle(edit, id) getArticle(edit, id);
} }
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
@ -274,11 +274,11 @@ const viewCards = (deckID: string, title: string) => {
event.preventDefault(); event.preventDefault();
break; break;
} }
target = target.parentElement target = target.parentElement;
} }
})
}); });
} });
};
const getArticle = (edit: Protyle, id: string) => { const getArticle = (edit: Protyle, id: string) => {
if (!id) { if (!id) {
@ -293,11 +293,11 @@ const getArticle = (edit: Protyle, id: string) => {
}, getResponse => { }, getResponse => {
onGet(getResponse, edit.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]); onGet(getResponse, edit.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
}); });
} };
const renderViewItem = (blocks: IBlock[]) => { const renderViewItem = (blocks: IBlock[]) => {
let listHTML = "" let listHTML = "";
let isFirst = true let isFirst = true;
blocks.forEach((item: IBlock) => { blocks.forEach((item: IBlock) => {
if (item.type) { if (item.type) {
const hPath = escapeHtml(getNotebookName(item.box)) + getDisplayName(item.hPath, false); const hPath = escapeHtml(getNotebookName(item.box)) + getDisplayName(item.hPath, false);
@ -324,4 +324,4 @@ ${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
listHTML = `<div class="b3-list--empty">${window.siyuan.languages.emptyContent}</div>`; listHTML = `<div class="b3-list--empty">${window.siyuan.languages.emptyContent}</div>`;
} }
return listHTML; return listHTML;
} };

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

@ -153,7 +153,7 @@ export const openCard = () => {
actionElements[0].classList.add("fn__none"); actionElements[0].classList.add("fn__none");
actionElements[1].querySelectorAll(".b3-button").forEach((element, btnIndex) => { actionElements[1].querySelectorAll(".b3-button").forEach((element, btnIndex) => {
element.previousElementSibling.textContent = blocks[index].nextDues[btnIndex]; element.previousElementSibling.textContent = blocks[index].nextDues[btnIndex];
}) });
actionElements[1].classList.remove("fn__none"); actionElements[1].classList.remove("fn__none");
return; return;
} }