Skip to content

Commit 4d0913f

Browse files
authored
Fix dialog (#1477)
* fix: dialog buttontap in wechat * fix: 日历展示问题调整
1 parent 414a7e5 commit 4d0913f

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

src/Calendar/index.axml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@
1616
a:for-item="item"
1717
a:key="*this">
1818
<view class="{{ helper.getMarkCellClassName(index, markItems) }}">
19-
<!-- display: inline -->
20-
<!-- #if WECHAT -->
21-
<ant-auto-resize wx:if="{{ item }}" text="{{ item }}" minFontSize="13" maxFontSize="28">
22-
<text>{{ item }}</text>
23-
</ant-auto-resize>
24-
<ant-auto-resize wx:else text="{{ item }}" minFontSize="13" maxFontSize="28">
25-
<block>
26-
<text name="item">{{ item }}</text>
27-
</block>
28-
</ant-auto-resize>
29-
<!-- #endif -->
3019
<!-- #if ALIPAY || ALIPAYNATIVE -->
3120
<ant-auto-resize text="{{ item }}" minFontSize="13" maxFontSize="28">
3221
<text>{{ item }}</text>

src/Dialog/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ Component({
2020
},
2121
onButtonTap(e) {
2222
const onButtonTap = getValueFromProps(this, 'onButtonTap');
23+
/// #if ALIPAY || ALIPAYNATIVE
2324
// 按钮点击没有回调的场景直接关闭弹框
2425
if (!onButtonTap) {
2526
return this.onClose();
2627
}
28+
/// #endif
2729
const { item } = e.currentTarget.dataset;
2830
triggerEvent(this, 'buttonTap', item, e);
2931
},

0 commit comments

Comments
 (0)