Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-10 06:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🚨

Browse source
This commit is contained in:
Vanessa 2023-11-14 23:18:18 +08:00
parent 6a4ed3c92b
commit aac7fa8101
14 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -856,23 +856,23 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
if (targetClass.includes("dragover__left")) {
if (targetElement.previousElementSibling) {
if (targetElement.previousElementSibling.classList.contains("av__colsticky")) {
previousID = targetElement.previousElementSibling.lastElementChild.getAttribute("data-col-id")
previousID = targetElement.previousElementSibling.lastElementChild.getAttribute("data-col-id");
} else {
previousID = targetElement.previousElementSibling.getAttribute("data-col-id")
previousID = targetElement.previousElementSibling.getAttribute("data-col-id");
}
}
} else {
previousID = targetElement.getAttribute("data-col-id")
previousID = targetElement.getAttribute("data-col-id");
}
let oldPreviousID = "";
const rowElement = hasClosestByClassName(targetElement, "av__row");
if (rowElement) {
const oldPreviousElement = rowElement.querySelector(`[data-col-id="${gutterTypes[2]}"`)?.previousElementSibling
const oldPreviousElement = rowElement.querySelector(`[data-col-id="${gutterTypes[2]}"`)?.previousElementSibling;
if (oldPreviousElement) {
if (oldPreviousElement.classList.contains("av__colsticky")) {
oldPreviousID = oldPreviousElement.lastElementChild.getAttribute("data-col-id")
oldPreviousID = oldPreviousElement.lastElementChild.getAttribute("data-col-id");
} else {
oldPreviousID = oldPreviousElement.getAttribute("data-col-id")
oldPreviousID = oldPreviousElement.getAttribute("data-col-id");
}
}
}
@ -1136,8 +1136,8 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
// 表头只能拖拽到当前 av 的表头中
targetElement = hasClosestByClassName(event.target, "av__cell");
if (targetElement) {
const targetRowElement = hasClosestByClassName(targetElement, "av__row--header")
const dragRowElement = hasClosestByClassName(window.siyuan.dragElement, "av__row--header")
const targetRowElement = hasClosestByClassName(targetElement, "av__row--header");
const dragRowElement = hasClosestByClassName(window.siyuan.dragElement, "av__row--header");
if (!targetRowElement || !dragRowElement ||
(targetRowElement && dragRowElement && !targetRowElement.isSameNode(dragRowElement))
) {