This commit is contained in:
2025-05-27 12:20:09 +08:00
parent 5dacb966b0
commit 4097ed47f8
8 changed files with 162 additions and 138 deletions

View File

@@ -1,5 +1,5 @@
import { BrowserWindow } from 'electron';
import path from 'node:path';
export const createTransWindow = () => {
const window = new BrowserWindow({
width: 800,
@@ -7,9 +7,23 @@ export const createTransWindow = () => {
transparent: true,
frame: false,
});
window.loadURL('https://www.baidu.com');
window.loadURL(process?.env?.ASSISTANT_HOME ?? 'https://kevisual.silkyai.cn/root/talkshow-admin/');
setTimeout(() => {
window.setPosition(0, 0, true);
}, 1000);
return window;
};
export const createDemoWinodw = (window?: BrowserWindow, opts?: any) => {
if (window) return window;
return new BrowserWindow({
width: 800,
height: 600,
...opts,
webPreferences: {
preload: path.join(__dirname, 'preload.js'), // 如果有 preload 脚本
webSecurity: false,
...opts?.webPreferences,
},
});
};

View File

@@ -8,8 +8,8 @@ import { getLogPath, log } from './app.ts';
import { checkShowPage } from './window/page/index.ts';
import { closeProcess, createProcess } from './process/index.ts';
import { getElectronResourcePath, isMac } from './system/env.ts';
import { checkForUpdates } from './updater/index.ts';
import { createTransWindow } from './browsers/trans.ts';
// import { checkForUpdates } from './updater/index.ts';
import { createTransWindow, createDemoWinodw } from './browsers/trans.ts';
// @ts-ignore
const __filename = fileURLToPath(import.meta.url);
@@ -22,19 +22,9 @@ async function createWindow() {
log.info('resourcePath', resourcePath);
log.info('createWindow');
log.info('path', getLogPath());
const _session = createSession();
// mainWindow = new BrowserWindow({
// width: 800,
// height: 600,
// webPreferences: {
// preload: path.join(__dirname, 'preload.js'), // 如果有 preload 脚本
// session: _session,
// webSecurity: false,
// },
// });
loadMenu();
// await checkShowPage(mainWindow);
let transWindow = createTransWindow();
let transWindow = createDemoWinodw();
transWindow.on('closed', () => {
transWindow = null;
});
@@ -46,9 +36,9 @@ async function createWindow() {
app.on('ready', async () => {
// await createProcess();
createWindow();
if (!isMac()) {
checkForUpdates();
}
// if (!isMac()) {
// checkForUpdates();
// }
});
app.on('window-all-closed', () => {

View File

@@ -33,53 +33,53 @@ export const loadMenu = () => {
// },
],
},
{
label: '打开应用',
submenu: [
{
label: '首页',
click: () => {
// 获取当前window
const mainWindow = BrowserWindow.getFocusedWindow();
if (mainWindow) {
checkShowPage(mainWindow);
}
},
},
{
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 () => {
createEnterPage();
},
},
{
label: '打开应用市场',
click: async () => {
createAppPackagesPage();
},
},
],
},
// {
// label: '打开应用',
// submenu: [
// {
// label: '首页',
// click: () => {
// // 获取当前window
// const mainWindow = BrowserWindow.getFocusedWindow();
// if (mainWindow) {
// checkShowPage(mainWindow);
// }
// },
// },
// {
// 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 () => {
// createEnterPage();
// },
// },
// {
// label: '打开应用市场',
// click: async () => {
// createAppPackagesPage();
// },
// },
// ],
// },
{
label: '编辑',
submenu: [