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

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

Browse source
This commit is contained in:
Vanessa 2025-03-30 17:50:33 +08:00
parent f58c2df52c
commit 1eaec1d180
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,9 +104,6 @@ export class Tab {
const tabElement = hasClosestByTag(event.target, "LI"); const tabElement = hasClosestByTag(event.target, "LI");
if (tabElement) { if (tabElement) {
tabElement.style.opacity = "1"; tabElement.style.opacity = "1";
document.querySelectorAll(".layout-tab-bar li[data-clone='true']").forEach((item) => {
item.remove();
});
} }
/// #if !BROWSER /// #if !BROWSER
// 拖拽到屏幕外 // 拖拽到屏幕外
@ -114,9 +111,16 @@ export class Tab {
if (document.body.contains(this.panelElement) && if (document.body.contains(this.panelElement) &&
(event.clientX < 0 || event.clientY < 0 || event.clientX > window.innerWidth || event.clientY > window.innerHeight)) { (event.clientX < 0 || event.clientY < 0 || event.clientX > window.innerWidth || event.clientY > window.innerHeight)) {
openNewWindow(this); openNewWindow(this);
ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "resetTabsStyle"});
} }
}, Constants.TIMEOUT_LOAD); // 等待主进程发送关闭消息 }, Constants.TIMEOUT_LOAD); // 等待主进程发送关闭消息
ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "resetTabsStyle"});
/// #else
document.querySelectorAll(".layout-tab-bars--drag").forEach(item => {
item.classList.remove("layout-tab-bars--drag");
});
document.querySelectorAll(".layout-tab-bar li[data-clone='true']").forEach(tabItem => {
tabItem.remove();
});
/// #endif /// #endif
window.siyuan.dragElement = undefined; window.siyuan.dragElement = undefined;
if (event.dataTransfer.dropEffect === "none") { if (event.dataTransfer.dropEffect === "none") {

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

@ -232,16 +232,6 @@ export class Wnd {
} }
}); });
this.headersElement.parentElement.addEventListener("dragend", () => {
document.querySelectorAll(".layout-tab-bars--drag").forEach(item => {
item.classList.remove("layout-tab-bars--drag");
});
// 窗口拖拽到新窗口时，不 drop 无法移除 clone 的元素
document.querySelectorAll(".layout-tab-bar li[data-clone='true']").forEach(item => {
item.remove();
});
});
this.headersElement.parentElement.addEventListener("drop", function (event: DragEvent & { this.headersElement.parentElement.addEventListener("drop", function (event: DragEvent & {
target: HTMLElement target: HTMLElement
}) { }) {

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

@ -25,6 +25,9 @@ import {
import {isTouchDevice} from "../../util/functions"; import {isTouchDevice} from "../../util/functions";
import {App} from "../../index"; import {App} from "../../index";
import {refreshFileTree} from "../../dialog/processSystem"; import {refreshFileTree} from "../../dialog/processSystem";
/// #if !BROWSER
import {ipcRenderer} from "electron";
/// #endif
import {hideTooltip, showTooltip} from "../../dialog/tooltip"; import {hideTooltip, showTooltip} from "../../dialog/tooltip";
export class Files extends Model { export class Files extends Model {
@ -467,9 +470,13 @@ export class Files extends Model {
} }
}); });
window.siyuan.dragElement = undefined; window.siyuan.dragElement = undefined;
/// #if !BROWSER
ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "resetTabsStyle"});
/// #else
document.querySelectorAll(".layout-tab-bars--drag").forEach(item => { document.querySelectorAll(".layout-tab-bars--drag").forEach(item => {
item.classList.remove("layout-tab-bars--drag"); item.classList.remove("layout-tab-bars--drag");
}); });
/// #endif
}); });
this.element.addEventListener("dragover", (event: DragEvent & { target: HTMLElement }) => { this.element.addEventListener("dragover", (event: DragEvent & { target: HTMLElement }) => {
if (window.siyuan.config.readonly || event.dataTransfer.types.includes(Constants.SIYUAN_DROP_TAB)) { if (window.siyuan.config.readonly || event.dataTransfer.types.includes(Constants.SIYUAN_DROP_TAB)) {

6
app/src/window/onWindowsMsg.ts
View file

@ -17,9 +17,9 @@ export const onWindowsMsg = (ipcData: IWebSocketData) => {
case "resetTabsStyle": case "resetTabsStyle":
document.querySelectorAll(".layout-tab-bars--drag").forEach(item => { document.querySelectorAll(".layout-tab-bars--drag").forEach(item => {
item.classList.remove("layout-tab-bars--drag"); item.classList.remove("layout-tab-bars--drag");
item.querySelectorAll(".layout-tab-bar li[data-clone='true']").forEach(tabItem => { });
tabItem.remove(); document.querySelectorAll(".layout-tab-bar li[data-clone='true']").forEach(tabItem => {
}); tabItem.remove();
}); });
break; break;
case "lockscreen": case "lockscreen":