Skip to content

Commit 2224dfb

Browse files
authored
fix(Upload): fix duplicate add-content content (#4568)
1 parent 918e228 commit 2224dfb

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

packages/components/upload/upload.wxml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@
175175
<block wx:if="{{theme === 'list'}}">
176176
<!-- 上传触发按钮 -->
177177
<view wx:if="{{addBtn && customLimit > 0}}" class="{{classPrefix}}__list-trigger" bindtap="onAddTap">
178-
<slot name="add-content" />
179-
<block wx:if="{{addContent}}">{{addContent}}</block>
178+
<slot wx:if="{{addContent === 'slot'}}" name="add-content" />
179+
<block wx:elif="{{addContent}}">{{addContent}}</block>
180180
<t-button wx:else theme="primary" size="medium" disabled="{{disabled}}" icon="upload" bindtap="onAddTap"
181181
>Upload</t-button
182182
>
@@ -271,8 +271,8 @@
271271
bindclick="onAddTap"
272272
>
273273
<view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
274-
<slot name="add-content" />
275-
<block wx:if="{{addContent}}">{{addContent}}</block>
274+
<slot wx:if="{{addContent === 'slot'}}" name="add-content" />
275+
<block wx:elif="{{addContent}}">{{addContent}}</block>
276276
<view wx:else class="{{classPrefix}}__add-icon">
277277
<t-icon name="add" />
278278
</view>
@@ -325,8 +325,8 @@
325325
bindclick="onAddTap"
326326
>
327327
<view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
328-
<slot name="add-content" />
329-
<block wx:if="{{addContent}}">{{addContent}}</block>
328+
<slot wx:if="{{addContent === 'slot'}}" name="add-content" />
329+
<block wx:elif="{{addContent}}">{{addContent}}</block>
330330
<view wx:else class="{{classPrefix}}__add-icon">
331331
<t-icon name="add" />
332332
</view>

0 commit comments

Comments
 (0)