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

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

Browse source
This commit is contained in:
Vanessa 2025-10-26 18:46:33 +08:00
parent c858b517b9
commit 4499a12107
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/src/protyle/wysiwyg/commonHotkey.ts
View file

@ -13,7 +13,8 @@ import * as dayjs from "dayjs";
import {net2LocalAssets} from "../breadcrumb/action"; import {net2LocalAssets} from "../breadcrumb/action";
import {processClonePHElement} from "../render/util"; import {processClonePHElement} from "../render/util";
import {copyTextByType} from "../toolbar/util"; import {copyTextByType} from "../toolbar/util";
import {hasClosestByTag} from "../util/hasClosest"; import {hasClosestByTag, hasTopClosestByClassName} from "../util/hasClosest";
import {removeEmbed} from "./removeEmbed";
export const commonHotkey = (protyle: IProtyle, event: KeyboardEvent, nodeElement?: HTMLElement) => { export const commonHotkey = (protyle: IProtyle, event: KeyboardEvent, nodeElement?: HTMLElement) => {
if (matchHotKey(window.siyuan.config.keymap.editor.general.netImg2LocalAsset.custom, event)) { if (matchHotKey(window.siyuan.config.keymap.editor.general.netImg2LocalAsset.custom, event)) {
@ -258,17 +259,30 @@ export const duplicateBlock = async (nodeElements: Element[], protyle: IProtyle)
const doOperations: IOperation[] = []; const doOperations: IOperation[] = [];
const undoOperations: IOperation[] = []; const undoOperations: IOperation[] = [];
let starIndex: number; let starIndex: number;
const lastElement = nodeElements[nodeElements.length - 1]; let lastElement = nodeElements[nodeElements.length - 1];
if (lastElement.classList.contains("li") && if (lastElement.classList.contains("li")) {
lastElement.getAttribute("data-subtype") === "o") { if (lastElement.getAttribute("data-subtype") === "o") {
starIndex = parseInt(lastElement.getAttribute("data-marker"), 10); starIndex = parseInt(lastElement.getAttribute("data-marker"), 10);
}
const isSameLi = nodeElements.find(item => {
if (item.classList.contains("li") &&
lastElement.getAttribute("data-subtype") !== item.getAttribute("data-subtype")) {
return true;
}
});
if (!isSameLi) {
lastElement = hasTopClosestByClassName(lastElement, "list") || lastElement;
}
} }
let listHTML = "";
const foldHeadingIds = []; const foldHeadingIds = [];
for (let index = nodeElements.length - 1; index >= 0; --index) { for (let index = nodeElements.length - 1; index >= 0; --index) {
const item = nodeElements[index]; const item = nodeElements[index];
item.classList.remove("protyle-wysiwyg--select");
let tempElement = item.cloneNode(true) as HTMLElement; let tempElement = item.cloneNode(true) as HTMLElement;
const newId = Lute.NewNodeID(); const newId = Lute.NewNodeID();
if (item.getAttribute("data-type") !== "NodeBlockQueryEmbed" && item.querySelector('[data-type="NodeHeading"][fold="1"]')) { if (item.getAttribute("data-type") !== "NodeBlockQueryEmbed" &&
item.querySelector('[data-type="NodeHeading"][fold="1"]')) {
const response = await fetchSyncPost("/api/block/getBlockDOM", { const response = await fetchSyncPost("/api/block/getBlockDOM", {
id: item.getAttribute("data-node-id"), id: item.getAttribute("data-node-id"),
}); });
@ -276,6 +290,23 @@ export const duplicateBlock = async (nodeElements: Element[], protyle: IProtyle)
foldTempElement.innerHTML = response.data.dom; foldTempElement.innerHTML = response.data.dom;
tempElement = foldTempElement.content.firstElementChild as HTMLElement; tempElement = foldTempElement.content.firstElementChild as HTMLElement;
} }
if (item.getAttribute("data-type") === "NodeListItem") {
if (!listHTML) {
listHTML = `<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
}
listHTML = removeEmbed(item) + listHTML;
if (index === 0 ||
nodeElements[index - 1].getAttribute("data-type") !== "NodeListItem" ||
nodeElements[index - 1].getAttribute("data-subtype") !== item.getAttribute("data-subtype")
) {
const foldTempElement = document.createElement("template");
foldTempElement.innerHTML = `<div data-subtype="${item.getAttribute("data-subtype")}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">${listHTML}`;
tempElement = foldTempElement.content.firstElementChild as HTMLElement;
listHTML = "";
} else {
continue;
}
}
if (index === nodeElements.length - 1) { if (index === nodeElements.length - 1) {
focusElement = tempElement; focusElement = tempElement;
} }
@ -294,7 +325,6 @@ export const duplicateBlock = async (nodeElements: Element[], protyle: IProtyle)
childItem.removeAttribute("refcount"); childItem.removeAttribute("refcount");
childItem.lastElementChild.querySelector(".protyle-attr--refcount")?.remove(); childItem.lastElementChild.querySelector(".protyle-attr--refcount")?.remove();
}); });
item.classList.remove("protyle-wysiwyg--select");
if (typeof starIndex === "number") { if (typeof starIndex === "number") {
const orderIndex = starIndex + index + 1; const orderIndex = starIndex + index + 1;
tempElement.setAttribute("data-marker", (orderIndex) + "."); tempElement.setAttribute("data-marker", (orderIndex) + ".");