Skip to content

Commit

Permalink
fix(common): 🐛 修复插件下载模块进度问题
Browse files Browse the repository at this point in the history
修复win下chatbot中输入框有边框的问题
  • Loading branch information
nongyehong committed Sep 13, 2024
1 parent 0d7f7e0 commit 85bc525
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 2 additions & 1 deletion src/components/rightBox/MsgInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<div
id="message-input"
ref="messageInputDom"
style="outline: none"
contenteditable
spellcheck="false"
@paste="handlePaste($event, messageInputDom)"
Expand Down Expand Up @@ -91,7 +92,7 @@
<svg class="size-12px"><use href="#Enter"></use></svg>
发送/
<n-flex align="center" :size="0">
{{ type() === 'macos' ? MacOsKeyEnum[''] : WinKeyEnum.ctrl }}
{{ type() === 'macos' ? MacOsKeyEnum[''] : WinKeyEnum.SHIFT }}
<svg class="size-12px"><use href="#Enter"></use></svg>
</n-flex>
换行
Expand Down
7 changes: 4 additions & 3 deletions src/enums/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

/** 插件状态 */
Expand Down
2 changes: 2 additions & 0 deletions src/layout/left/components/definePlugins/Card.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const handleState = (plugin: STO.Plugins<PluginEnum>) => {
} else {
clearInterval(interval)
plugin.state = PluginEnum.INSTALLED
plugin.progress = 0
updatePlugins(plugin)
}
}, 500)
Expand All @@ -165,6 +166,7 @@ const handleUnload = (plugin: STO.Plugins<PluginEnum>) => {
handleDelete(plugin)
plugin.isAdd = false
plugin.state = PluginEnum.NOT_INSTALLED
plugin.progress = 0
updatePlugins(plugin)
}, 2000)
}
Expand Down
2 changes: 2 additions & 0 deletions src/layout/left/components/definePlugins/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ const handleState = (plugin: STO.Plugins<PluginEnum>) => {
} else {
clearInterval(interval)
plugin.state = PluginEnum.INSTALLED
plugin.progress = 0
updatePlugins(plugin)
}
}, 500)
Expand All @@ -162,6 +163,7 @@ const handleUnload = (plugin: STO.Plugins<PluginEnum>) => {
handleDelete(plugin)
plugin.isAdd = false
plugin.state = PluginEnum.NOT_INSTALLED
plugin.progress = 0
updatePlugins(plugin)
}, 2000)
}
Expand Down
4 changes: 2 additions & 2 deletions src/views/homeWindow/more/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<div id="computer" class="computer">
<img class="w-224px h-158px relative" src="@/assets/img/win.png" alt="" />
<div
style="background: rgba(80, 80, 80, 0.1)"
class="w-170px h-113px backdrop-blur-0 absolute top-9% left-51% transform -translate-x-51% -translate-y-9%"></div>
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%"></div>
<img
class="drop-shadow-md absolute top-30% left-1/2 transform -translate-x-1/2 -translate-y-30% w-140px h-60px"
src="@/assets/logo/hula.png"
Expand Down
2 changes: 1 addition & 1 deletion src/views/homeWindow/more/settings/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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['⌘']}`
})
/** 侧边栏选项 */
const sideOptions = ref<OPT.L.SettingSide[]>([
Expand Down
2 changes: 1 addition & 1 deletion src/views/homeWindow/robot/views/chatSettings/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 85bc525

Please sign in to comment.