perf: remove unused codes related to minapp (#4444)
This commit is contained in:
parent
da49c3ddd3
commit
99b37f2782
@ -193,18 +193,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
|
|||||||
// fs
|
// fs
|
||||||
ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile)
|
ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile)
|
||||||
|
|
||||||
// minapp
|
|
||||||
ipcMain.handle(IpcChannel.Minapp, (_, args) => {
|
|
||||||
windowService.createMinappWindow({
|
|
||||||
url: args.url,
|
|
||||||
parent: mainWindow,
|
|
||||||
windowOptions: {
|
|
||||||
...mainWindow.getBounds(),
|
|
||||||
...args.windowOptions
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
// export
|
// export
|
||||||
ipcMain.handle(IpcChannel.Export_Word, exportService.exportToWord)
|
ipcMain.handle(IpcChannel.Export_Word, exportService.exportToWord)
|
||||||
|
|
||||||
|
|||||||
@ -83,36 +83,6 @@ export class WindowService {
|
|||||||
return this.mainWindow
|
return this.mainWindow
|
||||||
}
|
}
|
||||||
|
|
||||||
public createMinappWindow({
|
|
||||||
url,
|
|
||||||
parent,
|
|
||||||
windowOptions
|
|
||||||
}: {
|
|
||||||
url: string
|
|
||||||
parent?: BrowserWindow
|
|
||||||
windowOptions?: Electron.BrowserWindowConstructorOptions
|
|
||||||
}): BrowserWindow {
|
|
||||||
const width = windowOptions?.width || 1000
|
|
||||||
const height = windowOptions?.height || 680
|
|
||||||
|
|
||||||
const minappWindow = new BrowserWindow({
|
|
||||||
width,
|
|
||||||
height,
|
|
||||||
autoHideMenuBar: true,
|
|
||||||
title: 'Cherry Studio',
|
|
||||||
...windowOptions,
|
|
||||||
parent,
|
|
||||||
webPreferences: {
|
|
||||||
preload: join(__dirname, '../preload/minapp.js'),
|
|
||||||
sandbox: false,
|
|
||||||
contextIsolation: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
minappWindow.loadURL(url)
|
|
||||||
return minappWindow
|
|
||||||
}
|
|
||||||
|
|
||||||
private setupMainWindow(mainWindow: BrowserWindow, mainWindowState: any) {
|
private setupMainWindow(mainWindow: BrowserWindow, mainWindowState: any) {
|
||||||
mainWindowState.manage(mainWindow)
|
mainWindowState.manage(mainWindow)
|
||||||
|
|
||||||
|
|||||||
1
src/preload/index.d.ts
vendored
1
src/preload/index.d.ts
vendored
@ -29,7 +29,6 @@ declare global {
|
|||||||
setTrayOnClose: (isActive: boolean) => void
|
setTrayOnClose: (isActive: boolean) => void
|
||||||
restartTray: () => void
|
restartTray: () => void
|
||||||
setTheme: (theme: 'light' | 'dark') => void
|
setTheme: (theme: 'light' | 'dark') => void
|
||||||
minApp: (options: { url: string; windowOptions?: Electron.BrowserWindowConstructorOptions }) => void
|
|
||||||
reload: () => void
|
reload: () => void
|
||||||
clearCache: () => Promise<{ success: boolean; error?: string }>
|
clearCache: () => Promise<{ success: boolean; error?: string }>
|
||||||
system: {
|
system: {
|
||||||
|
|||||||
@ -20,7 +20,6 @@ const api = {
|
|||||||
restartTray: () => ipcRenderer.invoke(IpcChannel.App_RestartTray),
|
restartTray: () => ipcRenderer.invoke(IpcChannel.App_RestartTray),
|
||||||
setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
|
setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
|
||||||
openWebsite: (url: string) => ipcRenderer.invoke(IpcChannel.Open_Website, url),
|
openWebsite: (url: string) => ipcRenderer.invoke(IpcChannel.Open_Website, url),
|
||||||
minApp: (url: string) => ipcRenderer.invoke(IpcChannel.Minapp, url),
|
|
||||||
clearCache: () => ipcRenderer.invoke(IpcChannel.App_ClearCache),
|
clearCache: () => ipcRenderer.invoke(IpcChannel.App_ClearCache),
|
||||||
system: {
|
system: {
|
||||||
getDeviceType: () => ipcRenderer.invoke(IpcChannel.System_GetDeviceType)
|
getDeviceType: () => ipcRenderer.invoke(IpcChannel.System_GetDeviceType)
|
||||||
|
|||||||
@ -38,13 +38,6 @@ const WebviewContainer = memo(
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!webviewRef.current) return
|
if (!webviewRef.current) return
|
||||||
|
|
||||||
const handleNewWindow = (event: any) => {
|
|
||||||
event.preventDefault()
|
|
||||||
if (webviewRef.current?.loadURL) {
|
|
||||||
webviewRef.current.loadURL(event.url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleLoaded = () => {
|
const handleLoaded = () => {
|
||||||
onLoadedCallback(appid)
|
onLoadedCallback(appid)
|
||||||
}
|
}
|
||||||
@ -53,7 +46,6 @@ const WebviewContainer = memo(
|
|||||||
onNavigateCallback(appid, event.url)
|
onNavigateCallback(appid, event.url)
|
||||||
}
|
}
|
||||||
|
|
||||||
webviewRef.current.addEventListener('new-window', handleNewWindow)
|
|
||||||
webviewRef.current.addEventListener('did-finish-load', handleLoaded)
|
webviewRef.current.addEventListener('did-finish-load', handleLoaded)
|
||||||
webviewRef.current.addEventListener('did-navigate-in-page', handleNavigate)
|
webviewRef.current.addEventListener('did-navigate-in-page', handleNavigate)
|
||||||
|
|
||||||
@ -61,7 +53,6 @@ const WebviewContainer = memo(
|
|||||||
webviewRef.current.src = url
|
webviewRef.current.src = url
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
webviewRef.current?.removeEventListener('new-window', handleNewWindow)
|
|
||||||
webviewRef.current?.removeEventListener('did-finish-load', handleLoaded)
|
webviewRef.current?.removeEventListener('did-finish-load', handleLoaded)
|
||||||
webviewRef.current?.removeEventListener('did-navigate-in-page', handleNavigate)
|
webviewRef.current?.removeEventListener('did-navigate-in-page', handleNavigate)
|
||||||
}
|
}
|
||||||
@ -76,7 +67,6 @@ const WebviewContainer = memo(
|
|||||||
style={WebviewStyle}
|
style={WebviewStyle}
|
||||||
allowpopups={'true' as any}
|
allowpopups={'true' as any}
|
||||||
partition="persist:webview"
|
partition="persist:webview"
|
||||||
nodeintegration={'true' as any}
|
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user