From 0e12f5ce43427afeb9bf886477541512415a508c Mon Sep 17 00:00:00 2001 From: JINGYJ <1458671527@qq.com> Date: Thu, 3 Jul 2025 16:56:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20titleBar=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.ts | 3 +- src/main/frame/MainFrame.ts | 4 +- src/main/index.ts | 2 +- src/renderer/components.d.ts | 6 + .../src/assets/images/titleBar/logo.png | Bin 0 -> 3061 bytes .../src/views/Design/Controls/headCtrl.vue | 154 ++++++++++++++++-- tsconfig.json | 3 +- tsconfig.web.json | 3 + 8 files changed, 152 insertions(+), 23 deletions(-) create mode 100644 src/renderer/src/assets/images/titleBar/logo.png diff --git a/electron.vite.config.ts b/electron.vite.config.ts index d2ca4bf..9ee1f3e 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -25,7 +25,8 @@ export default defineConfig({ '@': resolve('src/renderer/src'), '@renderer': resolve('src/renderer/src'), '@views': resolve('src/renderer/src/views'), - '@router': resolve('src/renderer/src/router') + '@router': resolve('src/renderer/src/router'), + '@assets': resolve('src/renderer/src/assets') } }, plugins: [ diff --git a/src/main/frame/MainFrame.ts b/src/main/frame/MainFrame.ts index 6b4c067..2d9725d 100644 --- a/src/main/frame/MainFrame.ts +++ b/src/main/frame/MainFrame.ts @@ -12,8 +12,8 @@ import icon from '../../../resources/icon.png?asset' import { is } from '@electron-toolkit/utils' export default class MainFrame { #frame: any = null - #width = 3840 - #height = 2160 + #width = 1920 + #height = 1080 create() { this.#frame = new BrowserWindow({ width: this.#width, diff --git a/src/main/index.ts b/src/main/index.ts index b72a9a7..a9d2c3c 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -53,4 +53,4 @@ app.on('window-all-closed', () => { // code. You can also put them in separate files and require them here. app.commandLine.appendSwitch('high-dpi-support', '1') -app.commandLine.appendSwitch('force-device-scale-factor', '1') +// app.commandLine.appendSwitch('force-device-scale-factor', '1') diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 758935d..cf84bf0 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -9,6 +9,12 @@ export {} declare module 'vue' { export interface GlobalComponents { ElButton: typeof import('element-plus/es')['ElButton'] + ElDropdown: typeof import('element-plus/es')['ElDropdown'] + ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] + ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SvgIcon: typeof import('./src/components/SvgIcon/index.vue')['default'] diff --git a/src/renderer/src/assets/images/titleBar/logo.png b/src/renderer/src/assets/images/titleBar/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6f9a1fef14a9d80e55953375841291ae5e6be4d7 GIT binary patch literal 3061 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 + + + diff --git a/tsconfig.json b/tsconfig.json index 94cf7a0..520fe17 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,7 +21,8 @@ "@components": ["./src/renderer/src/components"], "@router": ["./src/renderer/src/router"], "@store": ["./src/renderer/src/store"], - "@utils": ["./src/renderer/src/utils"] + "@utils": ["./src/renderer/src/utils"], + "@assets": ["./src/renderer/src/assets"] } }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"] diff --git a/tsconfig.web.json b/tsconfig.web.json index 186ebc4..2badea0 100644 --- a/tsconfig.web.json +++ b/tsconfig.web.json @@ -30,6 +30,9 @@ ], "@utils": [ "./src/renderer/src/utils" + ], + "@assets": [ + "./src/renderer/src/assets" ] } }