0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-03-08 22:57:41 +08:00
parent f87ac01461
commit edc256896c
5 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/src/boot/globalEvent/keydown.ts
View file

@ -75,6 +75,8 @@ import {searchKeydown} from "./searchKeydown";
import {openNewWindow} from "../../window/openNewWindow";
import {historyKeydown} from "../../history/keydown";
import {zoomOut} from "../../menus/protyle";
import {openSearchAV} from "../../protyle/render/av/relation";
import * as dayjs from "dayjs";
const switchDialogEvent = (app: App, event: MouseEvent) => {
event.preventDefault();
@ -305,6 +307,64 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
event.preventDefault();
return true;
}
if (!isFileFocus && matchHotKey(window.siyuan.config.keymap.general.addToDatabase.custom, event)) {
if (protyle.title?.editElement.contains(range.startContainer)) {
openSearchAV("", protyle.breadcrumb.element, (listItemElement) => {
const sourceIds: string[] = [protyle.block.rootID];
const avID = listItemElement.dataset.avId;
transaction(protyle, [{
action: "insertAttrViewBlock",
avID,
srcIDs: sourceIds,
isDetached: false,
blockID: listItemElement.dataset.nodeId
}, {
action: "doUpdateUpdated",
id: listItemElement.dataset.nodeId,
data: dayjs().format("YYYYMMDDHHmmss"),
}], [{
action: "removeAttrViewBlock",
srcIDs: sourceIds,
avID,
}]);
});
} else {
const selectElement: Element[] = [];
protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select").forEach(item => {
selectElement.push(item);
});
if (selectElement.length === 0) {
const nodeElement = hasClosestBlock(range.startContainer);
if (nodeElement) {
selectElement.push(nodeElement);
}
}
openSearchAV("", selectElement[0] as HTMLElement, (listItemElement) => {
const sourceIds: string[] = [];
selectElement.forEach(item => {
sourceIds.push(item.getAttribute("data-node-id"));
});
const avID = listItemElement.dataset.avId;
transaction(protyle, [{
action: "insertAttrViewBlock",
avID,
srcIDs: sourceIds,
isDetached: false,
blockID: listItemElement.dataset.blockId
}, {
action: "doUpdateUpdated",
id: listItemElement.dataset.blockId,
data: dayjs().format("YYYYMMDDHHmmss"),
}], [{
action: "removeAttrViewBlock",
srcIDs: sourceIds,
avID,
}]);
});
}
event.preventDefault();
return true;
}
if (!isFileFocus && matchHotKey(window.siyuan.config.keymap.editor.general.spaceRepetition.custom, event)) {
fetchPost("/api/riff/getTreeRiffDueCards", {rootID: protyle.block.rootID}, (response) => {
openCardByData(app, response.data, "doc", protyle.block.rootID, protyle.title.editElement.textContent || "Untitled");

1
app/src/constants.ts
View file

@ -343,6 +343,7 @@ export abstract class Constants {
closeLeft: {default: "", custom: ""},
closeRight: {default: "", custom: ""},
tabToWindow: {default: "", custom: ""},
addToDatabase: {default: "", custom: ""},
},
editor: {
general: {

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

@ -808,6 +808,7 @@ export class Gutter {
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.addToDatabase,
accelerator: window.siyuan.config.keymap.general.addToDatabase.custom,
icon: "iconDatabase",
click: () => {
openSearchAV("", selectsElement[0] as HTMLElement, (listItemElement) => {
@ -1272,6 +1273,7 @@ export class Gutter {
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.addToDatabase,
accelerator: window.siyuan.config.keymap.general.addToDatabase.custom,
icon: "iconDatabase",
click: () => {
openSearchAV("", nodeElement as HTMLElement, (listItemElement) => {

1
app/src/protyle/header/openTitleMenu.ts
View file

@ -52,6 +52,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => {
window.siyuan.menus.menu.append(movePathToMenu([protyle.path]));
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.addToDatabase,
accelerator: window.siyuan.config.keymap.general.addToDatabase.custom,
icon: "iconDatabase",
click: () => {
openSearchAV("", protyle.breadcrumb.element, (listItemElement) => {

2
app/src/protyle/wysiwyg/transaction.ts
View file

@ -494,7 +494,7 @@ export const onTransaction = (protyle: IProtyle, operation: IOperation, isUndo:
} else if (key === "memo") {
memoHTML = `<div class="protyle-attr--memo b3-tooltips b3-tooltips__sw" aria-label="${escapeHTML}"><svg><use xlink:href="#iconM"></use></svg></div>`;
} else if (key === "custom-avs") {
avHTML = "<div class=\"protyle-attr--av\"><svg><use xlink:href=\"#iconDatabase\"></use></svg></div>";
avHTML = '<div class="protyle-attr--av"><svg><use xlink:href="#iconDatabase"></use></svg></div>';
}
});
let nodeAttrHTML = bookmarkHTML + nameHTML + aliasHTML + memoHTML + avHTML;