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

🎨 https://github.com/siyuan-note/siyuan/issues/6710

Browse Source
This commit is contained in:
Vanessa 2022-12-22 19:11:55 +08:00
parent fa571a4e6f
commit 26f3c576c9
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/assets/scss/_dialog.scss
View File

@ -111,7 +111,7 @@
overflow: auto; overflow: auto;
} }
&__card { &__cardempty {
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
@ -119,4 +119,15 @@
text-align: center; text-align: center;
color: var(--b3-theme-on-surface); color: var(--b3-theme-on-surface);
} }
&__cardblock {
.protyle-wysiwyg {
padding: 16px;
}
span[data-type~=mark] {
transition: var(--b3-transition);
color: var(--b3-protyle-inline-mark-background) !important;
}
}
} }

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

@ -21,21 +21,23 @@ export const openCard = () => {
} }
const dialog = new Dialog({ const dialog = new Dialog({
title: window.siyuan.languages.riffCard, title: window.siyuan.languages.riffCard,
content: `<div class="fn__flex-column b3-dialog__content" style="box-sizing: border-box"> content: `<div class="fn__flex-column b3-dialog__content" style="box-sizing: border-box;max-height: 100%">
<div class="fn__flex"> <div class="fn__flex">
<select class="b3-select fn__flex-1">${decksHTML}</select> <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> <div style="margin-left: 8px" class="ft__on-surface ft__smaller fn__flex-center${blocks.length === 0 ? " fn__none" : ""}" data-type="count">${countHTML}</div>
</div> </div>
<div class="fn__hr"><input style="opacity: 0;height: 1px;box-sizing: border-box"></div> <div class="fn__hr"><input style="opacity: 0;height: 1px;box-sizing: border-box"></div>
<div class="fn__flex-1${blocks.length === 0 ? " fn__none" : ""}" data-type="render"></div> <div class="b3-dialog__cardblock fn__flex-1${blocks.length === 0 ? " fn__none" : ""}" data-type="render"></div>
<div class="b3-dialog__card${blocks.length === 0 ? "" : " fn__none"}" data-type="empty">${window.siyuan.languages.noDueCard}</div> <div class="b3-dialog__cardempty${blocks.length === 0 ? "" : " fn__none"}" data-type="empty">${window.siyuan.languages.noDueCard}</div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="fn__flex${blocks.length === 0 ? " fn__none" : ""}" data-type="action"> <div class="fn__flex${blocks.length === 0 ? " fn__none" : ""}" data-type="action">
<button data-type="0" class="b3-button b3-button--white">Again Rating (A)</button> <button data-type="-1" class="b3-button">Show (S)</button>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<button data-type="1" class="b3-button b3-button--outline">Hard (H)</button> <button data-type="0" class="b3-button">Again Rating (A)</button>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<button data-type="2" class="b3-button b3-button--cancel">Good (G)</button> <button data-type="1" class="b3-button">Hard (H)</button>
<span class="fn__flex-1"></span>
<button data-type="2" class="b3-button">Good (G)</button>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<button data-type="3" class="b3-button">Easy (E)</button> <button data-type="3" class="b3-button">Easy (E)</button>
</div> </div>
@ -99,6 +101,8 @@ export const openCard = () => {
type = "2" type = "2"
} else if (event.detail === "e") { } else if (event.detail === "e") {
type = "3" type = "3"
}else if (event.detail === "s") {
type = "-1"
} }
} }
if (!type) { if (!type) {
@ -107,7 +111,13 @@ export const openCard = () => {
type = buttonElement.getAttribute("data-type"); type = buttonElement.getAttribute("data-type");
} }
} }
if (!type) { if (!type || !blocks[index]) {
return;
}
event.preventDefault();
event.stopPropagation();
if (type === "-1") {
editor.protyle.element.classList.toggle("b3-dialog__cardblock");
return; return;
} }
if (["0", "1", "2", "3"].includes(type)) { if (["0", "1", "2", "3"].includes(type)) {
@ -129,8 +139,6 @@ export const openCard = () => {
onGet(response, editor.protyle, [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML]); onGet(response, editor.protyle, [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML]);
}); });
}) })
event.preventDefault();
event.stopPropagation();
} }
}) })
}) })

2
app/src/util/globalShortcut.ts
View File

@ -343,7 +343,7 @@ export const globalShortcut = () => {
return; return;
} }
if (!event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey && ["a", "h", "g", "e"].includes(event.key.toLowerCase())) { if (!event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey && ["s","a", "h", "g", "e"].includes(event.key.toLowerCase())) {
const openCardDialog = window.siyuan.dialogs.find(item => { const openCardDialog = window.siyuan.dialogs.find(item => {
if (item.element.getAttribute("data-key") === window.siyuan.config.keymap.general.riffCard.custom) { if (item.element.getAttribute("data-key") === window.siyuan.config.keymap.general.riffCard.custom) {
return true; return true;