fix(antd/next): fix upload can not preview placeholder (#2784)

alibaba · Jan 20, 2022 · 4660fd8 · 4660fd8
1 parent c5dfb53
commit 4660fd8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 30 deletions.
diff --git a/packages/antd/src/upload/index.tsx b/packages/antd/src/upload/index.tsx
@@ -31,6 +31,7 @@ type ComposedUpload = React.FC<UploadProps> & {
 }
 
 type IUploadProps = {
+  fileList?: any[]
   serviceErrorMessage?: string
   onChange?: (...args: any) => void
 }
@@ -157,6 +158,7 @@ function useUploadProps<T extends IUploadProps = UploadProps>({
   }
   return {
     ...props,
+    fileList: normalizeFileList(props.fileList),
     onChange,
   }
 }

diff --git a/packages/antd/src/upload/placeholder.ts b/packages/antd/src/upload/placeholder.ts
@@ -1,62 +1,62 @@
 export const UPLOAD_PLACEHOLDER = [
   {
-    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',
   },
 ]
diff --git a/packages/next/src/upload/index.tsx b/packages/next/src/upload/index.tsx
@@ -27,6 +27,7 @@ type ComposedUpload = React.FC<ExtendUploadProps> & {
 }
 
 type IUploadProps = {
+  value?: any[]
   serviceErrorMessage?: string
   onChange?: (...args: any) => void
   formatter?: (...args: any) => any
@@ -175,6 +176,7 @@ function useUploadProps<T extends IUploadProps = ExtendUploadProps>({
   }
   return {
     ...props,
+    value: normalizeFileList(props.value),
     onChange,
     formatter,
   }

diff --git a/packages/next/src/upload/placeholder.ts b/packages/next/src/upload/placeholder.ts
@@ -1,62 +1,62 @@
 export const UPLOAD_PLACEHOLDER = [
   {
-    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',
   },
 ]