diff --git a/resources/startUp/startUp.html b/resources/startUp/startUp.html index 98e6e60..147e72a 100644 --- a/resources/startUp/startUp.html +++ b/resources/startUp/startUp.html @@ -256,7 +256,7 @@ clearInterval(interval); } updateProgress(progress); - }, 100); // 保持100毫秒的间隔 + }, 125); // 保持100毫秒的间隔 }, 100); // 初始延迟500毫秒 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/public/startUp/startUp.html b/src/renderer/public/startUp/startUp.html index fa24297..d0f08ce 100644 --- a/src/renderer/public/startUp/startUp.html +++ b/src/renderer/public/startUp/startUp.html @@ -255,7 +255,7 @@ clearInterval(interval); } updateProgress(progress); - }, 100); // 保持100毫秒的间隔 + }, 150); // 保持100毫秒的间隔 }, 100); // 初始延迟500毫秒 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 @@