From a715099719ac62ca3dd62cbab72c340d50e7bac1 Mon Sep 17 00:00:00 2001 From: Hu Gang <18768366022@163.com> Date: Thu, 10 Apr 2025 10:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3linux=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/main/index.ts | 8 +- electron/main/window/tray.ts | 6 +- scripts/build-main.ts | 87 +++++++++++----------- src/views/dialogue/components/TitleBar.vue | 3 + src/views/dialogue/dialogueView.vue | 4 +- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/electron/main/index.ts b/electron/main/index.ts index 483f5d7..97872cc 100644 --- a/electron/main/index.ts +++ b/electron/main/index.ts @@ -22,8 +22,7 @@ interface ICacheConf { theme: 'system' | 'light' | 'dark'; } -const commonCacheConf: Partial = - getUserDefinedConf(commonCacheConfPath); +const commonCacheConf: Partial = {}; const osLocale = processZhLocale( (app.getPreferredSystemLanguages()?.[0] ?? 'en').toLowerCase(), @@ -59,8 +58,9 @@ app.on('activate', () => { async function onReady() { try { - const [, nlsConfig, themeConfig] = await Promise.all([ - mkdirpIgnoreError(cachePath), + await mkdirpIgnoreError(cachePath); + await getUserDefinedConf(commonCacheConfPath); + const [nlsConfig, themeConfig] = await Promise.all([ resolveNlsConfiguration(), resolveThemeConfiguration(), ]); diff --git a/electron/main/window/tray.ts b/electron/main/window/tray.ts index 7a24800..65c2aae 100644 --- a/electron/main/window/tray.ts +++ b/electron/main/window/tray.ts @@ -23,9 +23,9 @@ export function createTray(): Tray { }, ]; const iconPath = - process.platform === 'darwin' - ? path.join(__dirname, '../favicon.ico') - : path.join(__dirname, '../app_favicon.ico'); + process.platform === 'win32' + ? path.join(__dirname, '../app_favicon.ico') + : path.join(__dirname, '../favicon.ico'); appTray = new Tray(iconPath); const contextMenu = Menu.buildFromTemplate(trayMenus); appTray.setToolTip('EulerCopilot'); diff --git a/scripts/build-main.ts b/scripts/build-main.ts index 651d92e..3104d9f 100644 --- a/scripts/build-main.ts +++ b/scripts/build-main.ts @@ -1,59 +1,58 @@ -import path from 'node:path' -import chalk from 'chalk' -import ora from 'ora' -import minimist from 'minimist' -import electron from 'electron' -import { rollup, watch } from 'rollup' -import { getEnv, waitOn } from './utils' -import options from './rollup.config' -import { spawn } from 'node:child_process' -import { main } from '../package.json' +import path from 'node:path'; +import chalk from 'chalk'; +import ora from 'ora'; +import minimist from 'minimist'; +import electron from 'electron'; +import { rollup, watch } from 'rollup'; +import { getEnv, waitOn } from './utils'; +import options from './rollup.config'; +import { spawn } from 'node:child_process'; +import { main } from '../package.json'; -import type { OutputOptions } from 'rollup' -import type { ChildProcess } from 'child_process' +import type { OutputOptions } from 'rollup'; +import type { ChildProcess } from 'child_process'; -const TAG = '[build-main.ts]' +const TAG = '[build-main.ts]'; -const env = getEnv() -const argv = minimist(process.argv.slice(2)) -const opt = options({ proc: 'main', env: argv.env }) -const spinner = ora(`${TAG} Electron main build...`) +const env = getEnv(); +const argv = minimist(process.argv.slice(2)); +const opt = options({ proc: 'main', env: argv.env }); +const spinner = ora(`${TAG} Electron main build...`); -;(async () => { +(async () => { if (argv.watch) { // Wait on vite server launched - await waitOn({ port: env.PORT as string }) + await waitOn({ port: env.PORT as string }); - const watcher = watch(opt) - let child: ChildProcess + const watcher = watch(opt); + let child: ChildProcess; watcher.on('change', (filename) => { - const log = chalk.green(`change -- ${filename}`) - console.log(TAG, log) - }) + const log = chalk.green(`change -- ${filename}`); + console.log(TAG, log); + }); watcher.on('event', (ev) => { if (ev.code === 'END') { - if (child) child.kill() - child = spawn(electron as unknown as string, [path.join(__dirname, `../${main}`)], { + if (child) child.kill(); + const entryPath = path.join(__dirname, `../${main}`); + const argv = [entryPath, '--no-sandbox']; + child = spawn(electron as unknown as string, argv, { stdio: 'inherit', - }) + }); + } else if (ev.code === 'ERROR') { + console.log(ev.error); } - else if (ev.code === 'ERROR') { - console.log(ev.error) - } - }) - } - else { - spinner.start() + }); + } else { + spinner.start(); try { - const build = await rollup(opt) - await build.write(opt.output as OutputOptions) - spinner.succeed() - process.exit() - } - catch (error) { - console.log(`\n${TAG} ${chalk.red('构建报错')}\n`, error, '\n') - spinner.fail() - process.exit(1) + const build = await rollup(opt); + await build.write(opt.output as OutputOptions); + spinner.succeed(); + process.exit(); + } catch (error) { + console.log(`\n${TAG} ${chalk.red('构建报错')}\n`, error, '\n'); + spinner.fail(); + process.exit(1); } } -})() +})(); diff --git a/src/views/dialogue/components/TitleBar.vue b/src/views/dialogue/components/TitleBar.vue index 61d81d9..470e4ca 100644 --- a/src/views/dialogue/components/TitleBar.vue +++ b/src/views/dialogue/components/TitleBar.vue @@ -70,6 +70,9 @@ const headerStyles = computed(() => { styles.paddingLeft = 'calc(50% - 60px)'; } else if (platform === 'win32') { styles.paddingRight = '145px'; + } else if (platform === 'linux') { + styles.paddingRight = '110px'; + styles.paddingLeft = 'calc(50% - 60px)'; } } return styles; diff --git a/src/views/dialogue/dialogueView.vue b/src/views/dialogue/dialogueView.vue index a7797c1..a290856 100644 --- a/src/views/dialogue/dialogueView.vue +++ b/src/views/dialogue/dialogueView.vue @@ -16,12 +16,12 @@ import { reactive } from 'vue'; import { useRouter } from 'vue-router'; import CopilotIcon from '@/assets/images/routerCopilot.png'; import CopilotIconSelected from '@/assets/images/routerCopilotSelected.png'; -import WitchainDIcon from '@/assets/images/witChainD.png'; +import WitchainDIcon from '@/assets/images/witchainD.png'; import ApiIcon from '@/assets/images/routerApi.png'; import ApiIconSelected from '@/assets/svgs/routerApiSelected.svg'; import AppIcon from '@/assets/images/routerApp.png'; import AppIconSelected from '@/assets/svgs/routerAppSelected.svg'; -import WitchainDIconSelected from '@/assets/svgs/witChainDSelected.svg'; +import WitchainDIconSelected from '@/assets/svgs/WitchainDSelected.svg'; import tools from '../tools/index.vue'; import TitleBar from './components/TitleBar.vue'; -- Gitee