Merge branch 'main' of github.com:edgexie/vue-pure-admin into main

This commit is contained in:
edgex
2024-03-26 07:38:13 +08:00

View File

@@ -6,6 +6,7 @@ import { zxcvbn } from "@zxcvbn-ts/core";
import { handleTree } from "@/utils/tree"; import { handleTree } from "@/utils/tree";
import { message } from "@/utils/message"; import { message } from "@/utils/message";
import croppingUpload from "../upload.vue"; import croppingUpload from "../upload.vue";
import userAvatar from "@/assets/user.jpg";
import { usePublicHooks } from "../../hooks"; import { usePublicHooks } from "../../hooks";
import { addDialog } from "@/components/ReDialog"; import { addDialog } from "@/components/ReDialog";
import type { PaginationProps } from "@pureadmin/table"; import type { PaginationProps } from "@pureadmin/table";
@@ -85,8 +86,8 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
<el-image <el-image
fit="cover" fit="cover"
preview-teleported={true} preview-teleported={true}
src={row.avatar} src={row.avatar || userAvatar}
preview-src-list={Array.of(row.avatar)} preview-src-list={Array.of(row.avatar || userAvatar)}
class="w-[24px] h-[24px] rounded-full align-middle" class="w-[24px] h-[24px] rounded-full align-middle"
/> />
), ),
@@ -370,7 +371,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
contentRenderer: () => contentRenderer: () =>
h(croppingUpload, { h(croppingUpload, {
ref: cropRef, ref: cropRef,
imgSrc: row.avatar, imgSrc: row.avatar || userAvatar,
onCropper: info => (avatarInfo.value = info) onCropper: info => (avatarInfo.value = info)
}), }),
beforeSure: done => { beforeSure: done => {