Vanessa 2023-02-15 09:48:06 +08:00
parent 9249d4e010
commit f632ef811e
3 changed files with 222 additions and 197 deletions

View file

@ -4,17 +4,10 @@ import {Dialog} from "../dialog";
import {isMobile} from "../util/functions";
import {hideMessage, showMessage} from "../dialog/message";
import {confirmDialog} from "../dialog/confirmDialog";
import {Protyle} from "../protyle";
import {getIconByType} from "../editor/getIcon";
import {unicode2Emoji} from "../emoji";
import {Constants} from "../constants";
import {onGet} from "../protyle/util/onGet";
import {addLoading} from "../protyle/ui/initUI";
import {escapeHtml} from "../util/escape";
import {getDisplayName, getNotebookName} from "../util/pathName";
import {hideElements} from "../protyle/ui/hideElements";
import {viewCards} from "./viewCards";
const genCardItem = (item: ICard) => {
export const genCardItem = (item: ICard) => {
return `<li data-id="${item.id}" class="b3-list-item b3-list-item--narrow${isMobile() ? "" : " b3-list-item--hide-action"}">
<span class="b3-list-item__text">${item.name}</span>
<span class="counter b3-tooltips b3-tooltips__w${isMobile() ? "" : " fn__none"}" aria-label="${window.siyuan.languages.riffCard}">${item.size}</span>
@ -30,10 +23,10 @@ const genCardItem = (item: ICard) => {
<span data-type="delete" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.delete}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span>
<span data-type="view" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.riffCard}">
<span data-type="view" class="b3-list-item__action">
<svg><use xlink:href="#iconEye"></use></svg>
</span>
<span class="counter b3-tooltips b3-tooltips__w${isMobile() ? " fn__none" : ""}" aria-label="${window.siyuan.languages.riffCard}">${item.size}</span>
<span class="b3-list-item__meta${isMobile() ? " fn__none" : ""}">${item.size}</span>
<span class="b3-list-item__meta${isMobile() ? " fn__none" : ""}">${item.updated}</span>
</li>`;
};
@ -59,7 +52,7 @@ export const makeCard = (nodeElement: Element[]) => {
html += genCardItem(item);
});
const dialog = new Dialog({
width: isMobile() ? "90vw" : "768px",
width: isMobile() ? "90vw" : "50vw",
height: "70vh",
title: window.siyuan.languages.riffCard,
content: `<div class="b3-dialog__content fn__flex-column" style="box-sizing: border-box;height: 100%">
@ -177,187 +170,5 @@ export const makeCard = (nodeElement: Element[]) => {
});
};
const viewCards = (deckID: string, title: string, sourceElement: HTMLElement) => {
let pageIndex = 1;
let edit:Protyle;
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (response) => {
const dialog = new Dialog({
title,
content: `<div class="fn__flex-column" style="height: 100%">
<div class="fn__hr"></div>
<div class="fn__flex">
<span class="fn__space"></span>
<span data-type="previous" class="block__icon block__icon--show b3-tooltips b3-tooltips__ne" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
<span class="fn__space"></span>
<span data-type="next" class="block__icon block__icon--show b3-tooltips b3-tooltips__ne" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
<span class="fn__space"></span>
<span class="fn__flex-center ft__on-surface">${pageIndex}/${response.data.pageCount || 1}</span>
<div class="fn__flex-1"></div>
</div>
<div class="fn__hr"></div>
<div class="${isMobile() ? "fn__flex-column" : "fn__flex"} fn__flex-1">
<ul class="fn__flex-1 b3-list b3-list--background" style="user-select: none">
${renderViewItem(response.data.blocks)}
</ul>
<div id="cardPreview" class="fn__flex-1 fn__none"></div>
<div class="fn__flex-1 b3-dialog__cardempty">${window.siyuan.languages.emptyContent}</div>
</div>
</div>`,
width: isMobile() ? "90vw" : "80vw",
height: "80vh",
destroyCallback() {
if (edit) {
edit.destroy();
}
}
});
if (response.data.blocks.length === 0) {
return;
}
edit = new Protyle(dialog.element.querySelector("#cardPreview") as HTMLElement, {
blockId: "",
render: {
gutter: true,
breadcrumbDocName: true
},
});
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
const previousElement = dialog.element.querySelector('[data-type="previous"]');
const nextElement = dialog.element.querySelector('[data-type="next"]');
const listElement = dialog.element.querySelector(".b3-list--background");
if (response.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
dialog.element.style.zIndex = "200";
dialog.element.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target && !dialog.element.isSameNode(target)) {
const type = target.getAttribute("data-type");
if (type === "previous") {
if (pageIndex <= 1) {
return;
}
pageIndex--;
if (pageIndex <= 1) {
previousElement.setAttribute("disabled", "disabled");
}
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (cardsResponse) => {
if (pageIndex === cardsResponse.data.pageCount) {
nextElement.setAttribute("disabled", "disabled");
} else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount || 1}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
});
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "next") {
if (pageIndex >= response.data.pageCount) {
return;
}
pageIndex++;
previousElement.removeAttribute("disabled");
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (cardsResponse) => {
if (pageIndex === cardsResponse.data.pageCount) {
nextElement.setAttribute("disabled", "disabled");
} else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount || 1}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
});
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "card-item") {
getArticle(edit, target.getAttribute("data-id"));
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
target.classList.add("b3-list-item--focus");
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "remove") {
fetchPost("/api/riff/removeRiffCards", {
deckID,
blockIDs: [target.getAttribute("data-id")]
}, (removeResponse) => {
let nextElment = target.parentElement.nextElementSibling;
if (!nextElment) {
nextElment = target.parentElement.previousElementSibling;
}
if (!nextElment && target.parentElement.parentElement.childElementCount > 1) {
nextElment = target.parentElement.parentElement.firstElementChild;
}
if (!nextElment) {
getArticle(edit, "");
} else {
getArticle(edit, nextElment.getAttribute("data-id"));
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
nextElment.classList.add("b3-list-item--focus");
}
target.parentElement.remove();
sourceElement.outerHTML = genCardItem(removeResponse.data);
});
event.stopPropagation();
event.preventDefault();
break;
}
target = target.parentElement;
}
});
});
};
const getArticle = (edit: Protyle, id: string) => {
if (!id) {
edit.protyle.element.classList.add("fn__none");
edit.protyle.element.nextElementSibling.classList.remove("fn__none");
return;
}
edit.protyle.element.classList.remove("fn__none");
edit.protyle.element.nextElementSibling.classList.add("fn__none");
edit.protyle.scroll.lastScrollTop = 0;
addLoading(edit.protyle);
fetchPost("/api/filetree/getDoc", {
id,
mode: 0,
size: Constants.SIZE_GET_MAX,
}, getResponse => {
onGet(getResponse, edit.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
});
};
const renderViewItem = (blocks: IBlock[]) => {
let listHTML = "";
let isFirst = true;
blocks.forEach((item: IBlock) => {
if (item.type) {
const hPath = escapeHtml(getNotebookName(item.box)) + getDisplayName(item.hPath, false);
listHTML += `<div data-type="card-item" class="b3-list-item${isFirst ? " b3-list-item--focus" : ""}${isMobile() ? "" : " b3-list-item--hide-action"}" data-id="${item.id}">
<svg class="b3-list-item__graphic"><use xlink:href="#${getIconByType(item.type)}"></use></svg>
${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
<span class="b3-list-item__text">${item.content}</span>
<span data-type="remove" data-id="${item.id}" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.removeDeck}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span>
<span class="${isMobile() ? "fn__none " : ""}b3-list-item__meta b3-list-item__meta--ellipsis" title="${hPath}">${hPath}</span>
</div>`;
isFirst = false;
} else {
listHTML += `<div data-type="card-item" class="b3-list-item${isMobile() ? "" : " b3-list-item--hide-action"}">
<span class="b3-list-item__text">${item.content}</span>
<span data-type="remove" data-id="${item.id}" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.removeDeck}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span>
</div>`;
}
});
if (blocks.length === 0) {
listHTML = `<div class="b3-list--empty">${window.siyuan.languages.emptyContent}</div>`;
}
return listHTML;
};

View file

@ -4,7 +4,8 @@ import {isMobile} from "../util/functions";
import {Protyle} from "../protyle";
import {Constants} from "../constants";
import {onGet} from "../protyle/util/onGet";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {hasClosestByAttribute, hasClosestByClassName} from "../protyle/util/hasClosest";
import {viewCards} from "./viewCards";
export const openCard = () => {
const exit = window.siyuan.dialogs.find(item => {
@ -33,7 +34,12 @@ export const openCard = () => {
content: `<div class="fn__flex-column b3-dialog__content" style="box-sizing: border-box;max-height: 100%">
<div class="fn__flex">
<select class="b3-select fn__flex-1">${decksHTML}</select>
<div style="margin-left: 8px" class="ft__on-surface ft__smaller fn__flex-center${blocks.length === 0 ? " fn__none" : ""}" data-type="count">${countHTML}</div>
<span class="fn__space"></span>
<span data-type="view" class="block__icon block__icon--show">
<svg><use xlink:href="#iconEye"></use></svg>
</span>
<span class="fn__space"></span>
<div class="ft__on-surface ft__smaller fn__flex-center${blocks.length === 0 ? " fn__none" : ""}" data-type="count">${countHTML}</div>
</div>
<div class="fn__hr--b"><input style="opacity: 0;height: 1px;box-sizing: border-box"></div>
<div class="b3-dialog__cardblock b3-dialog__cardblock--hide fn__flex-1${blocks.length === 0 ? " fn__none" : ""}" data-type="render"></div>
@ -65,7 +71,7 @@ export const openCard = () => {
</div>
</div>
</div>`,
width: isMobile() ? "96vw" : "50vw",
width: isMobile() ? "96vw" : "768px",
height: "70vh",
});
dialog.element.querySelector("input").focus();
@ -123,6 +129,13 @@ export const openCard = () => {
});
});
dialog.element.addEventListener("click", (event) => {
const viewElement = hasClosestByAttribute(event.target as HTMLElement, "data-type", "view");
if (viewElement) {
viewCards(selectElement.value, selectElement.options[selectElement.selectedIndex].text);
event.preventDefault();
event.stopPropagation();
return;
}
let type = "";
if (typeof event.detail === "string") {
if (event.detail === "a") {

201
app/src/card/viewCards.ts Normal file
View file

@ -0,0 +1,201 @@
import {Protyle} from "../protyle";
import {fetchPost} from "../util/fetch";
import {Dialog} from "../dialog";
import {isMobile} from "../util/functions";
import {escapeHtml} from "../util/escape";
import {getDisplayName, getNotebookName} from "../util/pathName";
import {getIconByType} from "../editor/getIcon";
import {unicode2Emoji} from "../emoji";
import {addLoading} from "../protyle/ui/initUI";
import {Constants} from "../constants";
import {onGet} from "../protyle/util/onGet";
import {genCardItem} from "./makeCard";
export const viewCards = (deckID: string, title: string, sourceElement?: HTMLElement) => {
let pageIndex = 1;
let edit:Protyle;
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (response) => {
const dialog = new Dialog({
title,
content: `<div class="fn__flex-column" style="height: 100%">
<div class="fn__hr"></div>
<div class="fn__flex">
<span class="fn__space"></span>
<span data-type="previous" class="block__icon block__icon--show b3-tooltips b3-tooltips__ne" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
<span class="fn__space"></span>
<span data-type="next" class="block__icon block__icon--show b3-tooltips b3-tooltips__ne" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
<span class="fn__space"></span>
<span class="fn__flex-center ft__on-surface">${pageIndex}/${response.data.pageCount || 1}</span>
<div class="fn__flex-1"></div>
</div>
<div class="fn__hr"></div>
<div class="${isMobile() ? "fn__flex-column" : "fn__flex"} fn__flex-1">
<ul class="fn__flex-1 b3-list b3-list--background" style="user-select: none">
${renderViewItem(response.data.blocks)}
</ul>
<div id="cardPreview" class="fn__flex-1 fn__none"></div>
<div class="fn__flex-1 b3-dialog__cardempty">${window.siyuan.languages.emptyContent}</div>
</div>
</div>`,
width: isMobile() ? "90vw" : "80vw",
height: "80vh",
destroyCallback() {
if (edit) {
edit.destroy();
}
}
});
if (response.data.blocks.length === 0) {
return;
}
edit = new Protyle(dialog.element.querySelector("#cardPreview") as HTMLElement, {
blockId: "",
render: {
gutter: true,
breadcrumbDocName: true
},
});
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
const previousElement = dialog.element.querySelector('[data-type="previous"]');
const nextElement = dialog.element.querySelector('[data-type="next"]');
const listElement = dialog.element.querySelector(".b3-list--background");
if (response.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
dialog.element.style.zIndex = "200";
dialog.element.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target && !dialog.element.isSameNode(target)) {
const type = target.getAttribute("data-type");
if (type === "previous") {
if (pageIndex <= 1) {
return;
}
pageIndex--;
if (pageIndex <= 1) {
previousElement.setAttribute("disabled", "disabled");
}
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (cardsResponse) => {
if (pageIndex === cardsResponse.data.pageCount) {
nextElement.setAttribute("disabled", "disabled");
} else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount || 1}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
});
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "next") {
if (pageIndex >= response.data.pageCount) {
return;
}
pageIndex++;
previousElement.removeAttribute("disabled");
fetchPost("/api/riff/getRiffCards", {deckID, page: pageIndex}, (cardsResponse) => {
if (pageIndex === cardsResponse.data.pageCount) {
nextElement.setAttribute("disabled", "disabled");
} else if (cardsResponse.data.pageCount > 1) {
nextElement.removeAttribute("disabled");
}
nextElement.nextElementSibling.nextElementSibling.textContent = `${pageIndex}/${cardsResponse.data.pageCount || 1}`;
listElement.innerHTML = renderViewItem(cardsResponse.data.blocks);
getArticle(edit, dialog.element.querySelector(".b3-list-item--focus")?.getAttribute("data-id"));
});
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "card-item") {
getArticle(edit, target.getAttribute("data-id"));
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
target.classList.add("b3-list-item--focus");
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "remove") {
fetchPost("/api/riff/removeRiffCards", {
deckID,
blockIDs: [target.getAttribute("data-id")]
}, (removeResponse) => {
let nextElment = target.parentElement.nextElementSibling;
if (!nextElment) {
nextElment = target.parentElement.previousElementSibling;
}
if (!nextElment && target.parentElement.parentElement.childElementCount > 1) {
nextElment = target.parentElement.parentElement.firstElementChild;
}
if (!nextElment) {
getArticle(edit, "");
} else {
getArticle(edit, nextElment.getAttribute("data-id"));
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
nextElment.classList.add("b3-list-item--focus");
}
target.parentElement.remove();
if (sourceElement) {
sourceElement.outerHTML = genCardItem(removeResponse.data);
}
});
event.stopPropagation();
event.preventDefault();
break;
}
target = target.parentElement;
}
});
});
};
const renderViewItem = (blocks: IBlock[]) => {
let listHTML = "";
let isFirst = true;
blocks.forEach((item: IBlock) => {
if (item.type) {
const hPath = escapeHtml(getNotebookName(item.box)) + getDisplayName(item.hPath, false);
listHTML += `<div data-type="card-item" class="b3-list-item${isFirst ? " b3-list-item--focus" : ""}${isMobile() ? "" : " b3-list-item--hide-action"}" data-id="${item.id}">
<svg class="b3-list-item__graphic"><use xlink:href="#${getIconByType(item.type)}"></use></svg>
${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
<span class="b3-list-item__text">${item.content}</span>
<span data-type="remove" data-id="${item.id}" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.removeDeck}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span>
<span class="${isMobile() ? "fn__none " : ""}b3-list-item__meta b3-list-item__meta--ellipsis" title="${hPath}">${hPath}</span>
</div>`;
isFirst = false;
} else {
listHTML += `<div data-type="card-item" class="b3-list-item${isMobile() ? "" : " b3-list-item--hide-action"}">
<span class="b3-list-item__text">${item.content}</span>
<span data-type="remove" data-id="${item.id}" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.removeDeck}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span>
</div>`;
}
});
if (blocks.length === 0) {
listHTML = `<div class="b3-list--empty">${window.siyuan.languages.emptyContent}</div>`;
}
return listHTML;
};
const getArticle = (edit: Protyle, id: string) => {
if (!id) {
edit.protyle.element.classList.add("fn__none");
edit.protyle.element.nextElementSibling.classList.remove("fn__none");
return;
}
edit.protyle.element.classList.remove("fn__none");
edit.protyle.element.nextElementSibling.classList.add("fn__none");
edit.protyle.scroll.lastScrollTop = 0;
addLoading(edit.protyle);
fetchPost("/api/filetree/getDoc", {
id,
mode: 0,
size: Constants.SIZE_GET_MAX,
}, getResponse => {
onGet(getResponse, edit.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]);
});
};