diff --git a/src/main/services/windowManager.js b/src/main/services/windowManager.js index e71028e..27cfd3b 100644 --- a/src/main/services/windowManager.js +++ b/src/main/services/windowManager.js @@ -133,7 +133,10 @@ function initTrayIcon () { const menu = Menu.buildFromTemplate(menuconfig) tray.setContextMenu(menu) tray.on('click', () => { - app.show() + if (!mainWindow.isVisible()) { + mainWindow.show() + } + mainWindow.webContents.send("to-notice") }) } let trayTimer = null; diff --git a/src/renderer/App.vue b/src/renderer/App.vue index c9f9d41..8843ec8 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -11,11 +11,18 @@ import CHeader from "./components/title"; import { useNoticeStore } from "@/store/notice"; import { onUnmounted } from "vue"; +import { ipcRenderer } from "electron" +import { useRouter } from "@/hooks/use-router" +const $router = useRouter() const noticeStore = useNoticeStore() noticeStore.startNoticeTimer() +ipcRenderer.on("to-notice",_ => { + $router.push("/notice/index") +}) onUnmounted(() => { noticeStore.destroyNoticeTimer() + ipcRenderer.removeListener("to-notice") }) diff --git a/src/renderer/components/ScrollBar/index.vue b/src/renderer/components/ScrollBar/index.vue index dc32f5c..f51fa2e 100644 --- a/src/renderer/components/ScrollBar/index.vue +++ b/src/renderer/components/ScrollBar/index.vue @@ -51,7 +51,7 @@ export default { background-color: $menuBg; .scroll-wrapper { position: absolute; - width: 100%!important; + width: 100%!important; } } diff --git a/src/renderer/icons/svg/addressBook.svg b/src/renderer/icons/svg/addressBook.svg index 91e9ca5..f75345f 100644 --- a/src/renderer/icons/svg/addressBook.svg +++ b/src/renderer/icons/svg/addressBook.svg @@ -1 +1 @@ - + diff --git a/src/renderer/icons/svg/book.svg b/src/renderer/icons/svg/book.svg index d03dab6..ac94620 100644 --- a/src/renderer/icons/svg/book.svg +++ b/src/renderer/icons/svg/book.svg @@ -1 +1 @@ - + diff --git a/src/renderer/icons/svg/notice.svg b/src/renderer/icons/svg/notice.svg index 7d8b947..b57938e 100644 --- a/src/renderer/icons/svg/notice.svg +++ b/src/renderer/icons/svg/notice.svg @@ -1,2 +1,2 @@ - + diff --git a/src/renderer/icons/svg/oa.svg b/src/renderer/icons/svg/oa.svg index 643840d..b07916a 100644 --- a/src/renderer/icons/svg/oa.svg +++ b/src/renderer/icons/svg/oa.svg @@ -1 +1 @@ - + diff --git a/src/renderer/layout/components/Sidebar/SidebarItem.vue b/src/renderer/layout/components/Sidebar/SidebarItem.vue index af2e37b..2ce80b1 100644 --- a/src/renderer/layout/components/Sidebar/SidebarItem.vue +++ b/src/renderer/layout/components/Sidebar/SidebarItem.vue @@ -109,11 +109,20 @@ const noticeStore = useNoticeStore();