From f9c73dd31bb7953d563d8cd7e5f2946a84f8f849 Mon Sep 17 00:00:00 2001
From: Peter Qiu <273743552@qq.com>
Date: Sat, 14 Jan 2023 22:54:38 +0800
Subject: [PATCH 1/3] fix(upload): update add-content slot

---
 src/upload/__test__/index.test.js | 4 ++--
 src/upload/upload.less            | 6 +++++-
 src/upload/upload.wxml            | 7 +++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/upload/__test__/index.test.js b/src/upload/__test__/index.test.js
index 92c08ebf9..12a72d15b 100644
--- a/src/upload/__test__/index.test.js
+++ b/src/upload/__test__/index.test.js
@@ -329,7 +329,7 @@ describe('upload', () => {
           id="t-upload"
           addContent="slot"
         >
-          <text slot="add-content"> {{text}} </text>
+          <text slot="add-content" class="custom-add"> {{text}} </text>
         </t-upload>
       `,
         data: {
@@ -342,7 +342,7 @@ describe('upload', () => {
       const comp = simulate.render(id);
       comp.attach(document.createElement('parent-wrapper'));
 
-      const $addIcon = comp.querySelector('#t-upload >>> .t-upload__add-icon');
+      const $addIcon = comp.querySelector('#t-upload >>> .custom-add');
       expect($addIcon.dom.textContent).toContain(comp.data.text);
     });
   });
diff --git a/src/upload/upload.less b/src/upload/upload.less
index f4117df02..a6868f4ba 100644
--- a/src/upload/upload.less
+++ b/src/upload/upload.less
@@ -19,13 +19,17 @@
   &__add-icon {
     width: 100%;
     height: 100%;
-    display: flex;
+    display: none;
     align-items: center;
     justify-content: center;
     font-size: @upload-add-icon-font-size;
     background-color: @upload-add-bg-color;
     color: @upload-add-color;
     border-radius: @upload-radius;
+
+    &:only-child {
+      display: flex;
+    }
   }
 
   &__thumbnail {
diff --git a/src/upload/upload.wxml b/src/upload/upload.wxml
index af4a435bf..08a975553 100644
--- a/src/upload/upload.wxml
+++ b/src/upload/upload.wxml
@@ -50,8 +50,7 @@
         </view>
         <!-- 删除 -->
         <view class="{{classPrefix}}__close-btn hotspot-expanded" bindtap="onDelete" data-index="{{index}}">
-          <slot wx:if="{{deleteBtn === 'slot'}}" name="delete-btn" />
-          <t-icon wx:else name="close" size="16" color="#fff" />
+          <t-icon name="close" size="16" color="#fff" />
         </view>
       </view>
     </t-grid-item>
@@ -63,9 +62,9 @@
       bindclick="onAddTap"
     >
       <view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
+        <slot name="add-content" />
         <view class="{{classPrefix}}__add-icon">
-          <slot wx:if="{{addContent === 'slot'}}" name="add-content" />
-          <t-icon wx:else name="add" />
+          <t-icon name="add" />
         </view>
       </view>
     </t-grid-item>

From 1287bb21d2bcc614171fe69153e9111ffb156f7e Mon Sep 17 00:00:00 2001
From: Peter Qiu <273743552@qq.com>
Date: Sat, 14 Jan 2023 22:55:44 +0800
Subject: [PATCH 2/3] docs(upload): update add-content description

---
 src/upload/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/upload/README.md b/src/upload/README.md
index ca1c31880..5de588317 100644
--- a/src/upload/README.md
+++ b/src/upload/README.md
@@ -51,7 +51,7 @@ isComponent: true
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-add-content | String / Slot | - | 添加按钮内容。值为空，使用默认图标渲染；值为 slot 则表示使用插槽渲染；其他值无效。 | N
+add-content | String / Slot | - | 添加按钮内容 | N
 allow-upload-duplicate-file | Boolean | false | 【开发中】是否允许重复上传相同文件名的文件 | N
 config | Object | - | 图片上传配置，视频上传配置，文件上传配置等，包含图片尺寸、图片来源、视频来源、视频拍摄最长时间等。更多细节查看小程序官网。[图片上传](https://developers.weixin.qq.com/miniprogram/dev/api/media/image/wx.chooseImage.html)。[视频上传](https://developers.weixin.qq.com/miniprogram/dev/api/media/video/wx.chooseVideo.html)。TS 类型：`UploadMpConfig` `type UploadMpConfig = ImageConfig \| VideoConfig` `interface ImageConfig { count?: number; sizeType?: Array<SizeTypeValues>; sourceType?: Array<SourceTypeValues> }` `type SizeTypeValues = 'original' \| 'compressed'` `type SourceTypeValues = 'album' \| 'camera'` `interface VideoConfig { sourceType?: Array<SourceTypeValues>; compressed?: boolean; maxDuration?: number; camera?: 'back' \| 'front' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/upload/type.ts) | N
 custom-style `v0.25.0` | String | - | 自定义组件样式 | N

From 41714abef773d133c1dc7ce9119e20e7eae5f33d Mon Sep 17 00:00:00 2001
From: Peter Qiu <273743552@qq.com>
Date: Sat, 14 Jan 2023 23:00:24 +0800
Subject: [PATCH 3/3] fix(upload): enable add-content property

---
 src/upload/upload.wxml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/upload/upload.wxml b/src/upload/upload.wxml
index 08a975553..524b80019 100644
--- a/src/upload/upload.wxml
+++ b/src/upload/upload.wxml
@@ -63,7 +63,8 @@
     >
       <view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
         <slot name="add-content" />
-        <view class="{{classPrefix}}__add-icon">
+        <block wx:if="{{addContent}}">{{addContent}}</block>
+        <view wx:else class="{{classPrefix}}__add-icon">
           <t-icon name="add" />
         </view>
       </view>