From d35649e88f64555d9aece4e2ca0151a73d2c5ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=A2=96=E5=8D=9A?= <wangyingbo528@yeah.net>
Date: Tue, 16 Jun 2020 21:25:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:uploader=E7=BB=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=95=E5=BC=A0=E5=8F=AA=E8=AF=BB=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=20(#3270)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update index.wxml

uploader组件，deletable属性只能控制全局是否可以删除，不能控制单张图片是否可删除，因此当fileList内为对象时，增加onlyRead标识，当onlyRead为true时，单张不显示删除icon;

* Update index.wxml

uploader组件，deletable属性只能控制全局是否可以删除，不能控制单张图片是否可删除，因此当fileList内为对象时，增加onlyRead标识，当onlyRead为true时，单张不显示删除icon;

* 补充upload deletable 文档

* Update index.wxml

* Update index.ts

Co-authored-by: wangyingbo <>
---
 packages/uploader/README.md  | 26 ++++++++++++++++++++++++++
 packages/uploader/index.ts   |  4 ++++
 packages/uploader/index.wxml |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/uploader/README.md b/packages/uploader/README.md
index d5026619..6ba1f0df 100644
--- a/packages/uploader/README.md
+++ b/packages/uploader/README.md
@@ -65,6 +65,32 @@ Page({
         url: 'http://iph.href.lu/60x60?text=default',
         name: '图片2',
         isImage: true,
+        deletable: true,
+      },
+    ],
+  },
+});
+```
+
+### 图片编辑状态
+
+通过`deletable `可以标识所有图片或者单张图片是否可删除。如果`Props `的全局`deletable `为`false`，则所有图片都不展示删除按钮；如果`Props `的全局`deletable `为`true`，则可通过设置每一个图片对象里的`deletable `来控制每一张图片是否显示删除按钮，如果图片对象里不设置则默认为`true`。
+
+```html
+<van-uploader file-list="{{ fileList }}" deletable="{{ true }}" />
+```
+
+```js
+Page({
+  data: {
+    fileList: [
+      {
+        url: 'https://img.yzcdn.cn/vant/leaf.jpg',
+        deletable: true,
+      },
+      {
+        url: 'https://img.yzcdn.cn/vant/tree.jpg',
+        deletable: false,
       },
     ],
   },
diff --git a/packages/uploader/index.ts b/packages/uploader/index.ts
index 3bc81240..412c6c62 100644
--- a/packages/uploader/index.ts
+++ b/packages/uploader/index.ts
@@ -77,6 +77,10 @@ VantComponent({
           typeof item.isImage === 'undefined'
             ? isImageFile(item)
             : item.isImage,
+        deletable:
+          typeof item.deletable === 'undefined'
+            ? true
+            : item.deletable,
       }));
       this.setData({ lists, isInCount: lists.length < maxCount });
     },
diff --git a/packages/uploader/index.wxml b/packages/uploader/index.wxml
index 241e07f1..bce0a495 100644
--- a/packages/uploader/index.wxml
+++ b/packages/uploader/index.wxml
@@ -38,7 +38,7 @@
        <text wx:if="{{ item.message }}" class="van-uploader__upload-text">{{ item.message }}</text>
       </view>
       <view
-        wx:if="{{ deletable }}"
+        wx:if="{{ deletable && item.deletable }}"
         data-index="{{ index }}"
         class="van-uploader__preview-delete"
         catch:tap="deleteItem"