Merge pull request #158 from zyk-mjzs/main

浏览器换成BaseWindow、WebContentsView

Author: umbrella22

src/ipc/channel.ts

@@ -118,15 +118,15 @@ export class IpcChannelRendererClass {
 
   SendDataTest: IpcRendererEventListener<unknown> = null
   BrowserViewTabDataUpdate: IpcRendererEventListener<{
-    bvWebContentsId: number
+    browserContentViewWebContentsId: number
     title: string
     url: string
     status: 1 | -1 // 1 添加/更新 -1 删除
   }> = null
   BrowserViewTabPositionXUpdate: IpcRendererEventListener<{
     dragTabOffsetX: number
     positionX: number
-    bvWebContentsId: number
+    browserContentViewWebContentsId: number
   }> = null
   BrowserTabMouseup: IpcRendererEventListener = null
   HotUpdateStatus: IpcRendererEventListener<{
@@ -148,7 +148,7 @@ export class IpcChannelBrowserClass {
     void,
     {
       positionX: number
-      bvWebContentsId: number
+      browserContentViewWebContentsId: number
       title: string
       url: string
     }
@@ -159,7 +159,7 @@ export class IpcChannelBrowserClass {
    */
   AddDefaultBrowserView: IpcMainEventListener<
     void,
-    { bvWebContentsId: number }
+    { browserContentViewWebContentsId: number }
   > = null
 
   /**
@@ -176,7 +176,7 @@ export class IpcChannelBrowserClass {
    * 浏览器标签跳转到指定 URL
    */
   BrowserDemoTabJumpToUrl: IpcMainEventListener<{
-    bvWebContentsId: number
+    browserContentViewWebContentsId: number
     url: string
   }> = null
 
@@ -195,7 +195,7 @@ export class IpcChannelBrowserClass {
     screenY: number
     startX: number
     startY: number
-    bvWebContentsId: number
+    browserContentViewWebContentsId: number
   }> = null
 
   /**

src/main/hooks/menu-hook.ts

@@ -43,7 +43,7 @@ const menu: Array<MenuItemConstructorOptions | MenuItem> = [
 ]
 
 export const useMenu = () => {
-  const creactMenu = () => {
+  const createMenu = () => {
     if (process.env.NODE_ENV === 'development') {
       menu.push({
         label: '开发者设置',
@@ -62,6 +62,6 @@ export const useMenu = () => {
     Menu.setApplicationMenu(menuTemplate)
   }
   return {
-    creactMenu,
+    createMenu,
   }
 }

src/main/index.ts

@@ -11,11 +11,11 @@ function onAppReady() {
   const { disableF12 } = useDisableButton()
   const { renderProcessGone } = useProcessException()
   const { defaultIpc } = useMainDefaultIpc()
-  const { creactMenu } = useMenu()
+  const { createMenu } = useMenu()
   disableF12()
   renderProcessGone()
   defaultIpc()
-  creactMenu()
+  createMenu()
   new InitWindow().initWindow()
   if (process.env.NODE_ENV === 'development') {
     const { VUEJS_DEVTOOLS } = require('electron-devtools-vendor')