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

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

Browse source
This commit is contained in:
Vanessa 2025-12-04 11:23:58 +08:00
parent 29879c531a
commit bada8daa01
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/protyle/wysiwyg/move.ts
View file

@ -57,6 +57,7 @@ export const moveToUp = (protyle: IProtyle, nodeElement: HTMLElement, range: Ran
if (previousElement) { if (previousElement) {
previousElement = previousElement.lastElementChild.previousElementSibling; previousElement = previousElement.lastElementChild.previousElementSibling;
const sourceParentElement = sourceElements[0].classList.contains("list") ? sourceElements[0] : sourceElements[0].parentElement; const sourceParentElement = sourceElements[0].classList.contains("list") ? sourceElements[0] : sourceElements[0].parentElement;
const orderIndex = parseInt(sourceParentElement.firstElementChild.getAttribute("data-marker"));
sourceElements.reverse().forEach(item => { sourceElements.reverse().forEach(item => {
if (item.classList.contains("list")) { if (item.classList.contains("list")) {
previousElement.after(item.firstElementChild); previousElement.after(item.firstElementChild);
@ -71,7 +72,7 @@ export const moveToUp = (protyle: IProtyle, nodeElement: HTMLElement, range: Ran
if (sourceParentElement.childElementCount === 1) { if (sourceParentElement.childElementCount === 1) {
sourceParentElement.remove(); sourceParentElement.remove();
} else if (sourceParentElement.getAttribute("data-subtype") === "o" && sourceParentElement.classList.contains("list")) { } else if (sourceParentElement.getAttribute("data-subtype") === "o" && sourceParentElement.classList.contains("list")) {
updateListOrder(sourceParentElement, 1); updateListOrder(sourceParentElement, orderIndex);
} }
if (previousElement.getAttribute("data-subtype") === "o") { if (previousElement.getAttribute("data-subtype") === "o") {
updateListOrder(previousElement.parentElement); updateListOrder(previousElement.parentElement);
@ -88,8 +89,9 @@ export const moveToUp = (protyle: IProtyle, nodeElement: HTMLElement, range: Ran
previousElement = sourceElements[0].previousElementSibling; previousElement = sourceElements[0].previousElementSibling;
if (sourceElements[0].getAttribute("data-subtype") === "o" && type === "NodeListItem") { if (sourceElements[0].getAttribute("data-subtype") === "o" && type === "NodeListItem") {
const html = sourceElements[0].parentElement.outerHTML; const html = sourceElements[0].parentElement.outerHTML;
const orderIndex = parseInt(sourceElements[0].parentElement.firstElementChild.getAttribute("data-marker"));
sourceElements[sourceElements.length - 1].after(previousElement); sourceElements[sourceElements.length - 1].after(previousElement);
updateListOrder(sourceElements[0].parentElement, 1); updateListOrder(sourceElements[0].parentElement, orderIndex);
updateTransaction(protyle, sourceElements[0].parentElement.getAttribute("data-node-id"), sourceElements[0].parentElement.outerHTML, html); updateTransaction(protyle, sourceElements[0].parentElement.getAttribute("data-node-id"), sourceElements[0].parentElement.outerHTML, html);
} else { } else {
const id = previousElement.getAttribute("data-node-id"); const id = previousElement.getAttribute("data-node-id");
@ -158,6 +160,7 @@ export const moveToDown = (protyle: IProtyle, nodeElement: HTMLElement, range: R
} }
} }
if (nextElement) { if (nextElement) {
const orderIndex = parseInt(nextElement.getAttribute("data-marker"));
const sourceParentElement = sourceElements[0].classList.contains("list") ? sourceElements[0] : sourceElements[0].parentElement; const sourceParentElement = sourceElements[0].classList.contains("list") ? sourceElements[0] : sourceElements[0].parentElement;
sourceElements.forEach(item => { sourceElements.forEach(item => {
if (item.classList.contains("list")) { if (item.classList.contains("list")) {
@ -168,11 +171,9 @@ export const moveToDown = (protyle: IProtyle, nodeElement: HTMLElement, range: R
}); });
if (sourceParentElement.childElementCount === 1) { if (sourceParentElement.childElementCount === 1) {
sourceParentElement.remove(); sourceParentElement.remove();
} else if (sourceParentElement.getAttribute("data-subtype") === "o" && sourceParentElement.classList.contains("list")) {
updateListOrder(sourceParentElement, 1);
} }
if (nextElement.getAttribute("data-subtype") === "o") { if (nextElement.getAttribute("data-subtype") === "o") {
updateListOrder(nextElement.parentElement, 1); updateListOrder(nextElement.parentElement, orderIndex);
} }
updateTransaction(protyle, nextElement.parentElement.parentElement.parentElement.getAttribute("data-node-id"), nextElement.parentElement.parentElement.parentElement.outerHTML, oldListHTML); updateTransaction(protyle, nextElement.parentElement.parentElement.parentElement.getAttribute("data-node-id"), nextElement.parentElement.parentElement.parentElement.outerHTML, oldListHTML);
preventScroll(protyle); preventScroll(protyle);
@ -186,8 +187,9 @@ export const moveToDown = (protyle: IProtyle, nodeElement: HTMLElement, range: R
nextElement = sourceElements[sourceElements.length - 1].nextElementSibling; nextElement = sourceElements[sourceElements.length - 1].nextElementSibling;
if (nextElement.getAttribute("data-subtype") === "o" && nextElement.getAttribute("data-type") === "NodeListItem") { if (nextElement.getAttribute("data-subtype") === "o" && nextElement.getAttribute("data-type") === "NodeListItem") {
const html = nextElement.parentElement.outerHTML; const html = nextElement.parentElement.outerHTML;
const orderIndex = parseInt(sourceElements[0].parentElement.firstElementChild.getAttribute("data-marker"));
sourceElements[0].before(nextElement); sourceElements[0].before(nextElement);
updateListOrder(nextElement.parentElement, 1); updateListOrder(nextElement.parentElement, orderIndex);
updateTransaction(protyle, nextElement.parentElement.getAttribute("data-node-id"), nextElement.parentElement.outerHTML, html); updateTransaction(protyle, nextElement.parentElement.getAttribute("data-node-id"), nextElement.parentElement.outerHTML, html);
} else { } else {
const id = nextElement.getAttribute("data-node-id"); const id = nextElement.getAttribute("data-node-id");