From afdc96458c2d11dd0985989c7d06f1a321d51ced Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 19 Feb 2023 00:41:02 +0800 Subject: [PATCH] :sparkles: https://github.com/siyuan-note/siyuan/issues/7057 --- app/src/card/makeCard.ts | 4 +++- app/src/card/openCard.ts | 10 +++++++--- app/src/card/viewCards.ts | 9 +++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/card/makeCard.ts b/app/src/card/makeCard.ts index a27264425..3941969ce 100644 --- a/app/src/card/makeCard.ts +++ b/app/src/card/makeCard.ts @@ -126,7 +126,9 @@ export const makeCard = (nodeElement: Element[]) => { event.preventDefault(); break; } else if (type === "view") { - viewCards(target.parentElement.getAttribute("data-id"), target.parentElement.querySelector(".b3-list-item__text").textContent, target.parentElement); + viewCards(target.parentElement.getAttribute("data-id"), target.parentElement.querySelector(".b3-list-item__text").textContent, (removeResponse) => { + target.parentElement.outerHTML = genCardItem(removeResponse.data); + }); event.stopPropagation(); event.preventDefault(); break; diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index a83374b9a..a65cdab5d 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -38,7 +38,7 @@ export const openCardByData = (cardsData: ICard[], html = "") => { -
1/${blocks.length}
+
1/${blocks.length}
`; } const dialog = new Dialog({ @@ -111,10 +111,14 @@ export const openCardByData = (cardsData: ICard[], html = "") => { const viewElement = hasClosestByAttribute(event.target as HTMLElement, "data-type", "view"); if (viewElement) { if (selectElement) { - viewCards(selectElement.value, selectElement.options[selectElement.selectedIndex].text); + viewCards(selectElement.value, selectElement.options[selectElement.selectedIndex].text, (removeResponse) => { + countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString(); + }); } else { viewCards(countElement.previousElementSibling.getAttribute("data-id"), - countElement.previousElementSibling.textContent, undefined, true); + countElement.previousElementSibling.textContent, (removeResponse) => { + countElement.lastElementChild.lastElementChild.innerHTML = removeResponse.data.size.toString(); + }, true); } event.preventDefault(); event.stopPropagation(); diff --git a/app/src/card/viewCards.ts b/app/src/card/viewCards.ts index 1e371250a..7aad1be02 100644 --- a/app/src/card/viewCards.ts +++ b/app/src/card/viewCards.ts @@ -9,9 +9,8 @@ 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, isDoc = false) => { +export const viewCards = (deckID: string, title: string, cb:(response:IWebSocketData)=>void,isDoc = false) => { let pageIndex = 1; let edit: Protyle; fetchPost(isDoc ? "/api/riff/getTreeRiffCards" : "/api/riff/getRiffCards", { @@ -117,7 +116,7 @@ export const viewCards = (deckID: string, title: string, sourceElement?: HTMLEle break; } else if (type === "remove") { fetchPost("/api/riff/removeRiffCards", { - deckID, + deckID: isDoc ? "20230218211946-2kw8jgx" : deckID, blockIDs: [target.getAttribute("data-id")] }, (removeResponse) => { let nextElment = target.parentElement.nextElementSibling; @@ -135,9 +134,7 @@ export const viewCards = (deckID: string, title: string, sourceElement?: HTMLEle nextElment.classList.add("b3-list-item--focus"); } target.parentElement.remove(); - if (sourceElement) { - sourceElement.outerHTML = genCardItem(removeResponse.data); - } + cb(removeResponse) }); event.stopPropagation(); event.preventDefault();