From c6791841f4b06e699a684da0243526147438d852 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Sat, 29 Feb 2020 10:49:52 +0800
Subject: [PATCH] feat(Uploader): increase border-radius to 8px

---
 src/form/test/__snapshots__/demo.spec.js.snap      |  2 +-
 src/style/var.less                                 |  2 +-
 src/uploader/index.js                              |  1 -
 src/uploader/index.less                            |  2 ++
 src/uploader/test/__snapshots__/demo.spec.js.snap  | 10 +++++-----
 src/uploader/test/__snapshots__/index.spec.js.snap | 10 +++++-----
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/form/test/__snapshots__/demo.spec.js.snap b/src/form/test/__snapshots__/demo.spec.js.snap
index 09dd50bc3..4d3b18f05 100644
--- a/src/form/test/__snapshots__/demo.spec.js.snap
+++ b/src/form/test/__snapshots__/demo.spec.js.snap
@@ -170,7 +170,7 @@ exports[`renders demo correctly 1`] = `
               <div class="van-uploader">
                 <div class="van-uploader__wrapper">
                   <div class="van-uploader__preview">
-                    <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
+                    <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
                       <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                           <!----></i></div>
                     </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
diff --git a/src/style/var.less b/src/style/var.less
index f7e0c06db..8d0f09588 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -776,7 +776,7 @@
 @uploader-icon-color: @gray-4;
 @uploader-text-color: @gray-6;
 @uploader-text-font-size: @font-size-sm;
-@uploader-upload-border-radius: 4px;
+@uploader-upload-border-radius: 8px;
 @uploader-upload-background-color: @gray-1;
 @uploader-upload-active-color: @active-color;
 @uploader-delete-color: @gray-6;
diff --git a/src/uploader/index.js b/src/uploader/index.js
index 08da5c396..65c5f5ca6 100644
--- a/src/uploader/index.js
+++ b/src/uploader/index.js
@@ -278,7 +278,6 @@ export default createComponent({
           class={bem('preview-image')}
           width={this.previewSize}
           height={this.previewSize}
-          radius={4}
           onClick={() => {
             this.onPreviewImage(item);
           }}
diff --git a/src/uploader/index.less b/src/uploader/index.less
index 06891420f..379f2d849 100644
--- a/src/uploader/index.less
+++ b/src/uploader/index.less
@@ -70,6 +70,8 @@
       display: block;
       width: @uploader-size;
       height: @uploader-size;
+      overflow: hidden;
+      border-radius: @uploader-upload-border-radius;
     }
 
     &-delete {
diff --git a/src/uploader/test/__snapshots__/demo.spec.js.snap b/src/uploader/test/__snapshots__/demo.spec.js.snap
index 9fea6e5e9..0e63f237b 100644
--- a/src/uploader/test/__snapshots__/demo.spec.js.snap
+++ b/src/uploader/test/__snapshots__/demo.spec.js.snap
@@ -14,14 +14,14 @@ exports[`renders demo correctly 1`] = `
     <div class="van-uploader">
       <div class="van-uploader__wrapper">
         <div class="van-uploader__preview">
-          <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
+          <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
             <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                 <!----></i></div>
           </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
             <!----></i>
         </div>
         <div class="van-uploader__preview">
-          <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/tree.jpg" class="van-image__img" style="object-fit: cover;">
+          <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/tree.jpg" class="van-image__img" style="object-fit: cover;">
             <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                 <!----></i></div>
           </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
@@ -44,7 +44,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-uploader">
       <div class="van-uploader__wrapper">
         <div class="van-uploader__preview">
-          <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
+          <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/leaf.jpg" class="van-image__img" style="object-fit: cover;">
             <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                 <!----></i></div>
           </div>
@@ -54,7 +54,7 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
         <div class="van-uploader__preview">
-          <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/tree.jpg" class="van-image__img" style="object-fit: cover;">
+          <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/tree.jpg" class="van-image__img" style="object-fit: cover;">
             <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                 <!----></i></div>
           </div>
@@ -73,7 +73,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-uploader">
       <div class="van-uploader__wrapper">
         <div class="van-uploader__preview">
-          <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/sand.jpg" class="van-image__img" style="object-fit: cover;">
+          <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/sand.jpg" class="van-image__img" style="object-fit: cover;">
             <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
                 <!----></i></div>
           </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
diff --git a/src/uploader/test/__snapshots__/index.spec.js.snap b/src/uploader/test/__snapshots__/index.spec.js.snap
index 40bd76ffd..33e44b8e3 100644
--- a/src/uploader/test/__snapshots__/index.spec.js.snap
+++ b/src/uploader/test/__snapshots__/index.spec.js.snap
@@ -22,7 +22,7 @@ exports[`image-fit prop 1`] = `
 <div class="van-uploader">
   <div class="van-uploader__wrapper">
     <div class="van-uploader__preview">
-      <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: contain;">
+      <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: contain;">
         <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
             <!----></i></div>
       </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
@@ -38,7 +38,7 @@ exports[`max-count prop 1`] = `
 <div class="van-uploader">
   <div class="van-uploader__wrapper">
     <div class="van-uploader__preview">
-      <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
+      <div class="van-image van-uploader__preview-image"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
         <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
             <!----></i></div>
       </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
@@ -52,7 +52,7 @@ exports[`preview-size prop 1`] = `
 <div class="van-uploader">
   <div class="van-uploader__wrapper">
     <div class="van-uploader__preview" style="">
-      <div class="van-image van-uploader__preview-image" style="width: 30px; height: 30px; overflow: hidden; border-radius: 4px;"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
+      <div class="van-image van-uploader__preview-image" style="width: 30px; height: 30px;"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
         <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
             <!----></i></div>
       </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
@@ -68,7 +68,7 @@ exports[`render preview image 1`] = `
 <div class="van-uploader">
   <div class="van-uploader__wrapper">
     <div class="van-uploader__preview">
-      <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: cover;">
+      <div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: cover;">
         <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
             <!----></i></div>
       </div><i class="van-icon van-icon-clear van-uploader__preview-delete">
@@ -89,7 +89,7 @@ exports[`render preview image 1`] = `
         <!----></i>
     </div>
     <div class="van-uploader__preview">
-      <div class="van-image van-uploader__preview-image" style="overflow: hidden; border-radius: 4px;"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
+      <div class="van-image van-uploader__preview-image"><img src="data:image/test" class="van-image__img" style="object-fit: cover;">
         <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
             <!----></i></div>
       </div><i class="van-icon van-icon-clear van-uploader__preview-delete">