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 0000000..6f9a1fe Binary files /dev/null and b/src/renderer/src/assets/images/titleBar/logo.png differ diff --git a/src/renderer/src/views/Design/Controls/headCtrl.vue b/src/renderer/src/views/Design/Controls/headCtrl.vue index 3ff8491..3649326 100644 --- a/src/renderer/src/views/Design/Controls/headCtrl.vue +++ b/src/renderer/src/views/Design/Controls/headCtrl.vue @@ -1,21 +1,139 @@ - + + + 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" ] } }