github/cool-admin-vue
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-vue.git synced 2025-12-13 06:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

解决文件上传 autoUpload 参数错误问题

Browse Source
This commit is contained in:
icssoa 2023-12-17 17:47:04 +08:00
parent 1ab8562123
commit 43fdb3034b
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/extend/excel/import-btn.vue
View File

@ -174,7 +174,7 @@ function onUpload(raw: File, _: any, { next }: any) {
next(); next();
return true; return false;
} }
// 下载模版 // 下载模版

32
src/modules/upload/components/upload.vue
View File

@ -294,7 +294,7 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
size: file.size, size: file.size,
name: file.name, name: file.name,
type: getType(file.name), type: getType(file.name),
progress: 0, progress: props.autoUpload ? 0 : 100, // 非自动上传时默认100%
url: "", url: "",
preload: "", preload: "",
error: "" error: ""
@ -310,24 +310,20 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
// 上传事件 // 上传事件
emit("upload", d, file); emit("upload", d, file);
// 是否自动上传 // 赋值
if (props.autoUpload) { if (item) {
// 赋值 Object.assign(item, d);
if (item) { } else {
Object.assign(item, d); if (props.multiple) {
} else { if (!isAdd.value) {
if (props.multiple) { ElMessage.warning(`最多只能上传${limit}个文件`);
if (!isAdd.value) { return false;
ElMessage.warning(`最多只能上传${limit.value}个文件`);
} else {
list.value.push(d);
}
} else { } else {
list.value = [d]; list.value.push(d);
} }
} else {
list.value = [d];
} }
return true;
} }
return true; return true;
@ -335,13 +331,13 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
// 自定义上传事件 // 自定义上传事件
if (props.beforeUpload) { if (props.beforeUpload) {
const r = props.beforeUpload(file, item, { next }); let r = props.beforeUpload(file, item, { next });
if (isPromise(r)) { if (isPromise(r)) {
r.then(next).catch(() => null); r.then(next).catch(() => null);
} else { } else {
if (r) { if (r) {
next(); r = next();
} }
} }