From e4bce33b89cd188b93496bb3926492c9d1688bce Mon Sep 17 00:00:00 2001 From: zh <972939975@qq.com> Date: Fri, 7 Nov 2025 10:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=EF=BC=9B=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E7=AB=AF=E5=8F=A3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/index.ts | 9 + src/renderer/src/assets/styles/global.css | 1 + src/renderer/src/router/index.ts | 2 +- .../src/views/TS/components/eventParams.vue | 2 +- src/renderer/src/views/author/index.vue | 366 ++++++++++++++++-- .../headers/components/setTool/setTool.vue | 2 +- 6 files changed, 346 insertions(+), 36 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index e6ce29d..6e8aeeb 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -277,6 +277,9 @@ function createWindow(): void { mainWindow.webContents.send('fullscreen-status-changed', false) }); mainWindow.on("close", (e) => { + if (isRestart) { + return + } e.preventDefault(); dialog .showMessageBox(mainWindow, { @@ -539,6 +542,10 @@ function closeAllWindows() { }); } +function getmainWindow() { + return mainWindow; +} + const gotTheLock = app.requestSingleInstanceLock(); if (!gotTheLock) { @@ -604,5 +611,7 @@ if (!gotTheLock) { }; } +export { getmainWindow }; + // In this file you can include the rest of your app's specific main process // code. You can also put them in separate files and require them here. diff --git a/src/renderer/src/assets/styles/global.css b/src/renderer/src/assets/styles/global.css index 4d28040..0aac38a 100644 --- a/src/renderer/src/assets/styles/global.css +++ b/src/renderer/src/assets/styles/global.css @@ -364,6 +364,7 @@ img { .login-select-popper { border: 1px solid var(--el-border-color-light) !important; box-shadow: var(--el-box-shadow-light) !important; + z-index: 9999 !important; .el-select-dropdown { background: #fff !important; diff --git a/src/renderer/src/router/index.ts b/src/renderer/src/router/index.ts index 1882f34..8e431dd 100644 --- a/src/renderer/src/router/index.ts +++ b/src/renderer/src/router/index.ts @@ -37,7 +37,7 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { // 去登录,放行 - if (to.path === '/') { + if (to.path === '/' || to.path === '/login') { next() } else { if (localStorage.getItem('Authorization')) { diff --git a/src/renderer/src/views/TS/components/eventParams.vue b/src/renderer/src/views/TS/components/eventParams.vue index b9e2aa4..c54d989 100644 --- a/src/renderer/src/views/TS/components/eventParams.vue +++ b/src/renderer/src/views/TS/components/eventParams.vue @@ -39,7 +39,7 @@ import {TsApi} from "../../../api/ts"; const times = ref(0) const numbers = ref(0) -const detail = ref({}) +const detail:any = ref({}) const eventBus: any = inject('bus') let eventObj:any = ref(null) diff --git a/src/renderer/src/views/author/index.vue b/src/renderer/src/views/author/index.vue index dc39d63..ff369f0 100644 --- a/src/renderer/src/views/author/index.vue +++ b/src/renderer/src/views/author/index.vue @@ -1,12 +1,9 @@