fix(Upload):Upload 图片缩略图不显示 #945

Author: chengyadong

components/upload/UploadList.jsx

@@ -7,11 +7,12 @@ import Progress from '../progress';
 import classNames from 'classnames';
 import { UploadListProps } from './interface';
 
-const imageTypes = ['image', 'webp', 'png', 'svg', 'gif', 'jpg', 'jpeg', 'bmp', 'ico'];
+const isImageFileType = (type) => !!type && type.indexOf('image/') === 0;
 // https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsDataURL
 const previewFile = (file, callback) => {
-  if (file.type && !imageTypes.includes(file.type)) {
+  if (!isImageFileType(file.type)) {
     callback('');
+    return;
   }
   const reader = new window.FileReader();
   reader.onloadend = () => callback(reader.result);
@@ -29,7 +30,7 @@ const extname = url => {
 };
 
 const isImageUrl = file => {
-  if (imageTypes.includes(file.type)) {
+  if (isImageFileType(file.type)) {
     return true;
   }
   const url = file.thumbUrl || file.url;

components/upload/__tests__/uploadlist.test.js

@@ -339,7 +339,7 @@ describe('Upload List', () => {
   it('should generate thumbUrl from file', done => {
     const handlePreview = jest.fn();
     const newFileList = [...fileList];
-    const newFile = { ...fileList[0], uid: -3, originFileObj: new File([], 'xxx.png') };
+    const newFile = { ...fileList[0], uid: -3, originFileObj: new File([], 'xxx.png', { type: 'image/png' }) };
     delete newFile.thumbUrl;
     newFileList.push(newFile);
     const props = {
@@ -358,7 +358,7 @@ describe('Upload List', () => {
     };
     const wrapper = mount(Upload, props);
     setTimeout(async () => {
-      const newFile = { ...fileList[2], uid: -4, originFileObj: new File([], 'xxx.png') };
+      const newFile = { ...fileList[2], uid: -4, originFileObj: new File([], 'xxx.png', { type: 'image/png' }) };
       wrapper.setProps({
         defaultFileList: newFileList.push(newFile),
       });