chore: 优化代码

This commit is contained in:
xlsea 2025-04-29 00:12:47 +08:00
parent fd8bb91fa6
commit 291aaf6022
3 changed files with 70 additions and 56 deletions

View File

@ -74,9 +74,6 @@ importers:
vue-advanced-cropper:
specifier: ^2.8.9
version: 2.8.9(vue@3.5.13(typescript@5.8.2))
vue-cropper:
specifier: ^0.6.5
version: 0.6.5
vue-draggable-plus:
specifier: 0.6.0
version: 0.6.0(@types/sortablejs@1.15.8)
@ -4082,9 +4079,6 @@ packages:
peerDependencies:
vue: ^3.0.0
vue-cropper@0.6.5:
resolution: {integrity: sha512-lSvY6IpeA/Tv/iPZ/FOkMHVRBPSlm7t57nuHEZFBMRNOH8ElvfqVlnHGDOAMlvPhh9gHiddiQoASS+fY0MFX0g==}
vue-demi@0.13.11:
resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
engines: {node: '>=12'}
@ -8378,8 +8372,6 @@ snapshots:
easy-bem: 1.1.1
vue: 3.5.13(typescript@5.8.2)
vue-cropper@0.6.5: {}
vue-demi@0.13.11(vue@3.5.13(typescript@5.8.2)):
dependencies:
vue: 3.5.13(typescript@5.8.2)

View File

@ -1,6 +1,7 @@
<script setup lang="ts">
import { computed, ref } from 'vue';
import { computed } from 'vue';
import type { VNode } from 'vue';
import { useBoolean, useLoading } from '@sa/hooks';
import { useAuthStore } from '@/store/modules/auth';
import { useRouterPush } from '@/hooks/common/router';
import { useSvgIcon } from '@/hooks/common/icon';
@ -15,21 +16,23 @@ const authStore = useAuthStore();
const { routerPushByKey, toLogin } = useRouterPush();
const { SvgIconVNode } = useSvgIcon();
const avatarLoading = ref(true);
const avatarError = ref(false);
// 使 useBoolean
const { loading: avatarLoading, endLoading: endAvatarLoading } = useLoading(true);
// 使 useBoolean
const { bool: avatarError, setTrue: setError, setFalse: clearError } = useBoolean(false);
function loginOrRegister() {
toLogin();
}
function handleAvatarLoad() {
avatarLoading.value = false;
avatarError.value = false;
endAvatarLoading();
clearError();
}
function handleAvatarError() {
avatarLoading.value = false;
avatarError.value = true;
endAvatarLoading();
setError();
}
type DropdownKey = 'user-center' | 'logout';
@ -91,9 +94,9 @@ function handleDropdown(key: DropdownKey) {
{{ $t('page.login.common.loginOrRegister') }}
</NButton>
<NDropdown v-else placement="bottom" trigger="click" :options="options" @select="handleDropdown">
<div class="avatar-wrapper">
<div class="flex cursor-pointer items-center rounded-md px-2 py-1 transition-colors duration-300 hover:bg-black/6">
<NSpin :show="avatarLoading">
<div class="avatar-container" :class="{ 'avatar-error': avatarError }">
<div class="flex items-center gap-2" :class="{ 'opacity-50': avatarError }">
<NAvatar
v-if="authStore.userInfo.user?.avatar"
:size="24"
@ -103,7 +106,9 @@ function handleDropdown(key: DropdownKey) {
@error="handleAvatarError"
/>
<NAvatar v-else :size="32" round :src="defaultAvatar" @load="handleAvatarLoad" @error="handleAvatarError" />
<span class="user-name">{{ authStore.userInfo.user?.nickName }}</span>
<span class="max-w-120px truncate text-14px font-medium">
{{ authStore.userInfo.user?.nickName }}
</span>
</div>
</NSpin>
</div>
@ -136,20 +141,9 @@ function handleDropdown(key: DropdownKey) {
.user-name {
font-size: 14px;
font-weight: 500;
color: var(--primary-text-color);
max-width: 120px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.user-role {
font-size: 12px;
color: var(--secondary-text-color);
background-color: var(--tag-color);
padding: 2px 6px;
border-radius: 4px;
margin-left: 4px;
}
</style>

View File

@ -3,6 +3,7 @@ import { reactive, ref } from 'vue';
import type { UploadFileInfo } from 'naive-ui';
import { NButton, NModal, NUpload } from 'naive-ui';
import { Cropper } from 'vue-advanced-cropper';
import { useBoolean, useLoading } from '@sa/hooks';
import { fetchUpdateUserAvatar } from '@/service/api/system';
import { useAuthStore } from '@/store/modules/auth';
import defaultAvatar from '@/assets/imgs/soybean.jpg';
@ -24,7 +25,11 @@ interface CropperRef {
const authStore = useAuthStore();
const showModal = ref(false);
// 使 useBoolean
const { bool: showModal, setTrue: showDrawer, setFalse: hideDrawer } = useBoolean();
// 使 useLoading
const { loading, startLoading, endLoading } = useLoading();
const imageUrl = ref(authStore.userInfo.user?.avatar || defaultAvatar);
const cropperRef = ref<CropperRef | null>(null);
@ -39,7 +44,7 @@ const options = reactive<CropperOptions>({
/** 编辑头像 */
function handleEdit() {
showModal.value = true;
showDrawer();
}
/** 处理文件选择 */
@ -66,51 +71,74 @@ async function handleFileSelect(data: { file: UploadFileInfo }) {
async function handleCrop() {
if (!cropperRef.value) return;
const { canvas } = cropperRef.value.getResult();
startLoading();
try {
const { canvas } = cropperRef.value.getResult();
// canvas blob
canvas.toBlob(async (blob: Blob | null) => {
if (!blob) return;
// canvas blob
canvas.toBlob(async (blob: Blob | null) => {
if (!blob) return;
const formData = new FormData();
formData.append('avatarfile', blob, options.fileName || 'avatar.png');
const formData = new FormData();
formData.append('avatarfile', blob, options.fileName || 'avatar.png');
const { error } = await fetchUpdateUserAvatar(formData);
if (!error) {
window.$message?.success('头像更新成功!');
imageUrl.value = URL.createObjectURL(blob);
handleClose();
}
}, 'image/png');
const { error } = await fetchUpdateUserAvatar(formData);
if (!error) {
window.$message?.success('头像更新成功!');
imageUrl.value = URL.createObjectURL(blob);
hideDrawer();
}
}, 'image/png');
} finally {
endLoading();
}
}
/** 关闭对话框 */
function handleClose() {
showModal.value = false;
hideDrawer();
options.img = imageUrl.value;
}
</script>
<template>
<div class="avatar-wrapper" @click="handleEdit">
<div class="avatar-container">
<img :src="imageUrl" alt="user-avatar" class="avatar-image" />
<div class="avatar-overlay">
<div class="cursor-pointer" @click="handleEdit">
<div class="relative h-120px w-120px overflow-hidden rounded-full">
<img :src="imageUrl" alt="user-avatar" class="h-full w-full object-cover" />
<div
class="absolute inset-0 flex-center bg-black/50 text-white opacity-0 transition-opacity duration-300 hover:opacity-100"
>
<SvgIcon icon="ep:plus" class="text-24px" />
</div>
</div>
<NModal v-model:show="showModal" preset="card" title="修改头像" class="w-400px" @close="handleClose">
<div class="upload-container">
<div v-if="options.img !== imageUrl" class="cropper-container">
<Cropper ref="cropperRef" class="cropper" :src="options.img" :stencil-props="options.stencilProps" />
<div class="flex-col-center gap-20px py-20px">
<div v-if="options.img !== imageUrl" class="h-300px w-full">
<Cropper
ref="cropperRef"
class="h-full bg-gray-100"
:src="options.img"
:stencil-props="options.stencilProps"
/>
</div>
<img v-else :src="imageUrl" alt="user-avatar" class="preview-image" />
<div class="button-group">
<img
v-else
:src="imageUrl"
alt="user-avatar"
class="h-200px w-200px border border-gray-200 rounded-full object-cover"
/>
<div class="flex gap-12px">
<NUpload accept=".jpg,.jpeg,.png,.gif" :max="1" :show-file-list="false" @before-upload="handleFileSelect">
<NButton class="upload-button">选择图片</NButton>
<NButton class="min-w-100px">选择图片</NButton>
</NUpload>
<NButton v-if="options.img !== imageUrl" type="primary" class="upload-button" @click="handleCrop">
<NButton
v-if="options.img !== imageUrl"
type="primary"
class="min-w-100px"
:loading="loading"
@click="handleCrop"
>
确认裁剪
</NButton>
</div>