Skip to content

Commit ed9148e

Browse files
authored
fix: countdown/invoice/navbar 优化事件命名 (#2536)
1 parent 2b1df9c commit ed9148e

File tree

23 files changed

+762
-946
lines changed

23 files changed

+762
-946
lines changed

packages/nutui-taro-demo/src/business/pages/invoice/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="demo full" :class="{ web: env === 'WEB' }">
33
<Header v-if="env === 'WEB'" />
44
<h2>默认用法</h2>
5-
<nut-invoice :data="data" :formValue="formValue" @onSubmit="submit"></nut-invoice>
5+
<nut-invoice :data="data" :formValue="formValue" @submit="submit"></nut-invoice>
66
</div>
77
</template>
88

packages/nutui-taro-demo/src/exhibition/pages/countdown/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Header v-if="env === 'WEB'" />
44
<h2>基础用法</h2>
55
<nut-cell>
6-
<nut-countdown :endTime="end" @on-end="onend"></nut-countdown>
6+
<nut-countdown :endTime="end" @end="onend"></nut-countdown>
77
</nut-cell>
88
<h2>自定义格式</h2>
99
<nut-cell>
@@ -31,7 +31,7 @@
3131
<h2>控制开始和暂停的倒计时</h2>
3232

3333
<nut-cell>
34-
<nut-countdown :endTime="end" :paused="paused" @on-paused="onpaused" @on-restart="onrestart" />
34+
<nut-countdown :endTime="end" :paused="paused" @paused="onpaused" @restart="onrestart" />
3535
<div style="position: absolute; right: 10px; top: 9px">
3636
<nut-button type="primary" size="small" @click="toggle">{{ paused ? 'start' : 'stop' }}</nut-button>
3737
</div>

packages/nutui-taro-demo/src/nav/pages/navbar/index.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Header v-if="env === 'WEB'" />
44
<h2>基础用法</h2>
55

6-
<nut-navbar @on-click-back="back" @on-click-title="title" title="订单详情">
6+
<nut-navbar @click-back="back" @click-title="title" title="订单详情">
77
<template #left>
88
<div>返回</div>
99
</template>
@@ -13,19 +13,19 @@
1313
</nut-navbar>
1414

1515
<nut-navbar
16-
@on-click-back="back"
17-
@on-click-title="title"
18-
@on-click-right="rightClick"
16+
@click-back="back"
17+
@click-title="title"
18+
@click-right="rightClick"
1919
title="浏览记录"
2020
desc="清空"
2121
></nut-navbar>
2222

2323
<nut-navbar
2424
:left-show="false"
25-
@on-click-back="back"
26-
@on-click-title="title"
27-
@on-click-icon="icon"
28-
@on-click-right="rightClick"
25+
@click-back="back"
26+
@click-title="title"
27+
@click-icon="icon"
28+
@click-right="rightClick"
2929
title="购物车"
3030
:titleIcon="true"
3131
desc="编辑"
@@ -39,7 +39,7 @@
3939
</nut-navbar>
4040

4141
<h2>自定义导航栏中间内容</h2>
42-
<nut-navbar @on-click-back="back" @on-click-title="title" @on-click-right="rightClick" desc="编辑">
42+
<nut-navbar @click-back="back" @click-title="title" @click-right="rightClick" desc="编辑">
4343
<template #content>
4444
<nut-tabs v-model="tab1value" @click="changeTab">
4545
<nut-tab-pane title="商品"> </nut-tab-pane>
@@ -53,7 +53,7 @@
5353
</nut-navbar>
5454

5555
<h2>多tab切换导航</h2>
56-
<nut-navbar @on-click-back="back">
56+
<nut-navbar @click-back="back">
5757
<template #content>
5858
<nut-tabs v-model="tab2value" @click="changeTabList">
5959
<nut-tab-pane title="商品"> </nut-tab-pane>

src/packages/__VUE/countdown/__tests__/countdown.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ test('endTime props', async () => {
1010
endTime: Date.now() + 1 * 50
1111
}
1212
});
13-
expect(wrapper.emitted('onEnd')).toBeFalsy();
13+
expect(wrapper.emitted('end')).toBeFalsy();
1414
await sleep(51);
15-
expect(wrapper.emitted('onEnd')).toBeTruthy();
15+
expect(wrapper.emitted('end')).toBeTruthy();
1616
});
1717

1818
test('format props', async () => {
@@ -63,7 +63,7 @@ test('paused props', async () => {
6363
'nut-button': Button
6464
},
6565
template: `
66-
<nut-countdown :endTime="endTime" :paused="paused" />
66+
<nut-countdown :end-time="endTime" :paused="paused" />
6767
<nut-button @click="toggle">{{ paused ? 'start' : 'stop' }}</nut-button>
6868
`,
6969
setup() {

src/packages/__VUE/countdown/demo.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="demo">
33
<h2>{{ translate('basic') }}</h2>
44
<nut-cell>
5-
<nut-countdown :end-time="end" @on-end="onend"></nut-countdown>
5+
<nut-countdown :end-time="end" @end="onend"></nut-countdown>
66
</nut-cell>
77
<h2>{{ translate('format') }}</h2>
88
<nut-cell>
@@ -33,7 +33,7 @@
3333
<h2>{{ translate('controlTime') }}</h2>
3434

3535
<nut-cell>
36-
<nut-countdown :end-time="end" :paused="paused" @on-paused="onpaused" @on-restart="onrestart" />
36+
<nut-countdown :end-time="end" :paused="paused" @paused="onpaused" @restart="onrestart" />
3737
<div style="position: absolute; right: 10px; top: 9px">
3838
<nut-button type="primary" size="small" @click="toggle">{{ paused ? 'start' : 'stop' }}</nut-button>
3939
</div>

0 commit comments

Comments
 (0)