From 504046735885a3d62f2283cf86da56aab8f9338c Mon Sep 17 00:00:00 2001
From: junjun666 <35680677+junjun666@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20uploader=20=E4=BD=BF=E7=94=A8=20isDel?=
 =?UTF-8?q?etable=20=E6=97=A0=E6=B3=95=E9=9A=90=E8=97=8F=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=20(#366)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/uploader/uploader.taro.tsx | 18 ++++++++++--------
 src/packages/uploader/uploader.tsx      | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx
index 9ca76694a3..1529418bf0 100644
--- a/src/packages/uploader/uploader.taro.tsx
+++ b/src/packages/uploader/uploader.taro.tsx
@@ -515,14 +515,16 @@ const InternalUploader: ForwardRefRenderFunction<
                     />
                     &nbsp;{item.name}
                   </div>
-                  <Icon
-                    classPrefix={props.iconClassPrefix}
-                    fontClassName={props.iconFontClassName}
-                    color="#808080"
-                    className="nut-uploader__preview-img__file__del"
-                    name="del"
-                    onClick={() => onDelete(item, index)}
-                  />
+                  {isDeletable && (
+                    <Icon
+                      classPrefix={props.iconClassPrefix}
+                      fontClassName={props.iconFontClassName}
+                      color="#808080"
+                      className="nut-uploader__preview-img__file__del"
+                      name="del"
+                      onClick={() => onDelete(item, index)}
+                    />
+                  )}
                   {item.status === 'uploading' && (
                     <Progress
                       size="small"
diff --git a/src/packages/uploader/uploader.tsx b/src/packages/uploader/uploader.tsx
index f1c3d28b31..8ab961c5c1 100644
--- a/src/packages/uploader/uploader.tsx
+++ b/src/packages/uploader/uploader.tsx
@@ -532,14 +532,17 @@ const InternalUploader: ForwardRefRenderFunction<
                     />
                     &nbsp;{item.name}
                   </div>
-                  <Icon
-                    classPrefix={iconClassPrefix}
-                    fontClassName={iconFontClassName}
-                    color="#808080"
-                    className="nut-uploader__preview-img__file__del"
-                    name="del"
-                    onClick={() => onDelete(item, index)}
-                  />
+                  {isDeletable && (
+                    <Icon
+                      classPrefix={iconClassPrefix}
+                      fontClassName={iconFontClassName}
+                      color="#808080"
+                      className="nut-uploader__preview-img__file__del"
+                      name="del"
+                      onClick={() => onDelete(item, index)}
+                    />
+                  )}
+
                   {item.status === 'uploading' && (
                     <Progress
                       size="small"