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

🎨 fix https://github.com/siyuan-note/siyuan/issues/3294

Browse source
This commit is contained in:
Vanessa 2022-09-01 20:24:06 +08:00
parent 70b3b0fc3b
commit 7fa63169bc
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/protyle/util/editorCommonEvent.ts
View file

@ -607,13 +607,23 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
} }
const targetElement = editorElement.querySelector(".dragover__bottom") || editorElement.querySelector(".dragover__top") || editorElement.querySelector(".dragover__left") || editorElement.querySelector(".dragover__right"); const targetElement = editorElement.querySelector(".dragover__bottom") || editorElement.querySelector(".dragover__top") || editorElement.querySelector(".dragover__left") || editorElement.querySelector(".dragover__right");
const isBacklink = window.siyuan.dragElement?.getAttribute("data-treetype") === "backlink"; const isBacklink = window.siyuan.dragElement?.getAttribute("data-treetype") === "backlink";
if (window.siyuan.dragElement && targetElement && ( if (window.siyuan.dragElement && (event.altKey || event.shiftKey) && isBacklink) {
focusByRange(document.caretRangeFromPoint(event.clientX, event.clientY));
const sourceId = window.siyuan.dragElement.getAttribute("data-node-id");
if (event.altKey) {
fetchPost("/api/block/getRefText", {id: sourceId}, (response) => {
insertHTML(`((${sourceId} '${response.data}'))`, protyle);
});
} else {
insertHTML(protyle.lute.SpinBlockDOM(`{{select * from blocks where id='${sourceId}'}}`), protyle);
blockRender(protyle, protyle.wysiwyg.element);
}
} else if (window.siyuan.dragElement && targetElement && (
window.siyuan.dragElement.parentElement.classList.contains("protyle-gutters") || window.siyuan.dragElement.parentElement.classList.contains("protyle-gutters") ||
isBacklink || isBacklink ||
window.siyuan.dragElement.getAttribute("data-type") === "NodeListItem")) { window.siyuan.dragElement.getAttribute("data-type") === "NodeListItem")) {
// gutter 拖拽 // gutter 或反链面板拖拽
const sourceId = window.siyuan.dragElement.getAttribute("data-node-id"); const sourceId = window.siyuan.dragElement.getAttribute("data-node-id");
let sourceElements: Element[] = []; let sourceElements: Element[] = [];
if (isBacklink) { if (isBacklink) {
let sourceElement = document.createElement("div"); let sourceElement = document.createElement("div");
@ -739,7 +749,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
}); });
let dragoverElement: Element; let dragoverElement: Element;
editorElement.addEventListener("dragover", (event: DragEvent & { target: HTMLElement }) => { editorElement.addEventListener("dragover", (event: DragEvent & { target: HTMLElement }) => {
event.dataTransfer.dropEffect = "move"; // 设置了的话 drop 就无法监听 shift/control event.dataTransfer.dropEffect = "move";
if (event.dataTransfer.types.includes("Files") && event.target.classList.contains("protyle-wysiwyg")) { if (event.dataTransfer.types.includes("Files") && event.target.classList.contains("protyle-wysiwyg")) {
// 文档底部拖拽文件需 preventDefault，否则无法触发 drop 事件 https://github.com/siyuan-note/siyuan/issues/2665 // 文档底部拖拽文件需 preventDefault，否则无法触发 drop 事件 https://github.com/siyuan-note/siyuan/issues/2665
event.preventDefault(); event.preventDefault();
@ -748,7 +758,15 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
if (!window.siyuan.dragElement) { if (!window.siyuan.dragElement) {
return; return;
} }
// 编辑器内文字拖拽或资源文件拖拽进入编辑器时不能运行 event.preventDefault()， 否则吴光标; 需放在 !window.siyuan.dragElement 之后 if ((event.shiftKey || event.altKey) && window.siyuan.dragElement.getAttribute("data-treetype") === "backlink") {
const targetElement = hasClosestBlock(event.target);
if (targetElement) {
targetElement.classList.remove("dragover__top", "protyle-wysiwyg--select", "dragover__bottom", "dragover__left", "dragover__right");
}
event.preventDefault();
return;
}
// 编辑器内文字拖拽或资源文件拖拽或按住 alt/shift 拖拽反链图标进入编辑器时不能运行 event.preventDefault()， 否则无光标; 需放在 !window.siyuan.dragElement 之后
event.preventDefault(); event.preventDefault();
const targetElement = hasClosestBlock(event.target) as Element; const targetElement = hasClosestBlock(event.target) as Element;
if (!targetElement) { if (!targetElement) {

3
app/src/util/Tree.ts
View file

@ -223,8 +223,7 @@ data-def-path="${item.defPath}">
const liElement = hasClosestByTag(event.target, "LI"); const liElement = hasClosestByTag(event.target, "LI");
if (liElement) { if (liElement) {
event.dataTransfer.setData("text/html", liElement.outerHTML); event.dataTransfer.setData("text/html", liElement.outerHTML);
// event.dataTransfer.setData(Constants.SIYUAN_DROP_FILE, liElement.parentElement); // 设置了的话 drop 就无法监听 alt event.dataTransfer.dropEffect = "move";
event.dataTransfer.dropEffect = "move";
liElement.style.opacity = "0.1"; liElement.style.opacity = "0.1";
window.siyuan.dragElement = liElement; window.siyuan.dragElement = liElement;
} }