test/HuLa
1
0
Fork 0
mirror of https://gitee.com/HuLaSpark/HuLa.git synced 2024-12-01 19:28:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!24 更新到master分支

Browse Source 
Merge pull request !24 from nongyehong/dev
This commit is contained in:
nongyehong 2024-09-26 02:50:12 +00:00 committed by Gitee
commit 725b15cb41
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 68 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/rightBox/chatBox/ChatFooter.vue
View File

@ -1,7 +1,6 @@
<template>
<!-- 底部栏 -->
<main
class="size-full relative z-10 bg-transparent backdrop-blur-2xl border-t-(1px solid [--line-color]) color-[--icon-color]">
<main class="size-full relative z-10 border-t-(1px solid [--right-chat-footer-line-color]) color-[--icon-color]">
<!-- 输入框顶部选项栏 -->
<n-flex align="center" justify="space-between" class="p-[10px_22px_5px] select-none">
<n-flex align="center" :size="0" class="input-options">

4
src/components/rightBox/chatBox/ChatMain.vue
View File

@ -31,9 +31,7 @@
{ 'active-reply': activeReply === item.message.id }
]">
<!-- 信息间隔时间 -->
<span
class="text-(12px #909090) select-none bg-[--time-color] p-4px rounded-6px custom-shadow"
v-if="item.timeBlock">
<span class="text-(12px #909090) select-none p-4px" v-if="item.timeBlock">
{{ item.timeBlock }}
</span>
<!-- 消息为撤回消息 -->

8
src/layout/left/model.tsx
View File

@ -113,7 +113,7 @@ export const LockScreen = defineComponent(() => {
*/
export const CheckUpdate = defineComponent(() => {
const url = ref(
`https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/releases/tags/v${pkg.version}?access_token=${import.meta.env.VITE_GITEE_TOKEN}`
`https://gitee.com/api/v5/repos/HuLaSpark/HuLa-IM-Tauri/releases/tags/v${pkg.version}?access_token=${import.meta.env.VITE_GITEE_TOKEN}`
)
/** 项目提交日志记录 */
const commitLog = ref<{ message: string; icon: string }[]>([])
@ -204,7 +204,7 @@ export const CheckUpdate = defineComponent(() => {
}
const checkUpdate = () => {
const url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=desc&page=1&per_page=1`
const url = `https://gitee.com/api/v5/repos/HuLaSpark/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=desc&page=1&per_page=1`
if (lastVersion && lastVersion === `v${pkg.version}`) {
window.$message.success('当前已是最新版本')
return
@ -222,7 +222,7 @@ export const CheckUpdate = defineComponent(() => {
}, 600)
} else {
setTimeout(() => {
let url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=asc&page=1`
let url = `https://gitee.com/api/v5/repos/HuLaSpark/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=asc&page=1`
fetch(url).then((res) => {
res.json().then(async (data) => {
const allVersion = [] as number[]
@ -231,7 +231,7 @@ export const CheckUpdate = defineComponent(() => {
allVersion.push(Number(item.name.slice(1, 4)))
})
newVersion.value = `v${Math.max(...allVersion)}.0`
url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/releases/tags/${newVersion.value}?access_token=${import.meta.env.VITE_GITEE_TOKEN}`
url = `https://gitee.com/api/v5/repos/HuLaSpark/HuLa-IM-Tauri/releases/tags/${newVersion.value}?access_token=${import.meta.env.VITE_GITEE_TOKEN}`
getCommitLog(url, true)
text.value = '立即更新'
checkLoading.value = false

4
src/styles/scss/chat-main.scss
View File

@ -58,7 +58,7 @@
}
/** 回复气泡的样式 */
.reply-bubble {
@apply text-12px text-[--reply-color] bg-[--bg-reply-bubble] rounded-8px p-4px cursor-pointer select-none;
@apply text-12px text-[--reply-color] bg-[--right-chat-reply-color] rounded-8px p-4px cursor-pointer select-none;
svg,
span {
transition: color 0.4s ease-in-out;
@ -85,7 +85,7 @@
}
/** 跳转到回复内容时候显示的样式 */
.active-reply {
background-color: var(--bg-reply-active);
background-color: var(--right-chat-reply-active-color);
border-radius: 8px;
margin: 0 8px;
transition: all 0.4s ease-in-out;

2
src/styles/scss/chat-sidebar.scss
View File

@ -8,7 +8,7 @@
border-radius: 6px;
&:hover {
cursor: pointer;
background-color: var(--bg-group-hover);
background-color: var(--list-hover-color);
}
}
&:hover {

12
src/styles/scss/global/variable.scss
View File

@ -50,7 +50,7 @@ html, body, svg {
--disabled-color: #c1c1c1;
// 气泡背景颜色
--bg-bubble: rgb(253, 253, 253);
--bg-bubble-active: #dedede;
--bg-bubble-active: #f1f1f1;
// 头像状态的背景颜色
--bg-avatar: rgba(241, 241, 241, 1);
// 个人信息框背景颜色
@ -59,16 +59,12 @@ html, body, svg {
// 系统托盘hover样式
--tray-hover: #eee;
--tray-hover-e: #f5dce1;
// 群聊列表hover颜色
--bg-group-hover: #e3e3e3;
// 信息框背景颜色
--bg-info: rgba(255, 255, 255, 0.8);
// 表情框样式
--bg-emoji: rgba(255, 255, 255, 0.6);
--emoji-hover: #e3e3e3;
// 回复消息样式
--bg-reply-active: #e3e3e3;
--bg-reply-bubble: #d3d3d3;
--reply-color: #909090;
--reply-hover: #505050;
--bg-reply-img-count: #e3e3e3;
@ -128,7 +124,7 @@ html[data-theme='dark'] {
--disabled-color: #575757;
// 气泡背景颜色
--bg-bubble: rgb(38, 38, 38);
--bg-bubble-active: #202020;
--bg-bubble-active: rgba(66, 66, 66, 0.8);
// 头像状态的背景颜色
--bg-avatar: rgba(22, 22, 22, 1);
// 个人信息框背景颜色
@ -137,16 +133,12 @@ html[data-theme='dark'] {
// 系统托盘hover样式
--tray-hover: #3b3b3b;
--tray-hover-e: #bb8188;
// 群聊列表hover颜色
--bg-group-hover: #3f3f3f;
// 信息框背景颜色
--bg-info: rgba(27, 27, 27, 0.8);
// 表情框样式
--bg-emoji: rgba(27, 27, 27, 0.8);
--emoji-hover: #3b3b3b;
// 回复消息样式
--bg-reply-active: #3b3b3b;
--bg-reply-bubble: #505050;
--reply-color: #e3e3e3;
--reply-hover: #b1b1b1;
--bg-reply-img-count: #505050;

2
src/styles/scss/message.scss
View File

@ -19,7 +19,7 @@
}
.active {
background: var(--bg-active-msg);
background: var(--msg-active-color);
border-radius: 12px;
color: #fff;
.text {

2
src/styles/scss/msg-input.scss
View File

@ -23,5 +23,5 @@
}
}
.active {
background-color: var(--bg-group-hover);
background-color: var(--list-hover-color);
}

32
src/styles/scss/theme/default.scss
View File

@ -15,7 +15,18 @@
--border-active-color: #64a29c;
// 右边布局内容背景
--right-theme-bg-color: radial-gradient(circle at top left, #ffd1ff4c 4%, #82c1bb66 100%);
--right-theme-bg-color: radial-gradient(circle at top left, rgba(255, 209, 255, 0.3) 4%, rgba(130, 193, 187, 0.3) 100%);
// 聊天框主体样式
--right-chat-reply-color: #f1f1f1;
--right-chat-reply-active-color: rgba(99, 99, 99, 0.1);
--right-chat-footer-line-color: rgba(99, 99, 99, 0.1);
// 消息列表样式
--msg-active-color: #13987f;
//列表通用hover
--list-hover-color: rgba(99, 99, 99, 0.1);
}
}
@ -26,16 +37,27 @@ html[data-theme='dark'] {
--left-active-bg-color: rgba(222, 222, 222, 0.1);
--left-text-color: #ccc;
--left-icon-color: #ccc;
--left-active-hover: rgba(19, 152, 127, 0.8);
--left-active-hover: rgba(26, 178, 146, 0.8);
--left-bg-hover: rgba(133, 133, 133, 0.2);
--left-active-icon-color: #13987f;
--left-win-icon-color: rgba(19, 152, 127, 0.8);
--left-active-icon-color: #1ab292;
--left-win-icon-color: #1ab292;
// 包含边框的选中样式
--border-active-color: #64a29c;
// 右边布局内容背景
--right-theme-bg-color: radial-gradient(circle at top left, #ffd1ff4c 4%, #82c1bb66 100%);
--right-theme-bg-color: radial-gradient(circle at top left, rgba(255, 209, 255, 0.2) 4%, rgba(130, 193, 187, 0.2) 100%);
// 聊天框主体样式
--right-chat-reply-color: #666;
--right-chat-reply-active-color: rgba(255, 255, 255, 0.1);
--right-chat-footer-line-color: #444;
// 消息列表样式
--msg-active-color: rgba(19, 152, 127, 0.4);
//列表通用hover
--list-hover-color: rgba(244, 244, 244, 0.1);
}
}
/**! end */

22
src/styles/scss/theme/simple.scss
View File

@ -16,6 +16,17 @@
// 右边布局内容背景
--right-theme-bg-color: #f1f1f1;
// 聊天框主体样式
--right-chat-reply-color: #ddd;
--right-chat-reply-active-color: rgba(99, 99, 99, 0.1);
--right-chat-footer-line-color: #e3e3e3;
// 消息列表样式
--msg-active-color: #13987f;
//列表通用hover
--list-hover-color: rgba(99, 99, 99, 0.1);
}
}
@ -36,6 +47,17 @@ html[data-theme='dark'] {
// 右边布局内容背景
--right-theme-bg-color: #161616;
// 聊天框主体样式
--right-chat-reply-color: #3b3b3b;
--right-chat-reply-active-color: rgba(255, 255, 255, 0.1);
--right-chat-footer-line-color: #404040;
// 消息列表样式
--msg-active-color: rgba(19, 152, 127, 0.4);
//列表通用hover
--list-hover-color: rgba(244, 244, 244, 0.1);
}
}
/**! end */

2
src/views/homeWindow/SearchDetails.vue
View File

@ -15,7 +15,7 @@
</n-flex>
<template v-for="(item, _index) in historyList" :key="_index">
<n-flex align="center" :size="14" class="p-6px cursor-pointer rounded-8px hover:bg-[--bg-group-hover]">
<n-flex align="center" :size="14" class="p-6px cursor-pointer rounded-8px hover:bg-[--list-hover-color]">
<n-avatar :size="38" round bordered :src="item.avatar" />
<p class="text-(14px [--text-color])">{{ item.name }}</p>
</n-flex>

6
src/views/homeWindow/message/Alone.vue
View File

@ -1,8 +1,10 @@
<template>
<main class="flex-1 rounded-8px bg-[--right-bg-color] h-full w-100vw">
<ActionBar :shrink="false" :current-label="appWindow.label" />
<div style="background: var(--right-theme-bg-color)">
<ActionBar :shrink="false" :current-label="appWindow.label" />
<ChatBox />
<ChatBox />
</div>
</main>
</template>
<script setup lang="ts">

2
src/views/homeWindow/more/settings/model.tsx
View File

@ -136,7 +136,7 @@ const topicsList: Topic = [
]
const versatileModel: JSX.Element = (() => (
<div class="w-300px h-200px rounded-8px custom-shadow flex rounded-8px border-(1px solid [--line-color])">
<div class="w-300px h-200px rounded-8px custom-shadow flex border-(1px solid [--line-color])">
<div class="bg-[--left-bg-color] flex-1 rounded-[6px_0_0_6px] flex-col-x-center">
<div class="text-(8px [--left-text-color]) mt-10px">HuLa</div>
<div class="bg-[--left-bg-hover] size-18px rounded-6px mt-10px"></div>