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

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

Browse source
This commit is contained in:
Vanessa 2025-03-31 16:15:44 +08:00
parent 345be890f6
commit 378b552069
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -416,7 +416,7 @@ export const showPopover = async (app: App, showRef = false) => {
} }
}); });
if (!hasPin && popoverTargetElement.parentElement && if (!hasPin && popoverTargetElement.parentElement &&
popoverTargetElement.parentElement.style.opacity !== "0.1" // 反向面板图标拖拽时不应该弹层 popoverTargetElement.parentElement.style.opacity !== "0.38" // 反向面板图标拖拽时不应该弹层
) { ) {
window.siyuan.blockPanels.push(new BlockPanel({ window.siyuan.blockPanels.push(new BlockPanel({
app, app,

4
app/src/layout/Tab.ts
View file

@ -50,7 +50,7 @@ export class Tab {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
const dragElement = Array.from(this.headElement.parentElement.childNodes).find((item: HTMLElement) => { const dragElement = Array.from(this.headElement.parentElement.childNodes).find((item: HTMLElement) => {
if (item.style?.opacity === "0.1") { if (item.style?.opacity === "0.38") {
return true; return true;
} }
}); });
@ -96,7 +96,7 @@ export class Tab {
layoutToJSON(this, modeJSON); layoutToJSON(this, modeJSON);
event.dataTransfer.setData(Constants.SIYUAN_DROP_TAB, JSON.stringify(modeJSON)); event.dataTransfer.setData(Constants.SIYUAN_DROP_TAB, JSON.stringify(modeJSON));
event.dataTransfer.dropEffect = "move"; event.dataTransfer.dropEffect = "move";
tabElement.style.opacity = "0.1"; tabElement.style.opacity = "0.38";
window.siyuan.dragElement = this.headElement; window.siyuan.dragElement = this.headElement;
} }
}); });

6
app/src/layout/Wnd.ts
View file

@ -191,7 +191,7 @@ export class Wnd {
let oldTabHeaderElement = window.siyuan.dragElement; let oldTabHeaderElement = window.siyuan.dragElement;
let exitDrag = false; let exitDrag = false;
Array.from(it.firstElementChild.childNodes).find((item: HTMLElement) => { Array.from(it.firstElementChild.childNodes).find((item: HTMLElement) => {
if (item.style?.opacity === "0.1") { if (item.style?.opacity === "0.38") {
oldTabHeaderElement = item; oldTabHeaderElement = item;
exitDrag = true; exitDrag = true;
return true; return true;
@ -207,7 +207,7 @@ export class Wnd {
return; return;
} else if (!exitDrag && !oldTabHeaderElement) { // 拖拽到新窗口 } else if (!exitDrag && !oldTabHeaderElement) { // 拖拽到新窗口
oldTabHeaderElement = document.createElement("li"); oldTabHeaderElement = document.createElement("li");
oldTabHeaderElement.style.opacity = "0.1"; oldTabHeaderElement.style.opacity = "0.38";
oldTabHeaderElement.innerHTML = '<svg class="svg"><use xlink:href="#iconFile"></use></svg>'; oldTabHeaderElement.innerHTML = '<svg class="svg"><use xlink:href="#iconFile"></use></svg>';
oldTabHeaderElement.setAttribute("data-clone", "true"); oldTabHeaderElement.setAttribute("data-clone", "true");
it.firstElementChild.append(oldTabHeaderElement); it.firstElementChild.append(oldTabHeaderElement);
@ -274,7 +274,7 @@ export class Wnd {
} }
const nextTabHeaderElement = (Array.from(it.firstElementChild.childNodes).find((item: HTMLElement) => { const nextTabHeaderElement = (Array.from(it.firstElementChild.childNodes).find((item: HTMLElement) => {
if (item.style?.opacity === "0.1") { if (item.style?.opacity === "0.38") {
return true; return true;
} }
}) as HTMLElement)?.nextElementSibling; }) as HTMLElement)?.nextElementSibling;

2
app/src/layout/dock/Files.ts
View file

@ -435,7 +435,7 @@ export class Files extends Model {
const ghostElement = document.createElement("ul"); const ghostElement = document.createElement("ul");
selectElements.forEach((item: HTMLElement, index) => { selectElements.forEach((item: HTMLElement, index) => {
ghostElement.append(item.cloneNode(true)); ghostElement.append(item.cloneNode(true));
item.style.opacity = "0.1"; item.style.opacity = "0.38";
const itemNodeId = item.dataset.nodeId || const itemNodeId = item.dataset.nodeId ||
item.dataset.path; // 拖拽笔记本时值不能为空，否则 drop 就不会继续排序 item.dataset.path; // 拖拽笔记本时值不能为空，否则 drop 就不会继续排序
if (itemNodeId) { if (itemNodeId) {

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

@ -842,7 +842,7 @@ export const addResize = (obj: Layout | Wnd) => {
documentSelf.ondragstart = () => { documentSelf.ondragstart = () => {
// 文件树拖拽会产生透明效果 // 文件树拖拽会产生透明效果
document.querySelectorAll(".sy__file .b3-list-item").forEach((item: HTMLElement) => { document.querySelectorAll(".sy__file .b3-list-item").forEach((item: HTMLElement) => {
if (item.style.opacity === "0.1") { if (item.style.opacity === "0.38") {
item.style.opacity = ""; item.style.opacity = "";
} }
}); });

2
app/src/protyle/gutter/index.ts
View file

@ -150,7 +150,7 @@ export class Gutter {
setTimeout(() => { setTimeout(() => {
ghostElement.remove(); ghostElement.remove();
}); });
buttonElement.style.opacity = "0.1"; buttonElement.style.opacity = "0.38";
window.siyuan.dragElement = avElement as HTMLElement || protyle.wysiwyg.element; window.siyuan.dragElement = avElement as HTMLElement || protyle.wysiwyg.element;
event.dataTransfer.setData(`${Constants.SIYUAN_DROP_GUTTER}${buttonElement.getAttribute("data-type")}${Constants.ZWSP}${buttonElement.getAttribute("data-subtype")}${Constants.ZWSP}${selectIds}${Constants.ZWSP}${window.siyuan.config.system.workspaceDir}`, event.dataTransfer.setData(`${Constants.SIYUAN_DROP_GUTTER}${buttonElement.getAttribute("data-type")}${Constants.ZWSP}${buttonElement.getAttribute("data-subtype")}${Constants.ZWSP}${selectIds}${Constants.ZWSP}${window.siyuan.config.system.workspaceDir}`,
protyle.wysiwyg.element.innerHTML); protyle.wysiwyg.element.innerHTML);

2
app/src/protyle/render/av/blockAttr.ts
View file

@ -218,7 +218,7 @@ class="fn__flex-1 fn__flex${["url", "text", "number", "email", "phone", "block"]
element.addEventListener("dragstart", (event: DragEvent) => { element.addEventListener("dragstart", (event: DragEvent) => {
const target = event.target as HTMLElement; const target = event.target as HTMLElement;
window.siyuan.dragElement = target.parentElement; window.siyuan.dragElement = target.parentElement;
window.siyuan.dragElement.style.opacity = ".1"; window.siyuan.dragElement.style.opacity = ".38";
dragBlockElement = hasClosestBlock(window.siyuan.dragElement) as HTMLElement; dragBlockElement = hasClosestBlock(window.siyuan.dragElement) as HTMLElement;
const ghostElement = document.createElement("div"); const ghostElement = document.createElement("div");

2
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -179,7 +179,7 @@ export const openMenuPanel = (options: {
} }
avPanelElement.addEventListener("dragstart", (event: DragEvent) => { avPanelElement.addEventListener("dragstart", (event: DragEvent) => {
window.siyuan.dragElement = event.target as HTMLElement; window.siyuan.dragElement = event.target as HTMLElement;
window.siyuan.dragElement.style.opacity = ".1"; window.siyuan.dragElement.style.opacity = ".38";
return; return;
}); });
avPanelElement.addEventListener("drop", (event) => { avPanelElement.addEventListener("drop", (event) => {

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

@ -258,7 +258,7 @@ data-def-path="${item.defPath}">
if (liElement) { if (liElement) {
event.dataTransfer.setData("text/html", liElement.outerHTML); event.dataTransfer.setData("text/html", liElement.outerHTML);
// 设置了的话 drop 就无法监听 alt event.dataTransfer.dropEffect = "move"; // 设置了的话 drop 就无法监听 alt event.dataTransfer.dropEffect = "move";
liElement.style.opacity = "0.1"; liElement.style.opacity = "0.38";
window.siyuan.dragElement = liElement; window.siyuan.dragElement = liElement;
} }
}); });