Skip to content

Commit b615f8f

Browse files
liunianliunian
committed
fix Upload preview image
Use provided image first, if not exist, then fallback to suggested icon. fix ext match pattern close alibaba#1030
1 parent 6b65fbb commit b615f8f

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎packages/antd-components/src/upload/index.tsx

+16-16
Original file line numberDiff line numberDiff line change
@@ -13,63 +13,63 @@ const { Dragger: UploadDragger } = AntdUpload
1313

1414
const exts = [
1515
{
16-
ext: /\.docx?/i,
16+
ext: /\.docx?$/i,
1717
icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png'
1818
},
1919
{
20-
ext: /\.pptx?/i,
20+
ext: /\.pptx?$/i,
2121
icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png'
2222
},
2323
{
24-
ext: /\.jpe?g/i,
24+
ext: /\.jpe?g$/i,
2525
icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
2626
},
2727
{
28-
ext: /pdf/i,
28+
ext: /\.pdf$/i,
2929
icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png'
3030
},
3131
{
32-
ext: /\.png/i,
32+
ext: /\.png$/i,
3333
icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
3434
},
3535
{
36-
ext: /\.eps/i,
36+
ext: /\.eps$/i,
3737
icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png'
3838
},
3939
{
40-
ext: /\.ai/i,
40+
ext: /\.ai$/i,
4141
icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png'
4242
},
4343
{
44-
ext: /\.gif/i,
44+
ext: /\.gif$/i,
4545
icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png'
4646
},
4747
{
48-
ext: /\.svg/i,
48+
ext: /\.svg$/i,
4949
icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png'
5050
},
5151
{
52-
ext: /\.xlsx?/i,
52+
ext: /\.xlsx?$/i,
5353
icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png'
5454
},
5555
{
56-
ext: /\.psd?/i,
56+
ext: /\.psd?$/i,
5757
icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png'
5858
},
5959
{
60-
ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)/i,
60+
ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i,
6161
icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png'
6262
},
6363
{
64-
ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)/i,
64+
ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i,
6565
icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
6666
},
6767
{
68-
ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)/i,
68+
ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i,
6969
icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png'
7070
},
7171
{
72-
ext: /\..+/i,
72+
ext: /\.[^.]+$/i,
7373
icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png'
7474
}
7575
]
@@ -112,7 +112,7 @@ const normalizeFileList = fileList => {
112112
name: file.name,
113113
url: file.downloadURL || file.imgURL || file.url,
114114
...file.response,
115-
thumbUrl: getImageByUrl(file.imgURL || file.downloadURL || file.url, {
115+
thumbUrl: file.imgURL || getImageByUrl(file.downloadURL || file.url, {
116116
exclude: ['.png', '.jpg', '.jpeg', '.gif']
117117
})
118118
}

‎packages/next-components/src/upload/index.tsx

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,63 @@ const { Card: UploadCard, Dragger: UploadDragger } = NextUpload
77

88
const exts = [
99
{
10-
ext: /\.docx?/i,
10+
ext: /\.docx?$/i,
1111
icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png'
1212
},
1313
{
14-
ext: /\.pptx?/i,
14+
ext: /\.pptx?$/i,
1515
icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png'
1616
},
1717
{
18-
ext: /\.jpe?g/i,
18+
ext: /\.jpe?g$/i,
1919
icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
2020
},
2121
{
22-
ext: /pdf/i,
22+
ext: /\.pdf$/i,
2323
icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png'
2424
},
2525
{
26-
ext: /\.png/i,
26+
ext: /\.png$/i,
2727
icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
2828
},
2929
{
30-
ext: /\.eps/i,
30+
ext: /\.eps$/i,
3131
icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png'
3232
},
3333
{
34-
ext: /\.ai/i,
34+
ext: /\.ai$/i,
3535
icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png'
3636
},
3737
{
38-
ext: /\.gif/i,
38+
ext: /\.gif$/i,
3939
icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png'
4040
},
4141
{
42-
ext: /\.svg/i,
42+
ext: /\.svg$/i,
4343
icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png'
4444
},
4545
{
46-
ext: /\.xlsx?/i,
46+
ext: /\.xlsx?$/i,
4747
icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png'
4848
},
4949
{
50-
ext: /\.psd?/i,
50+
ext: /\.psd?$/i,
5151
icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png'
5252
},
5353
{
54-
ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)/i,
54+
ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i,
5555
icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png'
5656
},
5757
{
58-
ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)/i,
58+
ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i,
5959
icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png'
6060
},
6161
{
62-
ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)/i,
62+
ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i,
6363
icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png'
6464
},
6565
{
66-
ext: /\..+/i,
66+
ext: /\.[^.]+$/i,
6767
icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png'
6868
}
6969
]
@@ -97,7 +97,7 @@ const normalizeFileList = fileList => {
9797
name: file.name,
9898
downloadURL: file.downloadURL || file.imgURL,
9999
...file.response,
100-
imgURL: getImageByUrl(file.imgURL, {
100+
imgURL: file.imgURL || getImageByUrl(file.downloadURL, {
101101
exclude: ['.png', '.jpg', '.jpeg', '.gif']
102102
})
103103
}

0 commit comments

Comments
 (0)