github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-15 00:21:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 fix https://github.com/siyuan-note/siyuan/issues/9273

Browse Source
This commit is contained in:
Vanessa 2023-09-28 14:09:39 +08:00
parent 89902a9fd9
commit 0184fb55f5
1 changed files with 136 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,31 +820,108 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
}); });
hideElements(["gutter"], protyle); hideElements(["gutter"], protyle);
const targetClass = targetElement.className.split(" ");
targetElement.classList.remove("dragover__bottom", "dragover__top", "dragover__left", "dragover__right", "protyle-wysiwyg--select");
if (targetElement.classList.contains("av__cell")) { if (targetElement.classList.contains("av__cell")) {
const blockElement = hasClosestBlock(targetElement); const blockElement = hasClosestBlock(targetElement);
if (!blockElement) { if (blockElement) {
return; const avID = blockElement.getAttribute("data-av-id");
transaction(protyle, [{
action: "sortAttrViewCol",
avID,
previousID: (targetClass.includes("dragover__left") ? targetElement.previousElementSibling?.getAttribute("data-col-id") : targetElement.getAttribute("data-col-id")) || "",
id: gutterTypes[2],
}], [{
action: "sortAttrViewCol",
avID,
previousID: targetElement.parentElement.querySelector(`[data-col-id="${gutterTypes[2]}"`).previousElementSibling?.getAttribute("data-col-id") || "",
id: gutterTypes[2],
}]);
} }
const avID = blockElement.getAttribute("data-av-id"); } else if (targetElement.classList.contains("av__row")) {
transaction(protyle, [{
action: "sortAttrViewCol",
avID,
previousID: (targetElement.classList.contains("dragover__left") ? targetElement.previousElementSibling?.getAttribute("data-col-id") : targetElement.getAttribute("data-col-id")) || "",
id: gutterTypes[2],
}], [{
action: "sortAttrViewCol",
avID,
previousID: targetElement.parentElement.querySelector(`[data-col-id="${gutterTypes[2]}"`).previousElementSibling?.getAttribute("data-col-id") || "",
id: gutterTypes[2],
}]);
return;
}
if (targetElement.classList.contains("av__row")) {
// 拖拽到属性视图内 // 拖拽到属性视图内
const blockElement = hasClosestBlock(targetElement); const blockElement = hasClosestBlock(targetElement);
if (!blockElement) { if (blockElement) {
return; let previousID = "";
if (targetClass.includes("dragover__bottom")) {
previousID = targetElement.getAttribute("data-id") || "";
} else {
previousID = targetElement.previousElementSibling?.getAttribute("data-id") || "";
}
const avID = blockElement.getAttribute("data-av-id");
if (gutterTypes[0] === "nodeattributeview" && gutterTypes[1] === "row") {
// 行内拖拽
const doOperations: IOperation[] = [];
const undoOperations: IOperation[] = [];
const undoPreviousId = blockElement.querySelector(`[data-id="${selectedIds[0]}"]`).previousElementSibling.getAttribute("data-id") || "";
selectedIds.reverse().forEach(item => {
doOperations.push({
action: "sortAttrViewRow",
avID,
previousID,
id: item,
});
undoOperations.push({
action: "sortAttrViewRow",
avID,
previousID: undoPreviousId,
id: item,
});
});
transaction(protyle, doOperations, undoOperations);
} else {
transaction(protyle, [{
action: "insertAttrViewBlock",
avID,
previousID,
srcIDs: sourceIds,
}], [{
action: "removeAttrViewBlock",
srcIDs: sourceIds,
avID,
}]);
insertAttrViewBlockAnimation(blockElement, sourceIds.length, previousID);
}
} }
} else {
if (targetElement.parentElement.getAttribute("data-type") === "NodeSuperBlock" &&
targetElement.parentElement.getAttribute("data-sb-layout") === "col") {
if (targetClass.includes("dragover__left") || targetClass.includes("dragover__right")) {
dragSame(protyle, sourceElements, targetElement, targetClass.includes("dragover__right"), event.ctrlKey);
} else {
dragSb(protyle, sourceElements, targetElement, targetClass.includes("dragover__bottom"), "row", event.ctrlKey);
}
} else {
if (targetClass.includes("dragover__left") || targetClass.includes("dragover__right")) {
dragSb(protyle, sourceElements, targetElement, targetClass.includes("dragover__right"), "col", event.ctrlKey);
} else {
dragSame(protyle, sourceElements, targetElement, targetClass.includes("dragover__bottom"), event.ctrlKey);
}
}
// 超级块内嵌入块无面包屑，需重新渲染 https://github.com/siyuan-note/siyuan/issues/7574
sourceElements.forEach(item => {
if (item.getAttribute("data-type") === "NodeBlockQueryEmbed") {
item.removeAttribute("data-render");
blockRender(protyle, item);
}
});
if (targetElement.getAttribute("data-type") === "NodeBlockQueryEmbed") {
targetElement.removeAttribute("data-render");
blockRender(protyle, targetElement);
}
}
}
} else if (event.dataTransfer.getData(Constants.SIYUAN_DROP_FILE)?.split("-").length > 1
&& targetElement && !protyle.options.backlinkData && targetElement.className.indexOf("dragover__") > -1) {
// 文件树拖拽
const scrollTop = protyle.contentElement.scrollTop;
const ids = event.dataTransfer.getData(Constants.SIYUAN_DROP_FILE).split(",");
if (targetElement.classList.contains("av__row")) {
// 拖拽到属性视图内
const blockElement = hasClosestBlock(targetElement);
if (blockElement) {
let previousID = ""; let previousID = "";
if (targetElement.classList.contains("dragover__bottom")) { if (targetElement.classList.contains("dragover__bottom")) {
previousID = targetElement.getAttribute("data-id") || ""; previousID = targetElement.getAttribute("data-id") || "";
@ -852,131 +929,51 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
previousID = targetElement.previousElementSibling?.getAttribute("data-id") || ""; previousID = targetElement.previousElementSibling?.getAttribute("data-id") || "";
} }
const avID = blockElement.getAttribute("data-av-id"); const avID = blockElement.getAttribute("data-av-id");
if (gutterTypes[0] === "nodeattributeview" && gutterTypes[1] === "row") { transaction(protyle, [{
// 行内拖拽 action: "insertAttrViewBlock",
const doOperations: IOperation[] = []; avID,
const undoOperations: IOperation[] = []; previousID,
const undoPreviousId = blockElement.querySelector(`[data-id="${selectedIds[0]}"]`).previousElementSibling.getAttribute("data-id") || ""; srcIDs: ids,
selectedIds.reverse().forEach(item => { }], [{
doOperations.push({ action: "removeAttrViewBlock",
action: "sortAttrViewRow", srcIDs: ids,
avID, avID,
previousID, }]);
id: item, insertAttrViewBlockAnimation(blockElement, ids.length, previousID);
}); }
undoOperations.push({ } else {
action: "sortAttrViewRow", for (let i = 0; i < ids.length; i++) {
avID, if (ids[i]) {
previousID: undoPreviousId, await fetchSyncPost("/api/filetree/doc2Heading", {
id: item, srcID: ids[i],
}); after: targetElement.classList.contains("dragover__bottom"),
targetID: targetElement.getAttribute("data-node-id"),
}); });
transaction(protyle, doOperations, undoOperations);
} else {
transaction(protyle, [{
action: "insertAttrViewBlock",
avID,
previousID,
srcIDs: sourceIds,
}], [{
action: "removeAttrViewBlock",
srcIDs: sourceIds,
avID,
}]);
insertAttrViewBlockAnimation(blockElement, sourceIds.length, previousID);
}
return;
}
const targetClass = targetElement.className.split(" ");
targetElement.classList.remove("dragover__bottom", "dragover__top", "dragover__left", "dragover__right", "protyle-wysiwyg--select");
if (targetElement.parentElement.getAttribute("data-type") === "NodeSuperBlock" &&
targetElement.parentElement.getAttribute("data-sb-layout") === "col") {
if (targetClass.includes("dragover__left") || targetClass.includes("dragover__right")) {
dragSame(protyle, sourceElements, targetElement, targetClass.includes("dragover__right"), event.ctrlKey);
} else {
dragSb(protyle, sourceElements, targetElement, targetClass.includes("dragover__bottom"), "row", event.ctrlKey);
}
} else {
if (targetClass.includes("dragover__left") || targetClass.includes("dragover__right")) {
dragSb(protyle, sourceElements, targetElement, targetClass.includes("dragover__right"), "col", event.ctrlKey);
} else {
dragSame(protyle, sourceElements, targetElement, targetClass.includes("dragover__bottom"), event.ctrlKey);
} }
} }
// 超级块内嵌入块无面包屑，需重新渲染 https://github.com/siyuan-note/siyuan/issues/7574 fetchPost("/api/filetree/getDoc", {
sourceElements.forEach(item => { id: protyle.block.id,
if (item.getAttribute("data-type") === "NodeBlockQueryEmbed") { size: window.siyuan.config.editor.dynamicLoadBlocks,
item.removeAttribute("data-render"); }, getResponse => {
blockRender(protyle, item); onGet({data: getResponse, protyle});
} /// #if !MOBILE
}); // 文档标题互转后，需更新大纲
if (targetElement.getAttribute("data-type") === "NodeBlockQueryEmbed") { updatePanelByEditor({
targetElement.removeAttribute("data-render"); protyle,
blockRender(protyle, targetElement); focus: false,
} pushBackStack: false,
} reload: true,
} else if (event.dataTransfer.getData(Constants.SIYUAN_DROP_FILE)?.split("-").length > 1 resize: false,
&& targetElement && !protyle.options.backlinkData) {
// 文件树拖拽
const scrollTop = protyle.contentElement.scrollTop;
const ids = event.dataTransfer.getData(Constants.SIYUAN_DROP_FILE).split(",");
if (targetElement.classList.contains("av__row")) {
// 拖拽到属性视图内
const blockElement = hasClosestBlock(targetElement);
if (!blockElement) {
return;
}
let previousID = "";
if (targetElement.classList.contains("dragover__bottom")) {
previousID = targetElement.getAttribute("data-id") || "";
} else {
previousID = targetElement.previousElementSibling?.getAttribute("data-id") || "";
}
const avID = blockElement.getAttribute("data-av-id");
transaction(protyle, [{
action: "insertAttrViewBlock",
avID,
previousID,
srcIDs: ids,
}], [{
action: "removeAttrViewBlock",
srcIDs: ids,
avID,
}]);
insertAttrViewBlockAnimation(blockElement, ids.length, previousID);
return;
}
for (let i = 0; i < ids.length; i++) {
if (ids[i]) {
await fetchSyncPost("/api/filetree/doc2Heading", {
srcID: ids[i],
after: targetElement.classList.contains("dragover__bottom"),
targetID: targetElement.getAttribute("data-node-id"),
}); });
} /// #endif
} // 文档标题互转后，编辑区会跳转到开头 https://github.com/siyuan-note/siyuan/issues/2939
fetchPost("/api/filetree/getDoc", { setTimeout(() => {
id: protyle.block.id, protyle.contentElement.scrollTop = scrollTop;
size: window.siyuan.config.editor.dynamicLoadBlocks, protyle.scroll.lastScrollTop = scrollTop - 1;
}, getResponse => { }, Constants.TIMEOUT_LOAD);
onGet({data: getResponse, protyle});
/// #if !MOBILE
// 文档标题互转后，需更新大纲
updatePanelByEditor({
protyle,
focus: false,
pushBackStack: false,
reload: true,
resize: false,
}); });
/// #endif }
// 文档标题互转后，编辑区会跳转到开头 https://github.com/siyuan-note/siyuan/issues/2939 targetElement.classList.remove("dragover__bottom", "dragover__top", "dragover__left", "dragover__right", "protyle-wysiwyg--select");
setTimeout(() => {
protyle.contentElement.scrollTop = scrollTop;
protyle.scroll.lastScrollTop = scrollTop - 1;
}, Constants.TIMEOUT_LOAD);
});
targetElement.classList.remove("dragover__bottom", "dragover__top");
} else if (!window.siyuan.dragElement && (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html"))) { } else if (!window.siyuan.dragElement && (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html"))) {
// 外部文件拖入编辑器中或者编辑器内选中文字拖拽 // 外部文件拖入编辑器中或者编辑器内选中文字拖拽
focusByRange(getRangeByPoint(event.clientX, event.clientY)); focusByRange(getRangeByPoint(event.clientX, event.clientY));