Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/upload #205

Merged
merged 2 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/upload/demos/baseMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:on-preview="onPreview"
:on-success="onSuccess"
:on-remove="onRemove"
:on-select-change="onSelectChange"
>
</t-upload>
</t-cell-group>
Expand Down Expand Up @@ -44,6 +45,9 @@ export default defineComponent({
const onRemove = ({ index, file, e }: UploadRemoveContext) => {
console.log('====onRemove', index, file, e);
};
const onSelectChange = (files: Array<UploadFile>) => {
console.log('====onSelectChange', files);
};
const action = 'https://service-bv448zsw-1257786608.gz.apigw.tencentcs.com/api/upload-demo';
const max = 10;
return {
Expand All @@ -55,6 +59,7 @@ export default defineComponent({
onSuccess,
onRemove,
onProgress,
onSelectChange,
};
},
});
Expand Down
5 changes: 5 additions & 0 deletions src/upload/demos/baseSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
:on-preview="onPreview"
:on-success="onSuccess"
:on-remove="onRemove"
:on-select-change="onSelectChange"
>
</t-upload>
</t-cell-group>
Expand Down Expand Up @@ -41,6 +42,9 @@ export default defineComponent({
const onRemove = ({ index, file, e }: UploadRemoveContext) => {
console.log('====onRemove', index, file, e);
};
const onSelectChange = (files: Array<UploadFile>) => {
console.log('====onSelectChange', files);
};
const action = 'https://service-bv448zsw-1257786608.gz.apigw.tencentcs.com/api/upload-demo';
return {
action,
Expand All @@ -50,6 +54,7 @@ export default defineComponent({
onSuccess,
onRemove,
onProgress,
onSelectChange,
};
},
});
Expand Down
6 changes: 6 additions & 0 deletions src/upload/demos/mobile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
:on-preview="onPreview"
:on-success="onSuccess"
:on-remove="onRemove"
:on-select-change="onSelectChange"
>
</t-upload>
<div class="upload-title">多选上传图片</div>
Expand All @@ -28,6 +29,7 @@
:on-preview="onPreview"
:on-success="onSuccess"
:on-remove="onRemove"
:on-select-change="onSelectChange"
>
</t-upload>
</div>
Expand Down Expand Up @@ -65,6 +67,9 @@ export default defineComponent({
const onRemove = ({ index, file, e }: UploadRemoveContext) => {
console.log('====onRemove', index, file, e);
};
const onSelectChange = (files: Array<UploadFile>) => {
console.log('====onSelectChange', files);
};
const action = 'https://service-bv448zsw-1257786608.gz.apigw.tencentcs.com/api/upload-demo';
// const action = 'www';
const max = 10;
Expand All @@ -79,6 +84,7 @@ export default defineComponent({
onRemove,
onProgress,
gridConfig,
onSelectChange,
};
},
});
Expand Down
24 changes: 20 additions & 4 deletions src/upload/upload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,17 @@ export default defineComponent({
RefreshIcon,
},
props,
emits: ['update:files', 'update:modelValue', 'change', 'fail', 'preview', 'progress', 'remove', 'success'],
emits: [
'update:files',
'update:modelValue',
'change',
'fail',
'preview',
'progress',
'remove',
'success',
'select-change',
],
setup(props: any, context: SetupContext) {
const emitEvent = useEmitEvent(props, context.emit);
const [innerFiles, setInnerFiles] = useDefault<TdUploadProps['files'], TdUploadProps>(
Expand Down Expand Up @@ -148,7 +158,9 @@ export default defineComponent({
const { files } = <HTMLInputElement>event.target;
if (props.disabled || !files) return;
const input = <HTMLInputElement>inputRef.value;
uploadFiles(formatFileToUploadFile(files));
const formatFiles = formatFileToUploadFile(files);
emitEvent('select-change', [...formatFiles]);
uploadFiles(formatFiles);
input.value = '';
};

Expand Down Expand Up @@ -221,8 +233,12 @@ export default defineComponent({
handleBeforeUpload(fileRaw).then((canUpload) => {
if (!canUpload) return;
const newFiles: Array<UploadFile> = toUploadFiles.value.concat();
newFiles.push(uploadFile);
toUploadFiles.value = [...new Set(newFiles)];

// 判断是否为重复文件条件,已选是否存在检验
if (props.allowUploadDuplicateFile || !toUploadFiles.value.find((file) => file.name === uploadFile.name)) {
newFiles.push(uploadFile);
}
toUploadFiles.value = newFiles;
if (props.autoUpload) {
upload(uploadFile);
}
Expand Down