Compare commits

..

6 Commits

Author SHA1 Message Date
Tim
4b8229b0a1 feat: refresh base user avatar styling 2025-09-24 01:21:12 +08:00
tim
6e4fbc3c42 fix: base avatar 重构 2025-09-24 00:43:57 +08:00
Tim
779264623c Merge pull request #1018 from nagisa77/codex/create-baseuseravatar-component-zv8hyo
feat: add base user avatar component
2025-09-24 00:31:11 +08:00
Tim
76aef40de7 feat: add base user avatar component 2025-09-24 00:30:54 +08:00
tim
a1eccb3b1e Revert "feat: add BaseUserAvatar and unify avatar usage"
This reverts commit efbb83924b.
2025-09-24 00:30:23 +08:00
Tim
0f75a95dbe Merge pull request #1017 from nagisa77/codex/create-baseuseravatar-component
feat: unify avatar rendering with BaseUserAvatar
2025-09-24 00:27:10 +08:00
16 changed files with 347 additions and 175 deletions

View File

@@ -3,18 +3,17 @@
<div class="timeline-item" v-for="(item, idx) in items" :key="idx"> <div class="timeline-item" v-for="(item, idx) in items" :key="idx">
<div <div
class="timeline-icon" class="timeline-icon"
:class="{ clickable: !!item.iconClick && !item.src }" :class="{ clickable: !!item.iconClick || hasLink(item) }"
@click="!item.src && item.iconClick && item.iconClick()" @click="onIconClick(item, $event)"
> >
<BaseUserAvatar <BaseUserAvatar
v-if="item.src" v-if="item.src"
:class="['timeline-img', { 'is-clickable': !!item.iconClick }]" :src="item.src"
:user-id="item.userId" :user-id="item.userId"
:avatar="item.src" :to="item.avatarLink"
:username="item.userName || item.username" class="timeline-img"
:width="32" alt="timeline item"
:link="!item.iconClick" :disable-link="!hasLink(item) || !!item.iconClick"
@click.stop="item.iconClick && item.iconClick()"
/> />
<component <component
v-else-if="item.icon && (typeof item.icon !== 'string' || !item.icon.includes(' '))" v-else-if="item.icon && (typeof item.icon !== 'string' || !item.icon.includes(' '))"
@@ -31,11 +30,28 @@
</template> </template>
<script> <script>
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
export default { export default {
name: 'BaseTimeline', name: 'BaseTimeline',
components: { BaseUserAvatar },
props: { props: {
items: { type: Array, default: () => [] }, items: { type: Array, default: () => [] },
}, },
methods: {
hasLink(item) {
if (!item) return false
if (item.avatarLink) return true
const id = item?.userId
return id !== undefined && id !== null && id !== ''
},
onIconClick(item, event) {
if (item && item.iconClick) {
event.preventDefault()
item.iconClick()
}
},
},
} }
</script> </script>
@@ -73,12 +89,14 @@ export default {
} }
.timeline-img { .timeline-img {
width: 32px; width: 100%;
height: 32px; height: 100%;
} }
.timeline-img.is-clickable { .timeline-img :deep(.base-user-avatar-img) {
cursor: pointer; width: 100%;
height: 100%;
object-fit: cover;
} }
.timeline-emoji { .timeline-emoji {

View File

@@ -1,91 +1,129 @@
<template> <template>
<component :is="wrapperTag" v-bind="wrapperAttrs" :class="containerClass" :style="mergedStyle"> <component
<BaseImage :src="currentSrc" :alt="altText" class="base-user-avatar-img" @error="handleError" /> :is="wrapperTag"
:to="isLink ? resolvedLink : undefined"
class="base-user-avatar"
:class="wrapperClass"
:style="wrapperStyle"
v-bind="wrapperAttrs"
:role="isLink ? undefined : 'img'"
:aria-label="altText"
:title="altText"
>
<span class="base-user-avatar-backdrop" aria-hidden="true" />
<BaseImage :src="currentSrc" :alt="altText" class="base-user-avatar-img" @error="onError" />
</component> </component>
</template> </template>
<script setup> <script setup>
import { computed, ref, watch } from 'vue' import { computed, ref, watch } from 'vue'
import { useAttrs } from 'vue' import { useAttrs } from 'vue'
import BaseImage from './BaseImage.vue'
const DEFAULT_AVATAR = '/default-avatar.svg' const DEFAULT_AVATAR = '/default-avatar.svg'
const props = defineProps({ const props = defineProps({
userId: { userId: {
type: [String, Number], type: [String, Number],
required: true, default: null,
}, },
avatar: { src: {
type: String, type: String,
default: '', default: '',
}, },
username: {
type: String,
default: '',
},
width: {
type: [Number, String],
default: 40,
},
alt: { alt: {
type: String, type: String,
default: '', default: '',
}, },
link: { width: {
type: [Number, String],
default: null,
},
rounded: {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
disableLink: {
type: Boolean,
default: false,
},
to: {
type: String,
default: '',
},
}) })
const attrs = useAttrs() const attrs = useAttrs()
const currentSrc = ref(props.avatar || DEFAULT_AVATAR)
const currentSrc = ref(props.src || DEFAULT_AVATAR)
watch( watch(
() => props.avatar, () => props.src,
(newVal) => { (value) => {
currentSrc.value = newVal || DEFAULT_AVATAR currentSrc.value = value || DEFAULT_AVATAR
}, },
) )
const wrapperTag = computed(() => (props.link ? 'NuxtLink' : 'div')) const resolvedLink = computed(() => {
if (props.to) return props.to
if (props.userId !== null && props.userId !== undefined && props.userId !== '') {
return `/users/${props.userId}`
}
return null
})
const altText = computed(() => props.alt || '用户头像')
const sizeStyle = computed(() => { const sizeStyle = computed(() => {
const value = typeof props.width === 'number' ? `${props.width}px` : props.width || '40px' if (!props.width && props.width !== 0) return null
const value = typeof props.width === 'number' ? `${props.width}px` : props.width
if (!value) return null
return { width: value, height: value }
})
const accentHue = computed(() => {
const seed = props.userId ?? props.alt
const source = seed !== undefined && seed !== null ? String(seed) : ''
if (!source) return 198
let hash = 0
for (let index = 0; index < source.length; index += 1) {
hash = (hash << 5) - hash + source.charCodeAt(index)
hash |= 0
}
return Math.abs(hash) % 360
})
const accentStyles = computed(() => {
const hue = accentHue.value
return { return {
width: value, '--avatar-accent': `hsl(${hue}, 74%, 54%)`,
height: value, '--avatar-accent-light': `hsl(${hue}, 95%, 82%)`,
'--avatar-accent-soft': `hsl(${hue}, 96%, 95%)`,
'--avatar-accent-border': `hsla(${hue}, 70%, 48%, 0.28)`,
'--avatar-accent-shadow': `hsla(${hue}, 68%, 36%, 0.2)`,
} }
}) })
const altText = computed(() => { const wrapperStyle = computed(() => {
if (props.alt) return props.alt const attrStyle = attrs.style
if (props.username) return `${props.username}的头像` return [accentStyles.value, sizeStyle.value, attrStyle]
return '用户头像'
}) })
const containerClass = computed(() => { const isLink = computed(() => !props.disableLink && !!resolvedLink.value)
const classes = ['base-user-avatar']
if (props.link) classes.push('is-link')
if (attrs.class) classes.push(attrs.class)
return classes
})
const mergedStyle = computed(() => { const wrapperTag = computed(() => (isLink.value ? 'NuxtLink' : 'div'))
if (!attrs.style) return sizeStyle.value
return [sizeStyle.value, attrs.style] const wrapperClass = computed(() => [
}) attrs.class,
{ 'is-rounded': props.rounded, 'is-interactive': isLink.value },
])
const wrapperAttrs = computed(() => { const wrapperAttrs = computed(() => {
const { class: _class, style: _style, ...rest } = attrs const { class: _class, style: _style, to: _to, href: _href, ...rest } = attrs
if (props.link) {
return {
...rest,
to: `/users/${props.userId}`,
}
}
return rest return rest
}) })
function handleError() { function onError() {
if (currentSrc.value !== DEFAULT_AVATAR) { if (currentSrc.value !== DEFAULT_AVATAR) {
currentSrc.value = DEFAULT_AVATAR currentSrc.value = DEFAULT_AVATAR
} }
@@ -94,23 +132,84 @@ function handleError() {
<style scoped> <style scoped>
.base-user-avatar { .base-user-avatar {
position: relative;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50%;
overflow: hidden; overflow: hidden;
background-color: var(--avatar-background, rgba(0, 0, 0, 0.05)); border-radius: 16px;
background: linear-gradient(
140deg,
var(--avatar-accent-soft, rgba(17, 182, 197, 0.12)) 0%,
var(--avatar-accent-light, rgba(17, 182, 197, 0.22)) 100%
);
border: 1px solid var(--avatar-accent-border, rgba(17, 182, 197, 0.2));
box-shadow:
0 1px 2px rgba(15, 52, 67, 0.08),
0 3px 8px var(--avatar-accent-shadow, rgba(17, 182, 197, 0.18));
transition:
transform 0.3s ease,
box-shadow 0.3s ease,
border-color 0.3s ease,
background 0.3s ease;
} }
.base-user-avatar.is-link { .base-user-avatar.is-rounded {
cursor: pointer; border-radius: 50%;
}
.base-user-avatar:not(.is-rounded) {
border-radius: 0;
}
.base-user-avatar-backdrop {
position: absolute;
inset: 0;
pointer-events: none;
background:
radial-gradient(circle at 28% 28%, rgba(255, 255, 255, 0.72), transparent 62%),
linear-gradient(150deg, rgba(255, 255, 255, 0.08), transparent),
linear-gradient(
140deg,
var(--avatar-accent-soft, rgba(17, 182, 197, 0.08)) 0%,
var(--avatar-accent-light, rgba(17, 182, 197, 0.18)) 100%
);
opacity: 0.75;
transition:
opacity 0.35s ease,
transform 0.35s ease;
z-index: 0;
} }
.base-user-avatar-img { .base-user-avatar-img {
position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 50%;
object-fit: cover; object-fit: cover;
display: block; display: block;
z-index: 1;
border-radius: inherit;
transition: transform 0.35s ease;
}
.base-user-avatar.is-interactive:hover,
.base-user-avatar.is-interactive:focus-visible {
transform: translateY(-1px) scale(1.02);
border-color: var(--avatar-accent, var(--primary-color, #0a6e78));
box-shadow:
0 6px 16px var(--avatar-accent-shadow, rgba(17, 182, 197, 0.24)),
0 3px 6px rgba(15, 52, 67, 0.18);
outline: none;
}
.base-user-avatar.is-interactive:hover .base-user-avatar-backdrop,
.base-user-avatar.is-interactive:focus-visible .base-user-avatar-backdrop {
opacity: 1;
transform: scale(1.05);
}
.base-user-avatar.is-interactive:hover .base-user-avatar-img,
.base-user-avatar.is-interactive:focus-visible .base-user-avatar-img {
transform: scale(1.02);
} }
</style> </style>

View File

@@ -27,14 +27,11 @@
<next class="reply-icon" /> <next class="reply-icon" />
<span class="reply-info"> <span class="reply-info">
<BaseUserAvatar <BaseUserAvatar
v-if="comment.parentUserName"
class="reply-avatar" class="reply-avatar"
:src="comment.parentUserAvatar"
:user-id="comment.parentUserId" :user-id="comment.parentUserId"
:avatar="comment.parentUserAvatar" :alt="comment.parentUserName"
:username="comment.parentUserName" :disable-link="!comment.parentUserId"
:width="20"
:link="Boolean(comment.parentUserId)"
@click="comment.parentUserClick && comment.parentUserClick()"
/> />
<span class="reply-user-name">{{ comment.parentUserName }}</span> <span class="reply-user-name">{{ comment.parentUserName }}</span>
</span> </span>
@@ -115,6 +112,7 @@ import BaseTimeline from '~/components/BaseTimeline.vue'
import CommentEditor from '~/components/CommentEditor.vue' import CommentEditor from '~/components/CommentEditor.vue'
import DropdownMenu from '~/components/DropdownMenu.vue' import DropdownMenu from '~/components/DropdownMenu.vue'
import ReactionsGroup from '~/components/ReactionsGroup.vue' import ReactionsGroup from '~/components/ReactionsGroup.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const API_BASE_URL = config.public.apiBaseUrl const API_BASE_URL = config.public.apiBaseUrl
@@ -257,7 +255,6 @@ const submitReply = async (parentUserName, text, clear) => {
replyList.push({ replyList.push({
id: data.id, id: data.id,
userName: data.author.username, userName: data.author.username,
userId: data.author.id,
time: TimeManager.format(data.createdAt), time: TimeManager.format(data.createdAt),
avatar: data.author.avatar, avatar: data.author.avatar,
medal: data.author.displayMedal, medal: data.author.displayMedal,
@@ -269,7 +266,6 @@ const submitReply = async (parentUserName, text, clear) => {
reply: (data.replies || []).map((r) => ({ reply: (data.replies || []).map((r) => ({
id: r.id, id: r.id,
userName: r.author.username, userName: r.author.username,
userId: r.author.id,
time: TimeManager.format(r.createdAt), time: TimeManager.format(r.createdAt),
avatar: r.author.avatar, avatar: r.author.avatar,
text: r.content, text: r.content,
@@ -277,10 +273,12 @@ const submitReply = async (parentUserName, text, clear) => {
reply: [], reply: [],
openReplies: false, openReplies: false,
src: r.author.avatar, src: r.author.avatar,
userId: r.author.id,
iconClick: () => navigateTo(`/users/${r.author.id}`), iconClick: () => navigateTo(`/users/${r.author.id}`),
})), })),
openReplies: false, openReplies: false,
src: data.author.avatar, src: data.author.avatar,
userId: data.author.id,
iconClick: () => navigateTo(`/users/${data.author.id}`), iconClick: () => navigateTo(`/users/${data.author.id}`),
}) })
clear() clear()
@@ -401,7 +399,9 @@ const handleContentClick = (e) => {
.reply-avatar { .reply-avatar {
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%;
margin-right: 5px; margin-right: 5px;
cursor: pointer;
} }
.reply-icon { .reply-icon {

View File

@@ -73,10 +73,10 @@
<BaseUserAvatar <BaseUserAvatar
class="avatar-img" class="avatar-img"
:user-id="authState.userId" :user-id="authState.userId"
:avatar="avatar" :src="avatar"
:username="authState.username" alt="avatar"
:width="32" :width="32"
:link="false" :disable-link="true"
/> />
<down /> <down />
</div> </div>
@@ -100,6 +100,7 @@ import { computed, nextTick, ref, watch } from 'vue'
import DropdownMenu from '~/components/DropdownMenu.vue' import DropdownMenu from '~/components/DropdownMenu.vue'
import ToolTip from '~/components/ToolTip.vue' import ToolTip from '~/components/ToolTip.vue'
import SearchDropdown from '~/components/SearchDropdown.vue' import SearchDropdown from '~/components/SearchDropdown.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import { authState, clearToken, loadCurrentUser } from '~/utils/auth' import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
import { useUnreadCount } from '~/composables/useUnreadCount' import { useUnreadCount } from '~/composables/useUnreadCount'
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount' import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
@@ -441,6 +442,7 @@ onMounted(async () => {
height: 32px; height: 32px;
border-radius: 50%; border-radius: 50%;
background-color: lightgray; background-color: lightgray;
object-fit: cover;
} }
.dropdown-icon { .dropdown-icon {

View File

@@ -4,10 +4,10 @@
<BaseUserAvatar <BaseUserAvatar
v-if="log.userAvatar" v-if="log.userAvatar"
class="change-log-avatar" class="change-log-avatar"
:user-id="log.userId" :src="log.userAvatar"
:avatar="log.userAvatar" :to="log.username ? `/users/${log.username}` : ''"
:username="log.username" alt="avatar"
:width="20" :disable-link="!log.username"
/> />
<span v-if="log.username" class="change-log-user">{{ log.username }}</span> <span v-if="log.username" class="change-log-user">{{ log.username }}</span>
<span v-if="log.type === 'CONTENT'" class="change-log-content">变更了文章内容</span> <span v-if="log.type === 'CONTENT'" class="change-log-content">变更了文章内容</span>
@@ -56,8 +56,8 @@
import { computed } from 'vue' import { computed } from 'vue'
import { html } from 'diff2html' import { html } from 'diff2html'
import { createTwoFilesPatch } from 'diff' import { createTwoFilesPatch } from 'diff'
import { useIsMobile } from '~/utils/screen'
import 'diff2html/bundles/css/diff2html.min.css' import 'diff2html/bundles/css/diff2html.min.css'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import { themeState } from '~/utils/theme' import { themeState } from '~/utils/theme'
import ArticleCategory from '~/components/ArticleCategory.vue' import ArticleCategory from '~/components/ArticleCategory.vue'
import ArticleTags from '~/components/ArticleTags.vue' import ArticleTags from '~/components/ArticleTags.vue'
@@ -134,6 +134,12 @@ const diffHtml = computed(() => {
cursor: pointer; cursor: pointer;
} }
.change-log-avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
.change-log-time { .change-log-time {
font-size: 12px; font-size: 12px;
opacity: 0.6; opacity: 0.6;

View File

@@ -58,9 +58,8 @@
:key="p.id" :key="p.id"
class="prize-member-avatar" class="prize-member-avatar"
:user-id="p.id" :user-id="p.id"
:avatar="p.avatar" :src="p.avatar"
:username="p.username" alt="avatar"
:width="30"
/> />
<div v-if="lotteryEnded && lotteryWinners.length" class="prize-member-winner"> <div v-if="lotteryEnded && lotteryWinners.length" class="prize-member-winner">
<medal-one class="medal-icon"></medal-one> <medal-one class="medal-icon"></medal-one>
@@ -70,9 +69,8 @@
:key="w.id" :key="w.id"
class="prize-member-avatar" class="prize-member-avatar"
:user-id="w.id" :user-id="w.id"
:avatar="w.avatar" :src="w.avatar"
:username="w.username" alt="avatar"
:width="30"
/> />
<div v-if="lotteryWinners.length === 1" class="prize-member-winner-name"> <div v-if="lotteryWinners.length === 1" class="prize-member-winner-name">
{{ lotteryWinners[0].username }} {{ lotteryWinners[0].username }}
@@ -89,6 +87,7 @@ import { toast } from '~/main'
import { useRuntimeConfig } from '#imports' import { useRuntimeConfig } from '#imports'
import { useIsMobile } from '~/utils/screen' import { useIsMobile } from '~/utils/screen'
import { useCountdown } from '~/composables/useCountdown' import { useCountdown } from '~/composables/useCountdown'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const props = defineProps({ const props = defineProps({
lottery: { type: Object, required: true }, lottery: { type: Object, required: true },
@@ -246,9 +245,16 @@ const joinLottery = async () => {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-left: 3px; margin-left: 3px;
border-radius: 50%;
cursor: pointer; cursor: pointer;
} }
.prize-member-avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
.prize-member-winner { .prize-member-winner {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

View File

@@ -22,9 +22,8 @@
:key="p.id" :key="p.id"
class="poll-participant-avatar" class="poll-participant-avatar"
:user-id="p.id" :user-id="p.id"
:avatar="p.avatar" :src="p.avatar"
:username="p.username" alt="avatar"
:width="30"
/> />
</div> </div>
</div> </div>
@@ -120,6 +119,7 @@ import { getToken, authState } from '~/utils/auth'
import { toast } from '~/main' import { toast } from '~/main'
import { useRuntimeConfig } from '#imports' import { useRuntimeConfig } from '#imports'
import { useCountdown } from '~/composables/useCountdown' import { useCountdown } from '~/composables/useCountdown'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const props = defineProps({ const props = defineProps({
poll: { type: Object, required: true }, poll: { type: Object, required: true },
@@ -425,6 +425,13 @@ const submitMultiPoll = async () => {
.poll-participant-avatar { .poll-participant-avatar {
width: 30px; width: 30px;
height: 30px; height: 30px;
border-radius: 50%;
cursor: pointer; cursor: pointer;
} }
.poll-participant-avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
</style> </style>

View File

@@ -25,12 +25,11 @@
<template #option="{ option }"> <template #option="{ option }">
<div class="search-option-item"> <div class="search-option-item">
<BaseUserAvatar <BaseUserAvatar
class="avatar" :src="option.avatar"
:user-id="option.id" :user-id="option.id"
:avatar="option.avatar" :alt="option.username"
:username="option.username" class="avatar"
:width="32" :disable-link="true"
:link="false"
/> />
<div class="result-body"> <div class="result-body">
<div class="result-main" v-html="highlight(option.username)"></div> <div class="result-main" v-html="highlight(option.username)"></div>
@@ -52,6 +51,7 @@ import Dropdown from '~/components/Dropdown.vue'
import { stripMarkdown } from '~/utils/markdown' import { stripMarkdown } from '~/utils/markdown'
import { useIsMobile } from '~/utils/screen' import { useIsMobile } from '~/utils/screen'
import { getToken } from '~/utils/auth' import { getToken } from '~/utils/auth'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const API_BASE_URL = config.public.apiBaseUrl const API_BASE_URL = config.public.apiBaseUrl
@@ -177,6 +177,14 @@ defineExpose({
.avatar { .avatar {
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 50%;
overflow: hidden;
}
.avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
} }
.result-body { .result-body {

View File

@@ -1,15 +1,8 @@
<template> <template>
<div class="user-list"> <div class="user-list">
<BasePlaceholder v-if="users.length === 0" text="暂无用户" icon="inbox" /> <BasePlaceholder v-if="users.length === 0" text="暂无用户" icon="inbox" />
<div v-for="u in users" :key="u.id" class="user-item" @click="handleUserClick(u)"> <div v-for="u in users" :key="u.id" class="user-item">
<BaseUserAvatar <BaseUserAvatar :src="u.avatar" :user-id="u.id" alt="avatar" class="user-avatar" />
class="user-avatar"
:user-id="u.id"
:avatar="u.avatar"
:username="u.username"
:width="50"
:link="false"
/>
<div class="user-info"> <div class="user-info">
<div class="user-name">{{ u.username }}</div> <div class="user-name">{{ u.username }}</div>
<div v-if="u.introduction" class="user-intro">{{ u.introduction }}</div> <div v-if="u.introduction" class="user-intro">{{ u.introduction }}</div>
@@ -20,6 +13,7 @@
<script setup> <script setup>
import BasePlaceholder from '~/components/BasePlaceholder.vue' import BasePlaceholder from '~/components/BasePlaceholder.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
defineProps({ defineProps({
users: { type: Array, default: () => [] }, users: { type: Array, default: () => [] },
@@ -48,8 +42,15 @@ const handleUserClick = (user) => {
.user-avatar { .user-avatar {
width: 50px; width: 50px;
height: 50px; height: 50px;
border-radius: 50%;
flex-shrink: 0; flex-shrink: 0;
} }
.user-avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
.user-info { .user-info {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@@ -85,15 +85,16 @@
</div> </div>
<div class="article-member-avatars-container"> <div class="article-member-avatars-container">
<BaseUserAvatar <div v-for="member in article.members">
v-for="member in article.members" <BaseUserAvatar
:key="`${article.id}-${member.id}`" class="article-member-avatar-item-img"
class="article-member-avatar-item" :src="member.avatar"
:user-id="member.id" :user-id="member.id"
:avatar="member.avatar" alt="avatar"
:username="member.username" :disable-link="true"
:width="25" :width="25"
/> />
</div>
</div> </div>
<div class="article-comments main-info-text"> <div class="article-comments main-info-text">
@@ -139,6 +140,7 @@ import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
import { getToken } from '~/utils/auth' import { getToken } from '~/utils/auth'
import { stripMarkdown } from '~/utils/markdown' import { stripMarkdown } from '~/utils/markdown'
import { useIsMobile } from '~/utils/screen' import { useIsMobile } from '~/utils/screen'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import TimeManager from '~/utils/time' import TimeManager from '~/utils/time'
import { selectedCategoryGlobal, selectedTagsGlobal } from '~/composables/postFilter' import { selectedCategoryGlobal, selectedTagsGlobal } from '~/composables/postFilter'
useHead({ useHead({
@@ -292,11 +294,7 @@ const {
description: p.content, description: p.content,
category: p.category, category: p.category,
tags: p.tags || [], tags: p.tags || [],
members: (p.participants || []).map((m) => ({ members: (p.participants || []).map((m) => ({ id: m.id, avatar: m.avatar })),
id: m.id,
avatar: m.avatar,
username: m.username,
})),
comments: p.commentCount, comments: p.commentCount,
views: p.views, views: p.views,
rssExcluded: p.rssExcluded || false, rssExcluded: p.rssExcluded || false,
@@ -338,11 +336,7 @@ const fetchNextPage = async () => {
description: p.content, description: p.content,
category: p.category, category: p.category,
tags: p.tags || [], tags: p.tags || [],
members: (p.participants || []).map((m) => ({ members: (p.participants || []).map((m) => ({ id: m.id, avatar: m.avatar })),
id: m.id,
avatar: m.avatar,
username: m.username,
})),
comments: p.commentCount, comments: p.commentCount,
views: p.views, views: p.views,
rssExcluded: p.rssExcluded || false, rssExcluded: p.rssExcluded || false,
@@ -636,10 +630,15 @@ watch([selectedCategory, selectedTags], ([newCategory, newTags]) => {
margin-left: 20px; margin-left: 20px;
} }
.article-member-avatar-item { .article-member-avatar-item-img {
width: 25px; width: 100%;
height: 25px; height: 100%;
flex-shrink: 0; }
.article-member-avatar-item-img :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
} }
.placeholder-container { .placeholder-container {
@@ -693,6 +692,7 @@ watch([selectedCategory, selectedTags], ([newCategory, newTags]) => {
margin-left: 0px; margin-left: 0px;
gap: 0px; gap: 0px;
} }
.article-main-container, .article-main-container,
.header-item.main-item { .header-item.main-item {
width: calc(70% - 20px); width: calc(70% - 20px);

View File

@@ -46,10 +46,9 @@
<next class="reply-icon" /> <next class="reply-icon" />
<BaseUserAvatar <BaseUserAvatar
class="reply-avatar" class="reply-avatar"
:src="item.replyTo.sender.avatar"
:user-id="item.replyTo.sender.id" :user-id="item.replyTo.sender.id"
:avatar="item.replyTo.sender.avatar" :alt="item.replyTo.sender.username"
:username="item.replyTo.sender.username"
:width="20"
/> />
<div class="reply-author">{{ item.replyTo.sender.username }}:</div> <div class="reply-author">{{ item.replyTo.sender.username }}:</div>
</div> </div>
@@ -127,6 +126,7 @@ import TimeManager from '~/utils/time'
import BaseTimeline from '~/components/BaseTimeline.vue' import BaseTimeline from '~/components/BaseTimeline.vue'
import BasePlaceholder from '~/components/BasePlaceholder.vue' import BasePlaceholder from '~/components/BasePlaceholder.vue'
import VueEasyLightbox from 'vue-easy-lightbox' import VueEasyLightbox from 'vue-easy-lightbox'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const route = useRoute() const route = useRoute()
@@ -248,9 +248,8 @@ async function fetchMessages(page = 0) {
const newMessages = pageData.content.reverse().map((item) => ({ const newMessages = pageData.content.reverse().map((item) => ({
...item, ...item,
userId: item.sender.id,
userName: item.sender.username,
src: item.sender.avatar, src: item.sender.avatar,
userId: item.sender.id,
iconClick: () => { iconClick: () => {
openUser(item.sender.id) openUser(item.sender.id)
}, },
@@ -335,9 +334,8 @@ async function sendMessage(content, clearInput) {
const newMessage = await response.json() const newMessage = await response.json()
messages.value.push({ messages.value.push({
...newMessage, ...newMessage,
userId: newMessage.sender.id,
userName: newMessage.sender.username,
src: newMessage.sender.avatar, src: newMessage.sender.avatar,
userId: newMessage.sender.id,
iconClick: () => { iconClick: () => {
openUser(newMessage.sender.id) openUser(newMessage.sender.id)
}, },
@@ -412,9 +410,8 @@ const subscribeToConversation = () => {
messages.value.push({ messages.value.push({
...parsedMessage, ...parsedMessage,
userId: parsedMessage.sender.id,
userName: parsedMessage.sender.username,
src: parsedMessage.sender.avatar, src: parsedMessage.sender.avatar,
userId: parsedMessage.sender.id,
iconClick: () => openUser(parsedMessage.sender.id), iconClick: () => openUser(parsedMessage.sender.id),
}) })
@@ -698,6 +695,12 @@ function goBack() {
margin-right: 5px; margin-right: 5px;
} }
.reply-avatar :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
.reply-preview { .reply-preview {
margin-top: 10px; margin-top: 10px;
padding: 10px; padding: 10px;

View File

@@ -34,22 +34,11 @@
> >
<div class="conversation-avatar"> <div class="conversation-avatar">
<BaseUserAvatar <BaseUserAvatar
v-if="getOtherParticipant(convo)" :src="getOtherParticipant(convo)?.avatar"
:user-id="getOtherParticipant(convo)?.id"
:alt="getOtherParticipant(convo)?.username || '用户'"
class="avatar-img" class="avatar-img"
:user-id="getOtherParticipant(convo).id" :disable-link="true"
:avatar="getOtherParticipant(convo).avatar"
:username="getOtherParticipant(convo).username"
:width="40"
@click.stop
/>
<BaseUserAvatar
v-else
class="avatar-img"
:user-id="convo.id"
:avatar="''"
username="用户"
:width="40"
:link="false"
/> />
</div> </div>
@@ -142,6 +131,7 @@ import { stripMarkdownLength } from '~/utils/markdown'
import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue' import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
import BasePlaceholder from '~/components/BasePlaceholder.vue' import BasePlaceholder from '~/components/BasePlaceholder.vue'
import BaseTabs from '~/components/BaseTabs.vue' import BaseTabs from '~/components/BaseTabs.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const conversations = ref([]) const conversations = ref([])
@@ -445,6 +435,12 @@ function minimize() {
border-radius: 50%; border-radius: 50%;
} }
.avatar-img :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
}
.conversation-content { .conversation-content {
flex: 1; flex: 1;
min-width: 0; min-width: 0;

View File

@@ -46,14 +46,16 @@
</div> </div>
<div class="info-content-container author-info-container"> <div class="info-content-container author-info-container">
<div class="user-avatar-container"> <div class="user-avatar-container" @click="gotoProfile">
<BaseUserAvatar <div class="user-avatar-item">
class="user-avatar-item" <BaseUserAvatar
:user-id="author.id" class="user-avatar-item-img"
:avatar="author.avatar" :src="author.avatar"
:username="author.username" :user-id="author.id"
:width="50" alt="avatar"
/> :disable-link="true"
/>
</div>
<div v-if="isMobile" class="info-content-header"> <div v-if="isMobile" class="info-content-header">
<div class="user-name"> <div class="user-name">
{{ author.username }} {{ author.username }}
@@ -197,6 +199,7 @@ import ReactionsGroup from '~/components/ReactionsGroup.vue'
import DropdownMenu from '~/components/DropdownMenu.vue' import DropdownMenu from '~/components/DropdownMenu.vue'
import PostLottery from '~/components/PostLottery.vue' import PostLottery from '~/components/PostLottery.vue'
import PostPoll from '~/components/PostPoll.vue' import PostPoll from '~/components/PostPoll.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import { renderMarkdown, handleMarkdownClick, stripMarkdownLength } from '~/utils/markdown' import { renderMarkdown, handleMarkdownClick, stripMarkdownLength } from '~/utils/markdown'
import { getMedalTitle } from '~/utils/medal' import { getMedalTitle } from '~/utils/medal'
import { toast } from '~/main' import { toast } from '~/main'
@@ -345,7 +348,6 @@ const mapComment = (
parentUserName: parentUserName, parentUserName: parentUserName,
parentUserAvatar: parentUserAvatar, parentUserAvatar: parentUserAvatar,
parentUserId: parentUserId, parentUserId: parentUserId,
parentUserClick: parentUserId ? () => navigateTo(`/users/${parentUserId}`) : null,
}) })
const changeLogIcon = (l) => { const changeLogIcon = (l) => {
@@ -384,7 +386,6 @@ const mapChangeLog = (l) => ({
id: l.id, id: l.id,
kind: 'log', kind: 'log',
username: l.username, username: l.username,
userId: l.userId ?? l.username,
userAvatar: l.userAvatar, userAvatar: l.userAvatar,
type: l.type, type: l.type,
createdAt: l.time, createdAt: l.time,
@@ -869,6 +870,10 @@ const jumpToHashComment = async () => {
} }
} }
const gotoProfile = () => {
navigateTo(`/users/${author.value.id}`, { replace: true })
}
const initPage = async () => { const initPage = async () => {
scrollTo(0, 0) scrollTo(0, 0)
await fetchTimeline() await fetchTimeline()
@@ -962,8 +967,6 @@ onMounted(async () => {
.user-avatar-container { .user-avatar-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center;
gap: 10px;
} }
.scroller-middle { .scroller-middle {
@@ -1176,13 +1179,24 @@ onMounted(async () => {
} }
.user-avatar-container { .user-avatar-container {
cursor: default; cursor: pointer;
} }
.user-avatar-item { .user-avatar-item {
width: 50px; width: 50px;
height: 50px; height: 50px;
flex-shrink: 0; }
.user-avatar-item-img {
width: 100%;
height: 100%;
border-radius: 50%;
}
.user-avatar-item-img :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
} }
.info-content { .info-content {

View File

@@ -15,7 +15,13 @@
<div class="avatar-row"> <div class="avatar-row">
<!-- label 充当点击区域内部隐藏 input --> <!-- label 充当点击区域内部隐藏 input -->
<label class="avatar-container"> <label class="avatar-container">
<BaseImage :src="avatar" class="avatar-preview" alt="avatar" /> <BaseUserAvatar
:src="avatar"
:user-id="userId"
alt="avatar"
class="avatar-preview"
:disable-link="true"
/>
<!-- 半透明蒙层hover 时出现 --> <!-- 半透明蒙层hover 时出现 -->
<div class="avatar-overlay">更换头像</div> <div class="avatar-overlay">更换头像</div>
<input type="file" class="avatar-input" accept="image/*" @change="onAvatarChange" /> <input type="file" class="avatar-input" accept="image/*" @change="onAvatarChange" />
@@ -74,6 +80,7 @@ import AvatarCropper from '~/components/AvatarCropper.vue'
import BaseInput from '~/components/BaseInput.vue' import BaseInput from '~/components/BaseInput.vue'
import Dropdown from '~/components/Dropdown.vue' import Dropdown from '~/components/Dropdown.vue'
import BaseSwitch from '~/components/BaseSwitch.vue' import BaseSwitch from '~/components/BaseSwitch.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import { toast } from '~/main' import { toast } from '~/main'
import { fetchCurrentUser, getToken, setToken } from '~/utils/auth' import { fetchCurrentUser, getToken, setToken } from '~/utils/auth'
import { frostedState, setFrosted } from '~/utils/frosted' import { frostedState, setFrosted } from '~/utils/frosted'
@@ -87,6 +94,7 @@ const avatarFile = ref(null)
const tempAvatar = ref('') const tempAvatar = ref('')
const showCropper = ref(false) const showCropper = ref(false)
const role = ref('') const role = ref('')
const userId = ref(null)
const publishMode = ref('DIRECT') const publishMode = ref('DIRECT')
const passwordStrength = ref('LOW') const passwordStrength = ref('LOW')
const aiFormatLimit = ref(3) const aiFormatLimit = ref(3)
@@ -103,6 +111,7 @@ onMounted(async () => {
username.value = user.username username.value = user.username
introduction.value = user.introduction || '' introduction.value = user.introduction || ''
avatar.value = user.avatar avatar.value = user.avatar
userId.value = user.id
role.value = user.role role.value = user.role
if (role.value === 'ADMIN') { if (role.value === 'ADMIN') {
loadAdminConfig() loadAdminConfig()
@@ -271,6 +280,11 @@ const save = async () => {
width: 80px; width: 80px;
height: 80px; height: 80px;
border-radius: 40px; border-radius: 40px;
}
.avatar-preview :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover; object-fit: cover;
} }

View File

@@ -8,11 +8,10 @@
<div class="profile-page-header"> <div class="profile-page-header">
<div class="profile-page-header-avatar"> <div class="profile-page-header-avatar">
<BaseUserAvatar <BaseUserAvatar
class="profile-page-header-avatar-img" :src="user.avatar"
:user-id="user.id" :user-id="user.id"
:avatar="user.avatar" alt="avatar"
:username="user.username" class="profile-page-header-avatar-img"
:width="200"
/> />
</div> </div>
<div class="profile-page-header-user-info"> <div class="profile-page-header-user-info">
@@ -278,6 +277,7 @@ import LevelProgress from '~/components/LevelProgress.vue'
import TimelineCommentGroup from '~/components/TimelineCommentGroup.vue' import TimelineCommentGroup from '~/components/TimelineCommentGroup.vue'
import TimelinePostItem from '~/components/TimelinePostItem.vue' import TimelinePostItem from '~/components/TimelinePostItem.vue'
import TimelineTagItem from '~/components/TimelineTagItem.vue' import TimelineTagItem from '~/components/TimelineTagItem.vue'
import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
import UserList from '~/components/UserList.vue' import UserList from '~/components/UserList.vue'
import { toast } from '~/main' import { toast } from '~/main'
import { authState, getToken } from '~/utils/auth' import { authState, getToken } from '~/utils/auth'
@@ -657,6 +657,13 @@ watch(selectedTab, async (val) => {
.profile-page-header-avatar-img { .profile-page-header-avatar-img {
width: 200px; width: 200px;
height: 200px; height: 200px;
border-radius: 50%;
}
.profile-page-header-avatar-img :deep(.base-user-avatar-img) {
width: 100%;
height: 100%;
object-fit: cover;
} }
.profile-page-header-user-info { .profile-page-header-user-info {
@@ -1084,6 +1091,7 @@ watch(selectedTab, async (val) => {
.profile-page-header-avatar-img { .profile-page-header-avatar-img {
width: 100px; width: 100px;
height: 100px; height: 100px;
border-radius: 50%;
} }
:deep(.base-tabs-item) { :deep(.base-tabs-item) {

View File

@@ -199,8 +199,6 @@ function createFetchNotifications() {
arr.push({ arr.push({
...n, ...n,
src: n.comment.author.avatar, src: n.comment.author.avatar,
userId: n.comment.author.id,
userName: n.comment.author.username,
iconClick: () => { iconClick: () => {
markNotificationRead(n.id) markNotificationRead(n.id)
navigateTo(`/users/${n.comment.author.id}`, { replace: true }) navigateTo(`/users/${n.comment.author.id}`, { replace: true })
@@ -221,8 +219,6 @@ function createFetchNotifications() {
arr.push({ arr.push({
...n, ...n,
src: n.fromUser ? n.fromUser.avatar : null, src: n.fromUser ? n.fromUser.avatar : null,
userId: n.fromUser ? n.fromUser.id : undefined,
userName: n.fromUser ? n.fromUser.username : undefined,
icon: n.fromUser ? undefined : iconMap[n.type], icon: n.fromUser ? undefined : iconMap[n.type],
iconClick: () => { iconClick: () => {
if (n.fromUser) { if (n.fromUser) {
@@ -235,8 +231,6 @@ function createFetchNotifications() {
arr.push({ arr.push({
...n, ...n,
src: n.fromUser ? n.fromUser.avatar : null, src: n.fromUser ? n.fromUser.avatar : null,
userId: n.fromUser ? n.fromUser.id : undefined,
userName: n.fromUser ? n.fromUser.username : undefined,
icon: n.fromUser ? undefined : iconMap[n.type], icon: n.fromUser ? undefined : iconMap[n.type],
iconClick: () => { iconClick: () => {
if (n.fromUser) { if (n.fromUser) {
@@ -275,8 +269,6 @@ function createFetchNotifications() {
arr.push({ arr.push({
...n, ...n,
src: n.comment.author.avatar, src: n.comment.author.avatar,
userId: n.comment.author.id,
userName: n.comment.author.username,
iconClick: () => { iconClick: () => {
markNotificationRead(n.id) markNotificationRead(n.id)
navigateTo(`/users/${n.comment.author.id}`, { replace: true }) navigateTo(`/users/${n.comment.author.id}`, { replace: true })
@@ -323,8 +315,6 @@ function createFetchNotifications() {
arr.push({ arr.push({
...n, ...n,
src: n.fromUser ? n.fromUser.avatar : null, src: n.fromUser ? n.fromUser.avatar : null,
userId: n.fromUser ? n.fromUser.id : undefined,
userName: n.fromUser ? n.fromUser.username : undefined,
icon: n.fromUser ? undefined : iconMap[n.type], icon: n.fromUser ? undefined : iconMap[n.type],
iconClick: () => { iconClick: () => {
if (n.post) { if (n.post) {