renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix https://github.com/siyuan-note/siyuan/issues/7401

Browse Source
This commit is contained in:
Vanessa
2023-02-20 09:16:54 +08:00
parent 5fa5ae78dd
commit c248faed49
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/protyle/gutter/index.ts
View File

@@ -62,12 +62,10 @@ export class Gutter {
protyle.wysiwyg.element.innerHTML);
});
this.element.addEventListener("dragend", () => {
if (window.siyuan.dragElement) {
this.element.querySelectorAll("button").forEach((item) => {
item.style.opacity = "";
});
window.siyuan.dragElement = undefined;
}
this.element.querySelectorAll("button").forEach((item) => {
item.style.opacity = "";
});
window.siyuan.dragElement = undefined;
});
this.element.addEventListener("click", (event: MouseEvent & { target: HTMLInputElement }) => {
const buttonElement = hasClosestByTag(event.target, "BUTTON");

18
app/src/protyle/util/editorCommonEvent.ts
View File

@@ -758,7 +758,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
} else if (targetElement) {
let queryClass = "";
selectedIds.forEach(item => {
queryClass = `[data-node-id="${item}"],`;
queryClass += `[data-node-id="${item}"],`;
});
if (window.siyuan.dragElement) {
window.siyuan.dragElement.querySelectorAll(queryClass.substring(0, queryClass.length - 1)).forEach(elementItem => {
@@ -970,9 +970,19 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
editorElement.addEventListener("dragleave", (event: DragEvent & { target: HTMLElement }) => {
const nodeElement = hasClosestBlock(event.target);
if (nodeElement) {
nodeElement.removeAttribute("select-start");
nodeElement.removeAttribute("select-end");
nodeElement.classList.remove("protyle-wysiwyg--select", "dragover__top", "dragover__bottom", "dragover__left", "dragover__right");
let gutterType = "";
for (const item of event.dataTransfer.items) {
if (item.type.startsWith(Constants.SIYUAN_DROP_GUTTER)) {
gutterType = item.type;
}
}
if (gutterType.indexOf(nodeElement.getAttribute("data-node-id")) === -1) {
// 选中的元素不应移除，否则拖拽 gutter 经过选中的元素，该元素就会被取消选中
nodeElement.classList.remove("protyle-wysiwyg--select");
nodeElement.removeAttribute("select-start");
nodeElement.removeAttribute("select-end");
}
nodeElement.classList.remove("dragover__top", "dragover__bottom", "dragover__left", "dragover__right");
}
});
};