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

✨ https://github.com/siyuan-note/siyuan/issues/2955

Browse source
This commit is contained in:
Vanessa 2023-01-28 11:32:55 +08:00
parent ea5f43183c
commit 6bbb679cd2
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/.eslintrc.js
View file

@ -14,7 +14,6 @@ module.exports = {
'no-prototype-builtins': 'off', 'no-prototype-builtins': 'off',
'no-useless-escape': 'off', 'no-useless-escape': 'off',
'no-irregular-whitespace': 'off', 'no-irregular-whitespace': 'off',
'@typescript-eslint/no-this-alia': 'off',
'@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-var-requires': 'off', '@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-function-return-type': 'off',

2
app/src/assets/scss/_reset.scss
View file

@ -83,7 +83,7 @@ body {
} }
&.body--blur .layout-tab-bar { &.body--blur .layout-tab-bar {
background-color: var(--b3-toolbar-blur-background); opacity: .38;
} }
} }
} }

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

@ -10,7 +10,6 @@ import {fetchPost} from "../util/fetch";
import {showTooltip} from "../dialog/tooltip"; import {showTooltip} from "../dialog/tooltip";
import {isTouchDevice} from "../util/functions"; import {isTouchDevice} from "../util/functions";
/// #if !BROWSER /// #if !BROWSER
import {getCurrentWindow} from "@electron/remote";
import {openNewWindow} from "../window/openNewWindow"; import {openNewWindow} from "../window/openNewWindow";
/// #endif /// #endif
import {layoutToJSON} from "./util"; import {layoutToJSON} from "./util";
@ -100,12 +99,10 @@ export class Tab {
/// #if !BROWSER /// #if !BROWSER
// 拖拽到屏幕外 // 拖拽到屏幕外
setTimeout(() => { setTimeout(() => {
if (!this.headElement.style.maxWidth) { if (document.body.contains(this.panelElement) &&
const windowBounds = getCurrentWindow().getBounds(); (event.clientX < 0 || event.clientY < 0 || event.clientX > window.innerWidth || event.clientY > window.innerHeight)) {
if (event.clientX < 0 || event.clientY < 0 || event.clientX > windowBounds.width || event.clientY > windowBounds.height) {
openNewWindow(this); openNewWindow(this);
} }
}
}, Constants.TIMEOUT_BLOCKLOAD); // 等待主进程发送关闭消息 }, Constants.TIMEOUT_BLOCKLOAD); // 等待主进程发送关闭消息
/// #endif /// #endif
window.siyuan.dragElement = undefined; window.siyuan.dragElement = undefined;

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

@ -206,7 +206,6 @@ export class Wnd {
}); });
it.style.opacity = ""; it.style.opacity = "";
}); });
const that = this;
this.headersElement.addEventListener("drop", function (event: DragEvent & { target: HTMLElement }) { this.headersElement.addEventListener("drop", function (event: DragEvent & { target: HTMLElement }) {
const it = this as HTMLElement; const it = this as HTMLElement;
if (event.dataTransfer.types.includes(Constants.SIYUAN_DROP_FILE)) { if (event.dataTransfer.types.includes(Constants.SIYUAN_DROP_FILE)) {
@ -228,11 +227,14 @@ export class Wnd {
let oldTab = getInstanceById(tabId) as Tab; let oldTab = getInstanceById(tabId) as Tab;
/// #if !BROWSER /// #if !BROWSER
if (!oldTab) { // 从主窗口拖拽到页签新窗口 if (!oldTab) { // 从主窗口拖拽到页签新窗口
JSONToCenter(JSON.parse(event.dataTransfer.getData(Constants.SIYUAN_DROP_TABTOWINDOW)), that); const wnd = getInstanceById(this.parentElement.parentElement.getAttribute("data-id"));
oldTab = that.children[that.children.length - 1]; if (wnd instanceof Wnd) {
JSONToCenter(JSON.parse(event.dataTransfer.getData(Constants.SIYUAN_DROP_TABTOWINDOW)), wnd);
oldTab = wnd.children[wnd.children.length - 1];
ipcRenderer.send(Constants.SIYUAN_CLOSETAB, tabId); ipcRenderer.send(Constants.SIYUAN_CLOSETAB, tabId);
it.querySelector("li[data-clone='true']").remove(); it.querySelector("li[data-clone='true']").remove();
that.switchTab(oldTab.headElement); wnd.switchTab(oldTab.headElement);
}
} }
/// #endif /// #endif
if (!oldTab) { if (!oldTab) {