|
|
@@ -42,12 +42,19 @@ class UtilsController extends Controller {
|
|
|
|
|
|
async openMain (config) {
|
|
|
|
|
|
+ const { id, url } = config;
|
|
|
|
|
|
- if( this.app.electron[config.id]){
|
|
|
- this.app.electron[config.id].focus();
|
|
|
- this.app.electron[config.id].show();
|
|
|
+ if (this.app.electron[id]) {
|
|
|
+ const win = this.app.electron[id];
|
|
|
+
|
|
|
+ // 切换到指定的 URL
|
|
|
+ if(id === 'generate') await win.loadURL(url);
|
|
|
+
|
|
|
+ win.focus();
|
|
|
+ win.show();
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
const win = new BrowserWindow({
|
|
|
...config,
|
|
|
|
|
|
@@ -59,7 +66,7 @@ class UtilsController extends Controller {
|
|
|
|
|
|
},
|
|
|
});
|
|
|
- win.loadURL(config.url); // 设置窗口的 URL
|
|
|
+ await win.loadURL(config.url); // 设置窗口的 URL
|
|
|
// 监听窗口关闭事件
|
|
|
if(this.app?.env === 'development') win.webContents.openDevTools(config.openDevTools)
|
|
|
//
|