Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2022-12-22 11:08:25 +08:00
parent b1568db827
commit d81be71485
8 changed files with 31 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/appearance/icons/ant/icon.js
View file

@ -1,5 +1,8 @@
document.body.insertAdjacentHTML('afterBegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg">
<defs>
<symbol id="iconRiffCard" viewBox="0 0 32 32">
<path d="M12.472 31.5l1.765-12.142h-6.286q-0.474 0-0.689-0.431t0-0.818l10.549-17.61h1.765l-1.765 12.099h6.2q0.474 0 0.71 0.431t0.022 0.818l-10.506 17.653z"></path>
</symbol>
<symbol id="iconEyeoff" viewBox="0 0 32 32">
<path d="M31.788 15.276q-1.935-4.077-4.606-6.65l-1.867 1.867c1.523 1.455 2.849 3.359 3.996 5.73-3.053 6.32-7.388 9.322-13.311 9.322q-2.667 0-4.913-0.821l-2.023 2.023q3.119 1.44 6.936 1.44 10.58 0 15.788-11.021c0.134-0.277 0.212-0.602 0.212-0.945s-0.078-0.668-0.218-0.958l0.006 0.013zM29.455 3.508l-1.564-1.566c-0.053-0.053-0.127-0.086-0.208-0.086s-0.155 0.033-0.208 0.086v0l-4.014 4.012q-3.319-1.696-7.461-1.696-10.58 0-15.788 11.021c-0.134 0.277-0.212 0.602-0.212 0.945s0.078 0.668 0.218 0.958l-0.006-0.013q2.080 4.382 5.009 7.025l-3.884 3.882c-0.053 0.053-0.086 0.127-0.086 0.208s0.033 0.154 0.086 0.208l1.567 1.567c0.053 0.053 0.127 0.086 0.208 0.086s0.154-0.033 0.208-0.086l26.135-26.134c0.053-0.053 0.086-0.127 0.086-0.208s-0.033-0.155-0.086-0.208v0zM2.689 16.222c3.057-6.32 7.391-9.322 13.311-9.322 2.002 0 3.822 0.343 5.473 1.042l-2.58 2.58c-0.88-0.479-1.927-0.76-3.041-0.76-3.567 0-6.459 2.892-6.459 6.459 0 1.113 0.282 2.16 0.777 3.075l-0.017-0.034-3.061 3.061c-1.694-1.495-3.155-3.522-4.403-6.101zM11.743 16.222c0.002-2.271 1.844-4.11 4.114-4.11 0.447 0 0.877 0.071 1.28 0.203l-0.029-0.008-5.171 5.171c-0.124-0.374-0.195-0.804-0.195-1.251 0-0.002 0-0.003 0-0.005v0z"></path>
<path d="M15.853 20.333c-0.127 0-0.252-0.006-0.376-0.017l-1.938 1.938c0.686 0.271 1.48 0.427 2.311 0.427 3.569 0 6.462-2.893 6.462-6.462 0-0.831-0.157-1.625-0.443-2.355l0.015 0.044-1.938 1.938c0.011 0.124 0.017 0.249 0.017 0.376 0 0.001 0 0.001 0 0.002 0 2.269-1.839 4.108-4.108 4.108-0.001 0-0.002 0-0.002 0h0z"></path>

6
app/appearance/icons/index.html
View file

@ -28,6 +28,12 @@
<body>
<h2>SiYuan</h2>
<div class="fn__clear">
<div>
<svg>
<use xlink:href="#iconRiffCard"></use>
</svg>
iconRiffCard
</div>
<div>
<svg>
<use xlink:href="#iconEyeoff"></use>

3
app/appearance/icons/material/icon.js
View file

@ -1,5 +1,8 @@
document.body.insertAdjacentHTML('afterbegin', `<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg">
<defs>
<symbol id="iconRiffCard" viewBox="0 0 32 32">
<path d="M12.472 31.5l1.765-12.142h-6.286q-0.474 0-0.689-0.431t0-0.818l10.549-17.61h1.765l-1.765 12.099h6.2q0.474 0 0.71 0.431t0.022 0.818l-10.506 17.653z"></path>
</symbol>
<symbol id="iconEyeoff" viewBox="0 0 32 32">
<path d="M21.418 17.655l-1.6-1.6q0.945-2.582-0.982-4.291t-4.182-0.873l-1.6-1.6q0.618-0.4 1.382-0.582t1.564-0.182q2.582 0 4.382 1.8t1.8 4.382q0 0.8-0.2 1.582t-0.564 1.364zM26.109 22.346l-1.455-1.455q1.782-1.309 3.109-2.927t1.945-3.255q-1.818-4.036-5.455-6.382t-7.891-2.345q-1.527 0-3.127 0.291t-2.509 0.691l-1.673-1.709q1.273-0.582 3.255-1.018t3.873-0.436q5.2 0 9.509 2.964t6.309 7.945q-0.945 2.327-2.436 4.255t-3.455 3.382zM28.218 30.564l-6.109-6q-1.273 0.509-2.873 0.782t-3.236 0.273q-5.309 0-9.636-2.964t-6.364-7.945q0.727-1.891 2.018-3.691t3.145-3.436l-4.582-4.582 1.527-1.564 27.527 27.527zM6.655 9.109q-1.345 0.982-2.6 2.582t-1.8 3.018q1.855 4.036 5.582 6.382t8.455 2.345q1.2 0 2.364-0.145t1.745-0.436l-2.327-2.327q-0.4 0.182-0.982 0.273t-1.091 0.091q-2.545 0-4.364-1.782t-1.818-4.4q0-0.545 0.091-1.091t0.273-0.982z"></path>
</symbol>

1
app/src/constants.ts
View file

@ -129,6 +129,7 @@ export abstract class Constants {
backlinks: {default: "⌥7", custom: "⌥7"},
graphView: {default: "⌥8", custom: "⌥8"},
globalGraph: {default: "⌥9", custom: "⌥9"},
riffCard: {default: "⌥0", custom: "⌥0"},
config: {default: "⌥P", custom: "⌥P"},
dataHistory: {default: "⌥H", custom: "⌥H"},
toggleWin: {default: "⌥M", custom: "⌥M"},

90
app/src/menus/commonMenuItem.ts
View file

@ -38,96 +38,6 @@ const bindAttrInput = (inputElement: HTMLInputElement, confirmElement: Element)
});
};
const genCardItem = (item: { id: string, name: string }) => {
return `<li style="margin: 0 !important;" data-id="${item.id}" class="b3-list-item b3-list-item--hide-action">
<span class="b3-list-item__text">${item.name}</span>
<span data-type="add" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.addDeck}">
<svg><use xlink:href="#iconAdd"></use></svg>
</span>
<span data-type="remove" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.removeDeck}">
<svg><use xlink:href="#iconMin"></use></svg>
</span>
</li>`
}
export const openDiffCard = (nodeElement: Element[]) => {
const range = getEditorRange(nodeElement[0]);
fetchPost("/api/riff/getRiffDecks", {}, (response) => {
let html = ''
const ids: string[] = []
nodeElement.forEach(item => {
ids.push(item.getAttribute("data-node-id"))
})
response.data.forEach((item: { id: string, name: string }) => {
html += genCardItem(item)
})
const dialog = new Dialog({
width: isMobile() ? "80vw" : "50vw",
height: "70vh",
title: window.siyuan.languages.riffCard,
content: `<div class="b3-dialog__content fn__flex-column" style="box-sizing: border-box;height: 100%">
<div class="fn__flex">
<input class="b3-text-field fn__flex-1">
<span class="fn__space"></span>
<button data-type="create" class="b3-button b3-button--outline" style="width: 100px">
<svg><use xlink:href="#iconAdd"></use></svg>
${window.siyuan.languages.createDeck}
</button>
</div>
<div class="fn__hr"></div>
<ul class="b3-list b3-list--background fn__flex-1">${html}</ul>
</div>`,
destroyCallback() {
focusByRange(range);
}
});
dialog.element.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target && !target.isSameNode(dialog.element)) {
const type = target.getAttribute("data-type");
if (type === "create") {
let msgId = ""
const inputElement = dialog.element.querySelector(".b3-text-field") as HTMLInputElement;
if (inputElement.value) {
if (msgId) {
hideMessage(msgId);
}
fetchPost("/api/riff/createRiffDeck", {name: inputElement.value}, (response) => {
dialog.element.querySelector(".b3-list").insertAdjacentHTML("afterbegin", genCardItem(response.data))
inputElement.value = '';
})
} else {
msgId = showMessage(window.siyuan.languages._kernel[142])
}
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "add") {
fetchPost("/api/riff/addRiffCards", {
deckID: target.parentElement.getAttribute("data-id"),
blockIDs: ids
}, () => {
showMessage(window.siyuan.languages.addDeck)
})
event.stopPropagation();
event.preventDefault();
break;
} else if (type === "remove") {
fetchPost("/api/riff/removeRiffCards", {
deckID: target.parentElement.getAttribute("data-id"),
blockIDs: ids
}, () => {
showMessage(window.siyuan.languages.removeDeck)
})
event.stopPropagation();
event.preventDefault();
break;
}
target = target.parentElement;
}
})
})
};
export const openWechatNotify = (nodeElement: Element) => {
const id = nodeElement.getAttribute("data-node-id");
const range = getEditorRange(nodeElement);

7
app/src/protyle/gutter/index.ts
View file

@ -7,7 +7,7 @@ import {
import {getIconByType} from "../../editor/getIcon";
import {iframeMenu, setFold, tableMenu, videoMenu, zoomOut} from "../../menus/protyle";
import {MenuItem} from "../../menus/Menu";
import {copySubMenu, openAttr, openDiffCard, openWechatNotify} from "../../menus/commonMenuItem";
import {copySubMenu, openAttr, openWechatNotify} from "../../menus/commonMenuItem";
import {copyPlainText, updateHotkeyTip, writeText} from "../util/compatibility";
import {
transaction,
@ -36,6 +36,7 @@ import {mathRender} from "../markdown/mathRender";
import {duplicateBlock} from "../wysiwyg/commonHotkey";
import {movePathTo} from "../../util/pathName";
import {hintMoveBlock} from "../hint/extend";
import {makeCard} from "../../card/makeCard";
export class Gutter {
public element: HTMLElement;
@ -676,7 +677,7 @@ export class Gutter {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
click() {
openDiffCard(selectsElement);
makeCard(selectsElement);
}
}).element);
return window.siyuan.menus.menu;
@ -1438,7 +1439,7 @@ export class Gutter {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.riffCard,
click() {
openDiffCard([nodeElement]);
makeCard([nodeElement]);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);

6
app/src/util/globalShortcut.ts
View file

@ -43,6 +43,7 @@ import {editor} from "../config/editor";
import {hintMoveBlock} from "../protyle/hint/extend";
import {Backlink} from "../layout/dock/Backlink";
import {openHistory} from "../history/history";
import {openCard} from "../card/openCard";
const getRightBlock = (element: HTMLElement, x: number, y: number) => {
let index = 1;
@ -523,6 +524,11 @@ export const globalShortcut = () => {
if (matchDock) {
return;
}
if (matchHotKey(window.siyuan.config.keymap.general.riffCard.custom, event)) {
openCard()
event.preventDefault();
return;
}
if (matchHotKey(window.siyuan.config.keymap.general.dailyNote.custom, event)) {
newDailyNote();
if (target.classList.contains("protyle-wysiwyg") ||

8
app/src/util/onGetConfig.ts
View file

@ -30,6 +30,7 @@ import {editor} from "../config/editor";
import {goBack, goForward} from "./backForward";
import {replaceLocalPath} from "../editor/rename";
import {openHistory} from "../history/history";
import {openCard} from "../card/openCard";
const matchKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => {
if (key1 === "general") {
@ -178,6 +179,9 @@ const initBar = () => {
<div id="barDailyNote" data-menu="true" aria-label="${window.siyuan.languages.dailyNote} ${updateHotkeyTip(window.siyuan.config.keymap.general.dailyNote.custom)}" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}">
<svg><use xlink:href="#iconCalendar"></use></svg>
</div>
<div id="barRiffCard" data-menu="true" aria-label="${window.siyuan.languages.iconRiffCard} ${updateHotkeyTip(window.siyuan.config.keymap.general.iconRiffCard.custom)}" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}">
<svg><use xlink:href="#iconRiffCard"></use></svg>
</div>
<button id="barBack" data-menu="true" class="toolbar__item toolbar__item--disabled b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.goBack} ${updateHotkeyTip(window.siyuan.config.keymap.general.goBack.custom)}">
<svg><use xlink:href="#iconBack"></use></svg>
</button>
@ -270,6 +274,10 @@ const initBar = () => {
openSearch(window.siyuan.config.keymap.general.globalSearch.custom);
event.stopPropagation();
break;
} else if (target.id === "barRiffCard") {
openCard();
event.stopPropagation();
break;
} else if (target.id === "barDailyNote") {
if (getOpenNotebookCount() < 2) {
newDailyNote();