diff --git a/src/uploader/index.js b/src/uploader/index.js index 268529747..b9a1a8b3c 100644 --- a/src/uploader/index.js +++ b/src/uploader/index.js @@ -200,52 +200,61 @@ export default createComponent({ this.$emit('click-preview', file, this.detail); }, - renderPreview() { - if (!this.previewImage) { - return; - } + renderPreviewItem(item, index) { + const DeleteIcon = ( + { + event.stopPropagation(); + this.onDelete(item, index); + }} + /> + ); - return this.fileList.map((item, index) => ( + const Preview = isImageFile(item) ? ( + { + this.onPreviewImage(item); + }} + /> + ) : ( +
+ +
+ {item.file ? item.file.name : item.url} +
+
+ ); + + return (
{ this.onClickPreview(item); }} > - {isImageFile(item) ? ( - { - this.onPreviewImage(item); - }} - /> - ) : ( -
- -
- {item.file ? item.file.name : item.url} -
-
- )} - { - this.onDelete(item, index); - }} - /> + {Preview} + {DeleteIcon}
- )); + ); + }, + + renderPreviewList() { + if (this.previewImage) { + return this.fileList.map(this.renderPreviewItem); + } }, renderUpload() { @@ -299,7 +308,7 @@ export default createComponent({ return (
- {this.renderPreview()} + {this.renderPreviewList()} {this.renderUpload()}