fix: uploader 使用 isDeletable 无法隐藏删除按钮 (#366)

jdf2e · Oct 25, 2022 · 5040467 · 5040467
1 parent 5eaa446
commit 5040467
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git 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
@@ -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"