From 85bc525c1191d65eee0aef0592bf6a2e47746244 Mon Sep 17 00:00:00 2001 From: nongyehong <2439646234@qq.com> Date: Fri, 13 Sep 2024 23:19:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(common):=20:bug:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=A8=A1=E5=9D=97=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复win下chatbot中输入框有边框的问题 --- CHANGELOG.md | 1 + src/components/rightBox/MsgInput.vue | 3 ++- src/enums/index.ts | 7 ++++--- src/layout/left/components/definePlugins/Card.vue | 2 ++ src/layout/left/components/definePlugins/List.vue | 2 ++ src/views/homeWindow/more/About.vue | 4 ++-- src/views/homeWindow/more/settings/config.ts | 2 +- src/views/homeWindow/robot/views/chatSettings/config.tsx | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0024a99..331ab23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * **component:** :bug: 修复windows上的样式问题 ([bb6a9d4](https://github.com/nongyehong/HuLa-IM-Tauri/commit/bb6a9d440db4777989d9a922a5135350e2dbf894)) * **component:** :bug: 修复系统托盘功能和一些样式问题 ([18277ef](https://github.com/nongyehong/HuLa-IM-Tauri/commit/18277ef0f1ce286b77b91dbc8c6ea8a628eba7d3)) +* **layout:** :bug: 修复ts类型错误导致打包出差问题 ([0d7f7e0](https://github.com/nongyehong/HuLa-IM-Tauri/commit/0d7f7e024d9404fe5fe6829504594a902c27c501)) * **style:** :bug: 统一修复svg点击时有轮廓问题 ([ce68fa1](https://github.com/nongyehong/HuLa-IM-Tauri/commit/ce68fa134368b34802d5b101a1f98a2493f7120b)) * **system:** :bug: 修复mac端右键菜单透明度问题 ([39d795f](https://github.com/nongyehong/HuLa-IM-Tauri/commit/39d795ff655afd699340d3021a0b471c3060b11c)) * **system:** :bug: 修复win下窗口高度不一致问题 ([30bb3de](https://github.com/nongyehong/HuLa-IM-Tauri/commit/30bb3de5d10ffea949c32b505f6501b3f7d0f573)) diff --git a/src/components/rightBox/MsgInput.vue b/src/components/rightBox/MsgInput.vue index 1640b62..bab0882 100644 --- a/src/components/rightBox/MsgInput.vue +++ b/src/components/rightBox/MsgInput.vue @@ -5,6 +5,7 @@
发送/ - {{ type() === 'macos' ? MacOsKeyEnum['⌘'] : WinKeyEnum.ctrl }} + {{ type() === 'macos' ? MacOsKeyEnum['⇧'] : WinKeyEnum.SHIFT }} 换行 diff --git a/src/enums/index.ts b/src/enums/index.ts index d8c0f1e..290e2a3 100644 --- a/src/enums/index.ts +++ b/src/enums/index.ts @@ -254,9 +254,10 @@ export enum MacOsKeyEnum { /** Windows键盘映射 */ export enum WinKeyEnum { - ctrl = 'Ctrl', - win = 'Win', - alt = 'Alt' + CTRL = 'Ctrl', + WIN = 'Win', + ALT = 'Alt', + SHIFT = 'Shift' } /** 插件状态 */ diff --git a/src/layout/left/components/definePlugins/Card.vue b/src/layout/left/components/definePlugins/Card.vue index 77aa94c..0eaa261 100644 --- a/src/layout/left/components/definePlugins/Card.vue +++ b/src/layout/left/components/definePlugins/Card.vue @@ -154,6 +154,7 @@ const handleState = (plugin: STO.Plugins) => { } else { clearInterval(interval) plugin.state = PluginEnum.INSTALLED + plugin.progress = 0 updatePlugins(plugin) } }, 500) @@ -165,6 +166,7 @@ const handleUnload = (plugin: STO.Plugins) => { handleDelete(plugin) plugin.isAdd = false plugin.state = PluginEnum.NOT_INSTALLED + plugin.progress = 0 updatePlugins(plugin) }, 2000) } diff --git a/src/layout/left/components/definePlugins/List.vue b/src/layout/left/components/definePlugins/List.vue index bddfd6f..6d46d04 100644 --- a/src/layout/left/components/definePlugins/List.vue +++ b/src/layout/left/components/definePlugins/List.vue @@ -151,6 +151,7 @@ const handleState = (plugin: STO.Plugins) => { } else { clearInterval(interval) plugin.state = PluginEnum.INSTALLED + plugin.progress = 0 updatePlugins(plugin) } }, 500) @@ -162,6 +163,7 @@ const handleUnload = (plugin: STO.Plugins) => { handleDelete(plugin) plugin.isAdd = false plugin.state = PluginEnum.NOT_INSTALLED + plugin.progress = 0 updatePlugins(plugin) }, 2000) } diff --git a/src/views/homeWindow/more/About.vue b/src/views/homeWindow/more/About.vue index 9b1b237..a6afec5 100644 --- a/src/views/homeWindow/more/About.vue +++ b/src/views/homeWindow/more/About.vue @@ -7,8 +7,8 @@
+ style="background: rgba(111, 111, 111, 0.1)" + class="w-170px h-113px absolute top-9% left-51% transform -translate-x-51% -translate-y-9%">
{ - return `${type() === 'windows' ? WinKeyEnum.ctrl : MacOsKeyEnum['⌘']}` + return `${type() === 'windows' ? WinKeyEnum.CTRL : MacOsKeyEnum['⌘']}` }) /** 侧边栏选项 */ const sideOptions = ref([ diff --git a/src/views/homeWindow/robot/views/chatSettings/config.tsx b/src/views/homeWindow/robot/views/chatSettings/config.tsx index c2ef2a7..ecfc596 100644 --- a/src/views/homeWindow/robot/views/chatSettings/config.tsx +++ b/src/views/homeWindow/robot/views/chatSettings/config.tsx @@ -6,7 +6,7 @@ import { type } from '@tauri-apps/plugin-os' import { MacOsKeyEnum, WinKeyEnum } from '@/enums' const key = computed(() => { - return `${type() === 'windows' ? WinKeyEnum.ctrl : MacOsKeyEnum['⌘']}` + return `${type() === 'windows' ? WinKeyEnum.CTRL : MacOsKeyEnum['⌘']}` }) type ConfigItemType = 'system' | 'record' | 'identity' | 'cueWords' | 'APIAddress' | 'model' | 'clear'