From 39b756f39fb2b869f371085122c4c9b774999e32 Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Mon, 18 Aug 2025 22:21:25 +0800 Subject: [PATCH 1/2] Improve spaced repetition interface fix https://github.com/siyuan-note/siyuan/issues/10331 --- app/src/card/newCardTab.ts | 109 ++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 62 deletions(-) diff --git a/app/src/card/newCardTab.ts b/app/src/card/newCardTab.ts index 997663a2b3b..f2c5702b411 100644 --- a/app/src/card/newCardTab.ts +++ b/app/src/card/newCardTab.ts @@ -19,6 +19,45 @@ export const newCardModel = (options: { } }) => { let editor: Protyle; + + const fetchCardsData = async (): Promise => { + return new Promise((resolve) => { + fetchPost(options.data.cardType === "all" ? "/api/riff/getRiffDueCards" : + (options.data.cardType === "doc" ? "/api/riff/getTreeRiffDueCards" : "/api/riff/getNotebookRiffDueCards"), { + rootID: options.data.id, + deckID: options.data.id, + notebook: options.data.id, + }, async (response) => { + let cardsData: ICardData = response.data; + for (let i = 0; i < options.app.plugins.length; i++) { + cardsData = await options.app.plugins[i].updateCards(response.data); + } + resolve(cardsData); + }); + }); + }; + + const renderCardsAndBindEvents = async (element: HTMLElement, data: any, cardsData: ICardData, index?: number) => { + element.innerHTML = genCardHTML({ + id: data.id, + cardType: data.cardType, + cardsData, + isTab: true, + }); + + editor = await bindCardEvent({ + app: options.app, + element: element, + id: data.id, + title: data.title, + cardType: data.cardType, + cardsData, + index, + }); + + customObj.editors.push(editor); + }; + const customObj = new Custom({ app: options.app, type: "siyuan-card", @@ -26,58 +65,18 @@ export const newCardModel = (options: { data: options.data, async init() { if (options.data.cardsData) { + // 使用现有的 cardsData for (let i = 0; i < options.app.plugins.length; i++) { options.data.cardsData = await options.app.plugins[i].updateCards(options.data.cardsData); } - this.element.innerHTML = genCardHTML({ - id: this.data.id, - cardType: this.data.cardType, - cardsData: options.data.cardsData, - isTab: true, - }); - - editor = await bindCardEvent({ - app: options.app, - element: this.element, - id: this.data.id, - title: this.data.title, - cardType: this.data.cardType, - cardsData: options.data.cardsData, - index: options.data.index, - }); - customObj.editors.push(editor); + await renderCardsAndBindEvents(this.element, this.data, options.data.cardsData, options.data.index); // https://github.com/siyuan-note/siyuan/issues/9561#issuecomment-1794473512 delete options.data.cardsData; delete options.data.index; } else { - fetchPost(this.data.cardType === "all" ? "/api/riff/getRiffDueCards" : - (this.data.cardType === "doc" ? "/api/riff/getTreeRiffDueCards" : "/api/riff/getNotebookRiffDueCards"), { - rootID: this.data.id, - deckID: this.data.id, - notebook: this.data.id, - }, async (response) => { - let cardsData: ICardData = response.data; - for (let i = 0; i < options.app.plugins.length; i++) { - cardsData = await options.app.plugins[i].updateCards(response.data); - } - this.element.innerHTML = genCardHTML({ - id: this.data.id, - cardType: this.data.cardType, - cardsData, - isTab: true, - }); - - editor = await bindCardEvent({ - app: options.app, - element: this.element, - id: this.data.id, - title: this.data.title, - cardType: this.data.cardType, - cardsData, - }); - - customObj.editors.push(editor); - }); + // 获取新的 cardsData + const cardsData = await fetchCardsData(); + await renderCardsAndBindEvents(this.element, this.data, cardsData); } }, destroy() { @@ -90,23 +89,9 @@ export const newCardModel = (options: { editor.resize(); } }, - update() { - fetchPost(this.data.cardType === "all" ? "/api/riff/getRiffDueCards" : - (this.data.cardType === "doc" ? "/api/riff/getTreeRiffDueCards" : "/api/riff/getNotebookRiffDueCards"), { - rootID: this.data.id, - deckID: this.data.id, - notebook: this.data.id, - }, async (response) => { - for (let i = 0; i < options.app.plugins.length; i++) { - options.data.cardsData = await options.app.plugins[i].updateCards(options.data.cardsData); - } - this.element.innerHTML = genCardHTML({ - id: this.data.id, - cardType: this.data.cardType, - cardsData: response.data, - isTab: true, - }); - }); + async update() { + const cardsData = await fetchCardsData(); + await renderCardsAndBindEvents(this.element, this.data, cardsData); } }); customObj.element.addEventListener("click", () => { From 4f4ac9f69b285bb311c8fcff40e634c38e5d45dc Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Mon, 18 Aug 2025 22:21:39 +0800 Subject: [PATCH 2/2] Improve spaced repetition interface fix https://github.com/siyuan-note/siyuan/issues/14149 --- app/src/card/openCard.ts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 37f1a7b479b..f4f09893b77 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -491,6 +491,29 @@ export const bindCardEvent = async (options: { const sticktabElement = hasClosestByAttribute(target, "data-type", "sticktab"); if (sticktabElement) { const stickMenu = new Menu(); + stickMenu.addItem({ + id: "openInNewTab", + icon: "iconOpen", + label: window.siyuan.languages.openInNewTab, + click() { + openFile({ + app: options.app, + custom: { + icon: "iconRiffCard", + title: window.siyuan.languages.spaceRepetition, + data: { + cardsData: options.cardsData, + index, + cardType: filterElement.getAttribute("data-cardtype") as TCardType, + id: docId, + title: options.title + }, + id: "siyuan-card" + }, + }); + options.dialog.destroy(); + } + }); stickMenu.addItem({ id: "insertRight", icon: "iconLayoutRight", @@ -529,6 +552,8 @@ export const bindCardEvent = async (options: { "instance": "Custom", "customModelType": "siyuan-card", "customModelData": { + "cardsData": options.cardsData, + "index": index, "cardType": filterElement.getAttribute("data-cardtype"), "id": docId, "title": options.title