diff --git a/.gitignore b/.gitignore index 9ba3476..7c1d290 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ dist app-dist build .DS_Store + +src/**/dist/** diff --git a/src/main/menu/index.ts b/src/main/menu/index.ts index be7cde8..827be8e 100644 --- a/src/main/menu/index.ts +++ b/src/main/menu/index.ts @@ -46,6 +46,26 @@ export const loadMenu = () => { } }, }, + { + label: 'note', + click: () => { + // 获取当前window + const mainWindow = BrowserWindow.getFocusedWindow(); + if (mainWindow) { + checkShowPage(mainWindow, '/web/note'); + } + }, + }, + { + label: 'root-center', + click: () => { + // 获取当前window + const mainWindow = BrowserWindow.getFocusedWindow(); + if (mainWindow) { + checkShowPage(mainWindow, '/root/center'); + } + }, + }, { label: '打开配置', click: async () => { diff --git a/src/main/process/index.ts b/src/main/process/index.ts index 39463b8..50bc65b 100644 --- a/src/main/process/index.ts +++ b/src/main/process/index.ts @@ -61,6 +61,9 @@ export const createProcess = async () => { if (msg.type === 'fork') { resolve({ process: assistantProcess, port: msg.data?.port || processConfig.port }); } + if (msg.type === 'reload') { + restartProcess(); + } } }); assistantProcess.on('error', (error) => { @@ -75,7 +78,9 @@ export const createProcess = async () => { } }); }; - +export const restartProcess = async () => { + await createProcess(); +}; export const closeProcess = () => { log.info('closeProcess'); removeProcessPid(); diff --git a/src/main/window/page/index.ts b/src/main/window/page/index.ts index 496c829..fca0bbb 100644 --- a/src/main/window/page/index.ts +++ b/src/main/window/page/index.ts @@ -5,7 +5,13 @@ import { BrowserWindow } from 'electron'; import { getOrigin } from '@/main/process/index.ts'; import { createWinodw } from './create-window.ts'; -export const checkShowPage = async (window?: BrowserWindow) => { +/** + * + * @param window + * @param openUrl /web/note + * @returns + */ +export const checkShowPage = async (window?: BrowserWindow, openUrl?: string) => { const assistantConfig = getCacheAssistantConfig(); const { pageApi, proxy, loadURL } = assistantConfig; if (!pageApi) { @@ -16,6 +22,11 @@ export const checkShowPage = async (window?: BrowserWindow) => { } window = createWinodw(window); let defaultURL = getOrigin() + '/web/note/'; + if (openUrl) { + defaultURL = getOrigin() + openUrl; + window?.loadURL(defaultURL); + return window; + } if (loadURL) { const url = new URL(loadURL, getOrigin()); const urls = url.pathname.split('/'); diff --git a/src/modules/config/process-pid.ts b/src/modules/config/process-pid.ts index 51b18c2..ea754e0 100644 --- a/src/modules/config/process-pid.ts +++ b/src/modules/config/process-pid.ts @@ -23,7 +23,6 @@ export const removeProcessPid = () => { process.kill(parseInt(pid)); fs.unlinkSync(processPidPath); } catch (error) { - console.error(error); } } }; diff --git a/src/renderer/assistant-center/package.json b/src/renderer/assistant-center/package.json index 9bf460d..cb5f2ef 100644 --- a/src/renderer/assistant-center/package.json +++ b/src/renderer/assistant-center/package.json @@ -1,6 +1,6 @@ { "name": "assistant-center", - "version": "0.0.1", + "version": "0.0.2", "description": "", "main": "index.js", "app": { diff --git a/src/renderer/assistant-center/root/assistant-base-app/assets/Enter-BnWSbQup.js b/src/renderer/assistant-center/root/assistant-base-app/assets/Enter-BnWSbQup.js deleted file mode 100644 index 70ebb34..0000000 --- a/src/renderer/assistant-center/root/assistant-base-app/assets/Enter-BnWSbQup.js +++ /dev/null @@ -1,9 +0,0 @@ -import{u as h,r as o,j as e}from"./index-OAiiq-Mf.js";const m=()=>{const{config:s,getConfig:l,saveConfig:r}=h();o.useEffect(()=>{c(),l()},[]),o.useEffect(()=>{if(s.pageApi){const a=document.getElementById("pageApi");a.value=s.pageApi}},[s]);const c=()=>{const a=document.getElementById("particles"),p=20;if(a)for(let i=0;i
-