This commit is contained in:
陈红丽 2024-12-21 15:52:06 +08:00
parent b1135d2d4d
commit 044ae4ccd9
2 changed files with 5 additions and 10 deletions

View File

@ -97,9 +97,6 @@
fileSize: { fileSize: {
default: 200, default: 200,
}, },
orderNo: {
default: '',
},
fileType: { fileType: {
default: '', default: '',
}, },
@ -191,7 +188,7 @@
let second: string | number = date.getSeconds(); let second: string | number = date.getSeconds();
second = second < 10 ? '0' + second : second; second = second < 10 ? '0' + second : second;
let time = h + '' + minute + '' + second; let time = h + '' + minute + '' + second;
let fileName = (props.orderNo ? time + '-' + props.orderNo : time) + '-' + options.file.name; let fileName = time + '-' + options.file.name;
fileName = fileName.replace(/[\+\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\<\>\?]/g, ''); fileName = fileName.replace(/[\+\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\<\>\?]/g, '');
let filePath = props.name + '/' + year + '/' + month + '/' + day + '/' + fileName; let filePath = props.name + '/' + year + '/' + month + '/' + day + '/' + fileName;
loading.value = true; loading.value = true;

View File

@ -94,9 +94,6 @@
fileSize: { fileSize: {
default: 200, default: 200,
}, },
orderNo: {
default: '',
},
fileType: { fileType: {
default: '', default: '',
}, },
@ -209,17 +206,18 @@
// headers, // headers,
mime: options.file.type, mime: options.file.type,
}); });
const fileUrl = configData.oss_domain + res.name;
if (props.multiple) { if (props.multiple) {
let list = JSON.parse(JSON.stringify(props.fileList)); let list = JSON.parse(JSON.stringify(props.fileList));
list.push({ list.push({
url: res.res.requestUrls[0], url: fileUrl,
name: options.file.name, name: options.file.name,
filePath: res.res.requestUrls[0], filePath: fileUrl,
fileName: options.file.name, fileName: options.file.name,
}); });
emit('upload', list, props.zIndex); emit('upload', list, props.zIndex);
} else { } else {
emit('upload', res.res.requestUrls[0], options.file.name, props.zIndex); emit('upload', fileUrl, options.file.name, props.zIndex);
} }
} catch (error) { } catch (error) {
ElNotification({ ElNotification({