From e2bfcce9849ec4df6e653bed5d7b7e471e5ce5c2 Mon Sep 17 00:00:00 2001 From: liunian Date: Fri, 25 Sep 2020 17:54:24 +0800 Subject: [PATCH] fix Upload preview image (#1031) Use provided image first, if not exist, then fallback to suggested icon. fix ext match pattern close #1030 --- packages/antd-components/src/upload/index.tsx | 32 +++++++++---------- packages/next-components/src/upload/index.tsx | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/antd-components/src/upload/index.tsx b/packages/antd-components/src/upload/index.tsx index eed60f94af6..ed97075ef2c 100644 --- a/packages/antd-components/src/upload/index.tsx +++ b/packages/antd-components/src/upload/index.tsx @@ -13,63 +13,63 @@ const { Dragger: UploadDragger } = AntdUpload const exts = [ { - ext: /\.docx?/i, + ext: /\.docx?$/i, icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png' }, { - ext: /\.pptx?/i, + ext: /\.pptx?$/i, icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png' }, { - ext: /\.jpe?g/i, + ext: /\.jpe?g$/i, icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /pdf/i, + ext: /\.pdf$/i, icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.png/i, + ext: /\.png$/i, icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.eps/i, + ext: /\.eps$/i, icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png' }, { - ext: /\.ai/i, + ext: /\.ai$/i, icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png' }, { - ext: /\.gif/i, + ext: /\.gif$/i, icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png' }, { - ext: /\.svg/i, + ext: /\.svg$/i, icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png' }, { - ext: /\.xlsx?/i, + ext: /\.xlsx?$/i, icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png' }, { - ext: /\.psd?/i, + ext: /\.psd?$/i, icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png' }, { - ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)/i, + ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i, icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png' }, { - ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)/i, + ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i, icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)/i, + ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i, icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png' }, { - ext: /\..+/i, + ext: /\.[^.]+$/i, icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png' } ] @@ -112,7 +112,7 @@ const normalizeFileList = fileList => { name: file.name, url: file.downloadURL || file.imgURL || file.url, ...file.response, - thumbUrl: getImageByUrl(file.imgURL || file.downloadURL || file.url, { + thumbUrl: file.imgURL || getImageByUrl(file.downloadURL || file.url, { exclude: ['.png', '.jpg', '.jpeg', '.gif'] }) } diff --git a/packages/next-components/src/upload/index.tsx b/packages/next-components/src/upload/index.tsx index e717d473de8..313054e06d4 100644 --- a/packages/next-components/src/upload/index.tsx +++ b/packages/next-components/src/upload/index.tsx @@ -7,63 +7,63 @@ const { Card: UploadCard, Dragger: UploadDragger } = NextUpload const exts = [ { - ext: /\.docx?/i, + ext: /\.docx?$/i, icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png' }, { - ext: /\.pptx?/i, + ext: /\.pptx?$/i, icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png' }, { - ext: /\.jpe?g/i, + ext: /\.jpe?g$/i, icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /pdf/i, + ext: /\.pdf$/i, icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.png/i, + ext: /\.png$/i, icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.eps/i, + ext: /\.eps$/i, icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png' }, { - ext: /\.ai/i, + ext: /\.ai$/i, icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png' }, { - ext: /\.gif/i, + ext: /\.gif$/i, icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png' }, { - ext: /\.svg/i, + ext: /\.svg$/i, icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png' }, { - ext: /\.xlsx?/i, + ext: /\.xlsx?$/i, icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png' }, { - ext: /\.psd?/i, + ext: /\.psd?$/i, icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png' }, { - ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)/i, + ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i, icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png' }, { - ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)/i, + ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i, icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' }, { - ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)/i, + ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i, icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png' }, { - ext: /\..+/i, + ext: /\.[^.]+$/i, icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png' } ] @@ -97,7 +97,7 @@ const normalizeFileList = fileList => { name: file.name, downloadURL: file.downloadURL || file.imgURL, ...file.response, - imgURL: getImageByUrl(file.imgURL, { + imgURL: file.imgURL || getImageByUrl(file.downloadURL, { exclude: ['.png', '.jpg', '.jpeg', '.gif'] }) }