From 6ec477a19cfb69af4e1aa272bf020d0ec0aa18b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=86=E5=95=A6=E5=A5=BD=E6=A2=A6?= <530353222@qq.com>
Date: Thu, 11 May 2023 19:59:03 +0800
Subject: [PATCH] demo

---
 electron/controller/hardware.js             |  4 ++--
 electron/controller/os.js                   |  1 +
 electron/service/os.js                      |  6 +++---
 frontend/src/config/router.config.js        | 19 ++++++++++++++++++-
 frontend/src/views/framework/socket/Ipc.vue |  4 ++--
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/electron/controller/hardware.js b/electron/controller/hardware.js
index 5909356..e54bb43 100644
--- a/electron/controller/hardware.js
+++ b/electron/controller/hardware.js
@@ -3,7 +3,7 @@
 const { Controller } = require('ee-core');
 const path = require('path');
 const Ps = require('ee-core/ps');
-const { mainWindow } = require('ee-core/electron');
+const Electron = require('ee-core/electron');
 
 /**
  * 硬件设备 - 功能demo
@@ -21,7 +21,7 @@ class HardwareController extends Controller {
   getPrinterList () {
 
     //主线程获取打印机列表
-    const list = mainWindow.webContents.getPrinters();
+    const list = Electron.mainWindow.webContents.getPrinters();
 
     return list;
   }  
diff --git a/electron/controller/os.js b/electron/controller/os.js
index 7c9c28e..142e478 100644
--- a/electron/controller/os.js
+++ b/electron/controller/os.js
@@ -138,6 +138,7 @@ class OsController extends Controller {
       // some
     }
 
+    console.log('contentUrl: ', contentUrl);
     const addonWindow = this.app.addon.window;
     let opt = {
       title: windowTitle
diff --git a/electron/service/os.js b/electron/service/os.js
index b6b2d19..a275c97 100644
--- a/electron/service/os.js
+++ b/electron/service/os.js
@@ -2,7 +2,7 @@
 
 const { Service } = require('ee-core');
 const { BrowserView, Notification } = require('electron');
-const { mainWindow } = require('ee-core/electron');
+const Electron = require('ee-core/electron');
 
 /**
  * os（service层为单例）
@@ -23,7 +23,7 @@ class OsService extends Service {
 
     // electron 实验性功能，慎用
     this.myBrowserView = new BrowserView();
-    mainWindow.setBrowserView(this.myBrowserView);
+    Electron.mainWindow.setBrowserView(this.myBrowserView);
     myBrowserView.setBounds({
       x: 300,
       y: 170,
@@ -39,7 +39,7 @@ class OsService extends Service {
   removeBrowserView() {
 
     // removeBrowserView移除视图后，进程依然存在，估计是electron bug
-    mainWindow.removeBrowserView(this.myBrowserView);
+    Electron.mainWindow.removeBrowserView(this.myBrowserView);
   }
 
   /**
diff --git a/frontend/src/config/router.config.js b/frontend/src/config/router.config.js
index bde63e8..343acaf 100644
--- a/frontend/src/config/router.config.js
+++ b/frontend/src/config/router.config.js
@@ -4,6 +4,11 @@
  */
 import {AppSider, Menu} from '@/layouts'
 
+const RouteView = {
+  name: 'RouteView',
+  render: h => h('router-view')
+}
+
 export const constantRouterMap = [
   {
     path: '/',
@@ -144,7 +149,19 @@ export const constantRouterMap = [
             component: () => import('@/views/effect/video/Index')
           },
         ]  
-      }  
+      },
+    ]
+  },
+  {
+    path: '/special',
+    component: RouteView,
+    //redirect: '/special/subwindow',
+    children: [
+      {
+        path: 'subwindow',
+        name: 'SpecialSubwindowIpc',
+        component: () => import('@/views/os/subwindow/Ipc')
+      }
     ]
   },
 ]
diff --git a/frontend/src/views/framework/socket/Ipc.vue b/frontend/src/views/framework/socket/Ipc.vue
index b0bc6da..94c7440 100644
--- a/frontend/src/views/framework/socket/Ipc.vue
+++ b/frontend/src/views/framework/socket/Ipc.vue
@@ -68,8 +68,8 @@ export default {
         {
           type: 'vue',
           content: '/#/special/subwindow',
-          windowName: 'window-1',
-          windowTitle: 'new window'
+          windowName: 'window-ipc',
+          windowTitle: 'ipc window'
         },    
       ],
     }