Browse Source

feat: antd Upload 组件上传文件组支持拖拽排序

pull/7672/head
吉远 1 week ago
parent
commit
4b3205fee8
  1. 255
      apps/web-antd/src/adapter/component/index.ts
  2. 255
      playground/src/adapter/component/index.ts
  3. 6
      playground/src/views/examples/form/basic.vue

255
apps/web-antd/src/adapter/component/index.ts

@ -14,6 +14,7 @@ import type {
import type { Component, Ref } from 'vue'; import type { Component, Ref } from 'vue';
import type { BaseFormComponentType } from '@vben/common-ui'; import type { BaseFormComponentType } from '@vben/common-ui';
import type { Sortable } from '@vben/hooks';
import type { Recordable } from '@vben/types'; import type { Recordable } from '@vben/types';
import { import {
@ -21,6 +22,9 @@ import {
defineAsyncComponent, defineAsyncComponent,
defineComponent, defineComponent,
h, h,
nextTick,
onMounted,
onUnmounted,
ref, ref,
render, render,
unref, unref,
@ -33,6 +37,7 @@ import {
IconPicker, IconPicker,
VCropper, VCropper,
} from '@vben/common-ui'; } from '@vben/common-ui';
import { useSortable } from '@vben/hooks';
import { IconifyIcon } from '@vben/icons'; import { IconifyIcon } from '@vben/icons';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { isEmpty } from '@vben/utils'; import { isEmpty } from '@vben/utils';
@ -126,10 +131,7 @@ const withDefaultPlaceholder = <T extends Component>(
}); });
}; };
const withPreviewUpload = () => { const IMAGE_EXTENSIONS = new Set([
// 检查是否为图片文件的辅助函数
const isImageFile = (file: UploadFile): boolean => {
const imageExtensions = new Set([
'bmp', 'bmp',
'gif', 'gif',
'jpeg', 'jpeg',
@ -137,35 +139,36 @@ const withPreviewUpload = () => {
'png', 'png',
'svg', 'svg',
'webp', 'webp',
]); ]);
/**
*
*/
function isImageFile(file: UploadFile): boolean {
if (file.url) { if (file.url) {
try { try {
const pathname = new URL(file.url, 'http://localhost').pathname; const pathname = new URL(file.url, 'http://localhost').pathname;
const ext = pathname.split('.').pop()?.toLowerCase(); const ext = pathname.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} catch { } catch {
const ext = file.url?.split('.').pop()?.toLowerCase(); const ext = file.url?.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} }
} }
if (!file.type) { if (!file.type) {
const ext = file.name?.split('.').pop()?.toLowerCase(); const ext = file.name?.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} }
return file.type.startsWith('image/'); return file.type.startsWith('image/');
}; }
// 创建默认的上传按钮插槽
const createDefaultSlotsWithUpload = ( /**
listType: string, *
placeholder: string, */
) => { function createDefaultUploadSlots(listType: string, placeholder: string) {
switch (listType) { if (listType === 'picture-card') {
case 'picture-card': { return { default: () => placeholder };
return {
default: () => placeholder,
};
} }
default: {
return { return {
default: () => default: () =>
h( h(
@ -179,58 +182,59 @@ const withPreviewUpload = () => {
() => placeholder, () => placeholder,
), ),
}; };
} }
}
}; /**
// 构建预览图片组 * Base64
const previewImage = async ( */
function getBase64(file: File): Promise<string> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.addEventListener('load', () => resolve(reader.result as string));
reader.addEventListener('error', reject);
});
}
/**
*
*/
async function previewImage(
file: UploadFile, file: UploadFile,
visible: Ref<boolean>, visible: Ref<boolean>,
fileList: Ref<UploadProps['fileList']>, fileList: Ref<UploadProps['fileList']>,
) => { ) {
// 如果当前文件不是图片,直接打开 // 非图片文件直接打开链接
if (!isImageFile(file)) { if (!isImageFile(file)) {
if (file.url) { const url = file.url || file.preview;
window.open(file.url, '_blank'); if (url) {
} else if (file.preview) { window.open(url, '_blank');
window.open(file.preview, '_blank');
} else { } else {
message.error($t('ui.formRules.previewWarning')); message.error($t('ui.formRules.previewWarning'));
} }
return; return;
} }
// 对于图片文件,继续使用预览组
const [ImageComponent, PreviewGroupComponent] = await Promise.all([ const [ImageComponent, PreviewGroupComponent] = await Promise.all([
Image, Image,
PreviewGroup, PreviewGroup,
]); ]);
const getBase64 = (file: File) => { // 过滤图片文件并生成预览
return new Promise((resolve, reject) => { const imageFiles = (unref(fileList) || []).filter((f) => isImageFile(f));
const reader = new FileReader();
reader.readAsDataURL(file);
reader.addEventListener('load', () => resolve(reader.result));
reader.addEventListener('error', (error) => reject(error));
});
};
// 从fileList中过滤出所有图片文件
const imageFiles = (unref(fileList) || []).filter((element) =>
isImageFile(element),
);
// 为所有没有预览地址的图片生成预览
for (const imgFile of imageFiles) { for (const imgFile of imageFiles) {
if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) { if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) {
imgFile.preview = (await getBase64(imgFile.originFileObj)) as string; imgFile.preview = await getBase64(imgFile.originFileObj);
} }
} }
const container: HTMLElement | null = document.createElement('div');
document.body.append(container);
// 用于追踪组件是否已卸载 const container = document.createElement('div');
document.body.append(container);
let isUnmounted = false; let isUnmounted = false;
const currentIndex = imageFiles.findIndex((f) => f.uid === file.uid);
const PreviewWrapper = { const PreviewWrapper = {
setup() { setup() {
return () => { return () => {
@ -241,12 +245,10 @@ const withPreviewUpload = () => {
class: 'hidden', class: 'hidden',
preview: { preview: {
visible: visible.value, visible: visible.value,
// 设置初始显示的图片索引 current: currentIndex,
current: imageFiles.findIndex((f) => f.uid === file.uid),
onVisibleChange: (value: boolean) => { onVisibleChange: (value: boolean) => {
visible.value = value; visible.value = value;
if (!value) { if (!value) {
// 延迟清理,确保动画完成
setTimeout(() => { setTimeout(() => {
if (!isUnmounted && container) { if (!isUnmounted && container) {
isUnmounted = true; isUnmounted = true;
@ -259,7 +261,6 @@ const withPreviewUpload = () => {
}, },
}, },
() => () =>
// 渲染所有图片文件
imageFiles.map((imgFile) => imageFiles.map((imgFile) =>
h(ImageComponent, { h(ImageComponent, {
key: imgFile.uid, key: imgFile.uid,
@ -272,15 +273,16 @@ const withPreviewUpload = () => {
}; };
render(h(PreviewWrapper), container); render(h(PreviewWrapper), container);
}; }
// 图片裁剪操作 /**
const cropImage = (file: File, aspectRatio: string | undefined) => { *
return new Promise((resolve, reject) => { */
const container: HTMLElement | null = document.createElement('div'); function cropImage(file: File, aspectRatio: string | undefined) {
return new Promise<Blob | string | undefined>((resolve, reject) => {
const container = document.createElement('div');
document.body.append(container); document.body.append(container);
// 用于追踪组件是否已卸载
let isUnmounted = false; let isUnmounted = false;
let objectUrl: null | string = null; let objectUrl: null | string = null;
@ -289,7 +291,6 @@ const withPreviewUpload = () => {
const closeModal = () => { const closeModal = () => {
open.value = false; open.value = false;
// 延迟清理,确保动画完成
setTimeout(() => { setTimeout(() => {
if (!isUnmounted && container) { if (!isUnmounted && container) {
if (objectUrl) { if (objectUrl) {
@ -340,7 +341,11 @@ const withPreviewUpload = () => {
} }
try { try {
const dataUrl = await cropper.getCropImage(); const dataUrl = await cropper.getCropImage();
if (dataUrl) {
resolve(dataUrl); resolve(dataUrl);
} else {
reject(new Error($t('ui.crop.errorTip')));
}
} catch { } catch {
reject(new Error($t('ui.crop.errorTip'))); reject(new Error($t('ui.crop.errorTip')));
} finally { } finally {
@ -365,21 +370,22 @@ const withPreviewUpload = () => {
render(h(CropperWrapper), container); render(h(CropperWrapper), container);
}); });
}; }
/**
*
*/
const withPreviewUpload = () => {
return defineComponent({ return defineComponent({
name: Upload.name, name: Upload.name,
emits: ['update:modelValue'], emits: ['update:modelValue'],
setup: ( setup(
props: any, props: any,
{ attrs, slots, emit }: { attrs: any; emit: any; slots: any }, { attrs, slots, emit }: { attrs: any; emit: any; slots: any },
) => { ) {
const previewVisible = ref<boolean>(false); const previewVisible = ref<boolean>(false);
const placeholder = attrs?.placeholder || $t('ui.placeholder.upload');
const placeholder = attrs?.placeholder || $t(`ui.placeholder.upload`);
const listType = attrs?.listType || attrs?.['list-type'] || 'text'; const listType = attrs?.listType || attrs?.['list-type'] || 'text';
const fileList = ref<UploadProps['fileList']>( const fileList = ref<UploadProps['fileList']>(
attrs?.fileList || attrs?.['file-list'] || [], attrs?.fileList || attrs?.['file-list'] || [],
); );
@ -393,12 +399,14 @@ const withPreviewUpload = () => {
file: UploadFile, file: UploadFile,
originFileList: Array<File>, originFileList: Array<File>,
) => { ) => {
// 文件大小限制
if (maxSize.value && (file.size || 0) / 1024 / 1024 > maxSize.value) { if (maxSize.value && (file.size || 0) / 1024 / 1024 > maxSize.value) {
message.error($t('ui.formRules.sizeLimit', [maxSize.value])); message.error($t('ui.formRules.sizeLimit', [maxSize.value]));
file.status = 'removed'; file.status = 'removed';
return false; return false;
} }
// 多选或者非图片不唤起裁剪框
// 图片裁剪处理
if ( if (
attrs.crop && attrs.crop &&
!attrs.multiple && !attrs.multiple &&
@ -406,14 +414,11 @@ const withPreviewUpload = () => {
isImageFile(file) isImageFile(file)
) { ) {
file.status = 'removed'; file.status = 'removed';
// antd Upload组件问题 file参数获取的是UploadFile类型对象无法取到File类型 所以通过originFileList[0]获取
const blob = await cropImage(originFileList[0], aspectRatio.value); const blob = await cropImage(originFileList[0], aspectRatio.value);
return new Promise((resolve, reject) => {
if (!blob) { if (!blob) {
return reject(new Error($t('ui.crop.errorTip'))); throw new Error($t('ui.crop.errorTip'));
} }
resolve(blob); return blob;
});
} }
return attrs.beforeUpload?.(file) ?? true; return attrs.beforeUpload?.(file) ?? true;
@ -421,12 +426,9 @@ const withPreviewUpload = () => {
const handleChange = (event: UploadChangeParam) => { const handleChange = (event: UploadChangeParam) => {
try { try {
// 行内写法 handleChange: (event) => {}
attrs.handleChange?.(event); attrs.handleChange?.(event);
// template写法 @handle-change="(event) => {}"
attrs.onHandleChange?.(event); attrs.onHandleChange?.(event);
} catch (error) { } catch (error) {
// Avoid breaking internal v-model sync on user handler errors
console.error(error); console.error(error);
} }
fileList.value = event.fileList.filter( fileList.value = event.fileList.filter(
@ -443,21 +445,88 @@ const withPreviewUpload = () => {
await previewImage(file, previewVisible, fileList); await previewImage(file, previewVisible, fileList);
}; };
const renderUploadButton = (): any => { const renderUploadButton = () => {
const isDisabled = attrs.disabled; if (attrs.disabled) return null;
// 如果禁用,不渲染上传按钮
if (isDisabled) {
return null;
}
// 否则渲染默认上传按钮
return isEmpty(slots) return isEmpty(slots)
? createDefaultSlotsWithUpload(listType, placeholder) ? createDefaultUploadSlots(listType, placeholder)
: slots; : slots;
}; };
// 可以监听到表单API设置的值 // 拖拽排序
const draggable = computed(
() => (attrs.draggable ?? false) && !attrs.disabled,
);
const uploadId = `upload-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
const sortableInstance = ref<null | Sortable>(null);
const styleId = `upload-drag-style-${uploadId}`;
function injectDragStyle() {
if (!document.querySelector(`[id="${styleId}"]`)) {
const style = document.createElement('style');
style.id = styleId;
style.textContent = `
[data-upload-id="${uploadId}"] .ant-upload-list-item { cursor: move; }
[data-upload-id="${uploadId}"] .ant-upload-list-item:hover { box-shadow: 0 2px 8px rgba(0,0,0,0.15); }
`;
document.head.append(style);
}
}
function removeDragStyle() {
document.querySelector(`[id="${styleId}"]`)?.remove();
}
async function initSortable(retryCount = 0) {
if (!draggable.value) return;
injectDragStyle();
await nextTick();
await new Promise((resolve) => setTimeout(resolve, 100));
const container = document.querySelector(
`[data-upload-id="${uploadId}"] .ant-upload-list`,
) as HTMLElement;
if (!container) {
if (retryCount < 5) {
setTimeout(() => initSortable(retryCount + 1), 200);
}
return;
}
const { initializeSortable } = useSortable(container, {
animation: 300,
delay: 400,
delayOnTouchOnly: true,
filter:
'.ant-upload-select, .ant-upload-list-item-error, .ant-upload-list-item-uploading',
onEnd: (evt) => {
const { oldIndex, newIndex } = evt;
if (
oldIndex === undefined ||
newIndex === undefined ||
oldIndex === newIndex
) {
return;
}
const list = [...(fileList.value || [])];
const [movedItem] = list.splice(oldIndex, 1);
if (movedItem) {
list.splice(newIndex, 0, movedItem);
fileList.value = list;
}
attrs.onDragSort?.(oldIndex, newIndex);
emit('update:modelValue', fileList.value);
},
});
sortableInstance.value = await initializeSortable();
}
// 监听表单值变化
watch( watch(
() => attrs.modelValue, () => attrs.modelValue,
(res) => { (res) => {
@ -465,7 +534,16 @@ const withPreviewUpload = () => {
}, },
); );
onMounted(initSortable);
onUnmounted(() => {
sortableInstance.value?.destroy();
removeDragStyle();
});
return () => return () =>
h(
'div',
{ 'data-upload-id': uploadId, class: 'w-full' },
h( h(
Upload, Upload,
{ {
@ -476,7 +554,8 @@ const withPreviewUpload = () => {
onChange: handleChange, onChange: handleChange,
onPreview: handlePreview, onPreview: handlePreview,
}, },
renderUploadButton(), renderUploadButton() as any,
),
); );
}, },
}); });

255
playground/src/adapter/component/index.ts

@ -14,6 +14,7 @@ import type {
import type { Component, Ref } from 'vue'; import type { Component, Ref } from 'vue';
import type { BaseFormComponentType } from '@vben/common-ui'; import type { BaseFormComponentType } from '@vben/common-ui';
import type { Sortable } from '@vben/hooks';
import type { Recordable } from '@vben/types'; import type { Recordable } from '@vben/types';
import { import {
@ -21,6 +22,9 @@ import {
defineAsyncComponent, defineAsyncComponent,
defineComponent, defineComponent,
h, h,
nextTick,
onMounted,
onUnmounted,
ref, ref,
render, render,
unref, unref,
@ -33,6 +37,7 @@ import {
IconPicker, IconPicker,
VCropper, VCropper,
} from '@vben/common-ui'; } from '@vben/common-ui';
import { useSortable } from '@vben/hooks';
import { IconifyIcon } from '@vben/icons'; import { IconifyIcon } from '@vben/icons';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { isEmpty } from '@vben/utils'; import { isEmpty } from '@vben/utils';
@ -126,10 +131,7 @@ const withDefaultPlaceholder = <T extends Component>(
}); });
}; };
const withPreviewUpload = () => { const IMAGE_EXTENSIONS = new Set([
// 检查是否为图片文件的辅助函数
const isImageFile = (file: UploadFile): boolean => {
const imageExtensions = new Set([
'bmp', 'bmp',
'gif', 'gif',
'jpeg', 'jpeg',
@ -137,35 +139,36 @@ const withPreviewUpload = () => {
'png', 'png',
'svg', 'svg',
'webp', 'webp',
]); ]);
/**
*
*/
function isImageFile(file: UploadFile): boolean {
if (file.url) { if (file.url) {
try { try {
const pathname = new URL(file.url, 'http://localhost').pathname; const pathname = new URL(file.url, 'http://localhost').pathname;
const ext = pathname.split('.').pop()?.toLowerCase(); const ext = pathname.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} catch { } catch {
const ext = file.url?.split('.').pop()?.toLowerCase(); const ext = file.url?.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} }
} }
if (!file.type) { if (!file.type) {
const ext = file.name?.split('.').pop()?.toLowerCase(); const ext = file.name?.split('.').pop()?.toLowerCase();
return ext ? imageExtensions.has(ext) : false; return ext ? IMAGE_EXTENSIONS.has(ext) : false;
} }
return file.type.startsWith('image/'); return file.type.startsWith('image/');
}; }
// 创建默认的上传按钮插槽
const createDefaultSlotsWithUpload = ( /**
listType: string, *
placeholder: string, */
) => { function createDefaultUploadSlots(listType: string, placeholder: string) {
switch (listType) { if (listType === 'picture-card') {
case 'picture-card': { return { default: () => placeholder };
return {
default: () => placeholder,
};
} }
default: {
return { return {
default: () => default: () =>
h( h(
@ -179,58 +182,59 @@ const withPreviewUpload = () => {
() => placeholder, () => placeholder,
), ),
}; };
} }
}
}; /**
// 构建预览图片组 * Base64
const previewImage = async ( */
function getBase64(file: File): Promise<string> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.addEventListener('load', () => resolve(reader.result as string));
reader.addEventListener('error', reject);
});
}
/**
*
*/
async function previewImage(
file: UploadFile, file: UploadFile,
visible: Ref<boolean>, visible: Ref<boolean>,
fileList: Ref<UploadProps['fileList']>, fileList: Ref<UploadProps['fileList']>,
) => { ) {
// 如果当前文件不是图片,直接打开 // 非图片文件直接打开链接
if (!isImageFile(file)) { if (!isImageFile(file)) {
if (file.url) { const url = file.url || file.preview;
window.open(file.url, '_blank'); if (url) {
} else if (file.preview) { window.open(url, '_blank');
window.open(file.preview, '_blank');
} else { } else {
message.error($t('ui.formRules.previewWarning')); message.error($t('ui.formRules.previewWarning'));
} }
return; return;
} }
// 对于图片文件,继续使用预览组
const [ImageComponent, PreviewGroupComponent] = await Promise.all([ const [ImageComponent, PreviewGroupComponent] = await Promise.all([
Image, Image,
PreviewGroup, PreviewGroup,
]); ]);
const getBase64 = (file: File) => { // 过滤图片文件并生成预览
return new Promise((resolve, reject) => { const imageFiles = (unref(fileList) || []).filter((f) => isImageFile(f));
const reader = new FileReader();
reader.readAsDataURL(file);
reader.addEventListener('load', () => resolve(reader.result));
reader.addEventListener('error', (error) => reject(error));
});
};
// 从fileList中过滤出所有图片文件
const imageFiles = (unref(fileList) || []).filter((element) =>
isImageFile(element),
);
// 为所有没有预览地址的图片生成预览
for (const imgFile of imageFiles) { for (const imgFile of imageFiles) {
if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) { if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) {
imgFile.preview = (await getBase64(imgFile.originFileObj)) as string; imgFile.preview = await getBase64(imgFile.originFileObj);
} }
} }
const container: HTMLElement | null = document.createElement('div');
document.body.append(container);
// 用于追踪组件是否已卸载 const container = document.createElement('div');
document.body.append(container);
let isUnmounted = false; let isUnmounted = false;
const currentIndex = imageFiles.findIndex((f) => f.uid === file.uid);
const PreviewWrapper = { const PreviewWrapper = {
setup() { setup() {
return () => { return () => {
@ -241,12 +245,10 @@ const withPreviewUpload = () => {
class: 'hidden', class: 'hidden',
preview: { preview: {
visible: visible.value, visible: visible.value,
// 设置初始显示的图片索引 current: currentIndex,
current: imageFiles.findIndex((f) => f.uid === file.uid),
onVisibleChange: (value: boolean) => { onVisibleChange: (value: boolean) => {
visible.value = value; visible.value = value;
if (!value) { if (!value) {
// 延迟清理,确保动画完成
setTimeout(() => { setTimeout(() => {
if (!isUnmounted && container) { if (!isUnmounted && container) {
isUnmounted = true; isUnmounted = true;
@ -259,7 +261,6 @@ const withPreviewUpload = () => {
}, },
}, },
() => () =>
// 渲染所有图片文件
imageFiles.map((imgFile) => imageFiles.map((imgFile) =>
h(ImageComponent, { h(ImageComponent, {
key: imgFile.uid, key: imgFile.uid,
@ -272,15 +273,16 @@ const withPreviewUpload = () => {
}; };
render(h(PreviewWrapper), container); render(h(PreviewWrapper), container);
}; }
// 图片裁剪操作 /**
const cropImage = (file: File, aspectRatio: string | undefined) => { *
return new Promise((resolve, reject) => { */
const container: HTMLElement | null = document.createElement('div'); function cropImage(file: File, aspectRatio: string | undefined) {
return new Promise<Blob | string | undefined>((resolve, reject) => {
const container = document.createElement('div');
document.body.append(container); document.body.append(container);
// 用于追踪组件是否已卸载
let isUnmounted = false; let isUnmounted = false;
let objectUrl: null | string = null; let objectUrl: null | string = null;
@ -289,7 +291,6 @@ const withPreviewUpload = () => {
const closeModal = () => { const closeModal = () => {
open.value = false; open.value = false;
// 延迟清理,确保动画完成
setTimeout(() => { setTimeout(() => {
if (!isUnmounted && container) { if (!isUnmounted && container) {
if (objectUrl) { if (objectUrl) {
@ -340,7 +341,11 @@ const withPreviewUpload = () => {
} }
try { try {
const dataUrl = await cropper.getCropImage(); const dataUrl = await cropper.getCropImage();
if (dataUrl) {
resolve(dataUrl); resolve(dataUrl);
} else {
reject(new Error($t('ui.crop.errorTip')));
}
} catch { } catch {
reject(new Error($t('ui.crop.errorTip'))); reject(new Error($t('ui.crop.errorTip')));
} finally { } finally {
@ -365,21 +370,22 @@ const withPreviewUpload = () => {
render(h(CropperWrapper), container); render(h(CropperWrapper), container);
}); });
}; }
/**
*
*/
const withPreviewUpload = () => {
return defineComponent({ return defineComponent({
name: Upload.name, name: Upload.name,
emits: ['update:modelValue'], emits: ['update:modelValue'],
setup: ( setup(
props: any, props: any,
{ attrs, slots, emit }: { attrs: any; emit: any; slots: any }, { attrs, slots, emit }: { attrs: any; emit: any; slots: any },
) => { ) {
const previewVisible = ref<boolean>(false); const previewVisible = ref<boolean>(false);
const placeholder = attrs?.placeholder || $t('ui.placeholder.upload');
const placeholder = attrs?.placeholder || $t(`ui.placeholder.upload`);
const listType = attrs?.listType || attrs?.['list-type'] || 'text'; const listType = attrs?.listType || attrs?.['list-type'] || 'text';
const fileList = ref<UploadProps['fileList']>( const fileList = ref<UploadProps['fileList']>(
attrs?.fileList || attrs?.['file-list'] || [], attrs?.fileList || attrs?.['file-list'] || [],
); );
@ -393,12 +399,14 @@ const withPreviewUpload = () => {
file: UploadFile, file: UploadFile,
originFileList: Array<File>, originFileList: Array<File>,
) => { ) => {
// 文件大小限制
if (maxSize.value && (file.size || 0) / 1024 / 1024 > maxSize.value) { if (maxSize.value && (file.size || 0) / 1024 / 1024 > maxSize.value) {
message.error($t('ui.formRules.sizeLimit', [maxSize.value])); message.error($t('ui.formRules.sizeLimit', [maxSize.value]));
file.status = 'removed'; file.status = 'removed';
return false; return false;
} }
// 多选或者非图片不唤起裁剪框
// 图片裁剪处理
if ( if (
attrs.crop && attrs.crop &&
!attrs.multiple && !attrs.multiple &&
@ -406,14 +414,11 @@ const withPreviewUpload = () => {
isImageFile(file) isImageFile(file)
) { ) {
file.status = 'removed'; file.status = 'removed';
// antd Upload组件问题 file参数获取的是UploadFile类型对象无法取到File类型 所以通过originFileList[0]获取
const blob = await cropImage(originFileList[0], aspectRatio.value); const blob = await cropImage(originFileList[0], aspectRatio.value);
return new Promise((resolve, reject) => {
if (!blob) { if (!blob) {
return reject(new Error($t('ui.crop.errorTip'))); throw new Error($t('ui.crop.errorTip'));
} }
resolve(blob); return blob;
});
} }
return attrs.beforeUpload?.(file) ?? true; return attrs.beforeUpload?.(file) ?? true;
@ -421,12 +426,9 @@ const withPreviewUpload = () => {
const handleChange = (event: UploadChangeParam) => { const handleChange = (event: UploadChangeParam) => {
try { try {
// 行内写法 handleChange: (event) => {}
attrs.handleChange?.(event); attrs.handleChange?.(event);
// template写法 @handle-change="(event) => {}"
attrs.onHandleChange?.(event); attrs.onHandleChange?.(event);
} catch (error) { } catch (error) {
// Avoid breaking internal v-model sync on user handler errors
console.error(error); console.error(error);
} }
fileList.value = event.fileList.filter( fileList.value = event.fileList.filter(
@ -443,21 +445,88 @@ const withPreviewUpload = () => {
await previewImage(file, previewVisible, fileList); await previewImage(file, previewVisible, fileList);
}; };
const renderUploadButton = (): any => { const renderUploadButton = () => {
const isDisabled = attrs.disabled; if (attrs.disabled) return null;
// 如果禁用,不渲染上传按钮
if (isDisabled) {
return null;
}
// 否则渲染默认上传按钮
return isEmpty(slots) return isEmpty(slots)
? createDefaultSlotsWithUpload(listType, placeholder) ? createDefaultUploadSlots(listType, placeholder)
: slots; : slots;
}; };
// 可以监听到表单API设置的值 // 拖拽排序
const draggable = computed(
() => (attrs.draggable ?? false) && !attrs.disabled,
);
const uploadId = `upload-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
const sortableInstance = ref<null | Sortable>(null);
const styleId = `upload-drag-style-${uploadId}`;
function injectDragStyle() {
if (!document.querySelector(`[id="${styleId}"]`)) {
const style = document.createElement('style');
style.id = styleId;
style.textContent = `
[data-upload-id="${uploadId}"] .ant-upload-list-item { cursor: move; }
[data-upload-id="${uploadId}"] .ant-upload-list-item:hover { box-shadow: 0 2px 8px rgba(0,0,0,0.15); }
`;
document.head.append(style);
}
}
function removeDragStyle() {
document.querySelector(`[id="${styleId}"]`)?.remove();
}
async function initSortable(retryCount = 0) {
if (!draggable.value) return;
injectDragStyle();
await nextTick();
await new Promise((resolve) => setTimeout(resolve, 100));
const container = document.querySelector(
`[data-upload-id="${uploadId}"] .ant-upload-list`,
) as HTMLElement;
if (!container) {
if (retryCount < 5) {
setTimeout(() => initSortable(retryCount + 1), 200);
}
return;
}
const { initializeSortable } = useSortable(container, {
animation: 300,
delay: 400,
delayOnTouchOnly: true,
filter:
'.ant-upload-select, .ant-upload-list-item-error, .ant-upload-list-item-uploading',
onEnd: (evt) => {
const { oldIndex, newIndex } = evt;
if (
oldIndex === undefined ||
newIndex === undefined ||
oldIndex === newIndex
) {
return;
}
const list = [...(fileList.value || [])];
const [movedItem] = list.splice(oldIndex, 1);
if (movedItem) {
list.splice(newIndex, 0, movedItem);
fileList.value = list;
}
attrs.onDragSort?.(oldIndex, newIndex);
emit('update:modelValue', fileList.value);
},
});
sortableInstance.value = await initializeSortable();
}
// 监听表单值变化
watch( watch(
() => attrs.modelValue, () => attrs.modelValue,
(res) => { (res) => {
@ -465,7 +534,16 @@ const withPreviewUpload = () => {
}, },
); );
onMounted(initSortable);
onUnmounted(() => {
sortableInstance.value?.destroy();
removeDragStyle();
});
return () => return () =>
h(
'div',
{ 'data-upload-id': uploadId, class: 'w-full' },
h( h(
Upload, Upload,
{ {
@ -476,7 +554,8 @@ const withPreviewUpload = () => {
onChange: handleChange, onChange: handleChange,
onPreview: handlePreview, onPreview: handlePreview,
}, },
renderUploadButton(), renderUploadButton() as any,
),
); );
}, },
}); });

6
playground/src/views/examples/form/basic.vue

@ -348,13 +348,14 @@ const [BaseForm, baseFormApi] = useVbenForm({
// //
customRequest: upload_file, customRequest: upload_file,
disabled: false, disabled: false,
maxCount: 1, maxCount: 3,
// MB // MB
maxSize: 2, maxSize: 2,
multiple: false, multiple: false,
showUploadList: true, showUploadList: true,
// text, picture, picture-card picture-circle // text, picture, picture-card picture-circle
listType: 'picture-card', listType: 'picture-card',
draggable: true, //
// onChange // onChange
handleChange: ({ file }: { file: UploadFile }) => { handleChange: ({ file }: { file: UploadFile }) => {
const { name, status } = file; const { name, status } = file;
@ -364,6 +365,9 @@ const [BaseForm, baseFormApi] = useVbenForm({
message.error(`${name} ${$t('examples.form.upload-fail')}`); message.error(`${name} ${$t('examples.form.upload-fail')}`);
} }
}, },
onDragSort: (oldIndex: number, newIndex: number) => {
console.info(`图片从 ${oldIndex} 移动到 ${newIndex}`);
},
}, },
fieldName: 'files', fieldName: 'files',
label: $t('examples.form.file'), label: $t('examples.form.file'),

Loading…
Cancel
Save