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

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

Browse source
This commit is contained in:
Vanessa 2025-11-13 13:06:20 +08:00
parent 4b37741535
commit 57aacd7bc5
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/block/util.ts
View file

@ -22,7 +22,7 @@ export const cancelSB = async (protyle: IProtyle, nodeElement: Element, range?:
const id = nodeElement.getAttribute("data-node-id");
const sbElement = nodeElement.cloneNode() as HTMLElement;
sbElement.innerHTML = nodeElement.lastElementChild.outerHTML;
let parentID = nodeElement.parentElement.getAttribute("data-node-id");
let parentID = nodeElement.parentElement?.getAttribute("data-node-id");
// 缩放和反链需要接口获取
if (!previousId && !parentID) {
if (protyle.block.showAll || protyle.options.backlinkData) {

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

@ -360,18 +360,25 @@ const dragSb = async (protyle: IProtyle, sourceElements: Element[], targetElemen
previousID: sbElement.previousElementSibling?.getAttribute("data-node-id"),
parentID: sbElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID
}];
// 临时插入，防止后面计算错误，最终再移动矫正
sbElement.lastElementChild.before(targetElement);
const moveToResult = await moveTo(protyle, sourceElements, sbElement, isSameDoc, "afterbegin", isCopy);
doOperations.push(...moveToResult.doOperations);
undoOperations.push(...moveToResult.undoOperations);
const newSourceParentElement = moveToResult.newSourceElements;
// 横向超级块A内两个元素拖拽成纵向超级块B，取消超级块A会导致 targetElement 被删除，需先移动再删除 https://github.com/siyuan-note/siyuan/issues/16292
let removeIndex = doOperations.length - 1;
let removeIndex = doOperations.length;
doOperations.find((item, index) => {
// 横向超级块A内两个元素拖拽成纵向超级块B，取消超级块A会导致 targetElement 被删除，需先移动再删除 https://github.com/siyuan-note/siyuan/issues/16292
if (item.action === "delete" && item.id === targetMoveUndo.parentID) {
removeIndex = index;
return true;
}
// 超级块内有两个块，拖拽其中一个到超级块外 https://github.com/siyuan-note/siyuan/issues/16292#issuecomment-3523600155
if (item.action === "delete" && item.id === targetElement.getAttribute("data-node-id")) {
targetElement = sbElement.querySelector(`[data-node-id="${doOperations[index - 1].id}"]`);
}
});
if (isBottom) {
// 拖拽到超级块 col 下方， 其他块右侧
sbElement.insertAdjacentElement("afterbegin", targetElement);