From 756ac37e6a50931eb23a3d63cf0715847fd204d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 28 Nov 2019 16:05:47 +0800 Subject: [PATCH 1/7] fix(List): should not render loading when finished --- src/list/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/list/index.js b/src/list/index.js index a824d1f29..8cff4998c 100644 --- a/src/list/index.js +++ b/src/list/index.js @@ -112,7 +112,7 @@ export default createComponent({ }, genLoading() { - if (this.innerLoading) { + if (this.innerLoading && !this.finished) { return (
{this.slots('loading') || ( From 7cfbbb0589383081c6e0802dab3b345f5074823d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 28 Nov 2019 16:19:09 +0800 Subject: [PATCH 2/7] fix(List): sync loading state --- src/list/index.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/list/index.js b/src/list/index.js index 8cff4998c..425fdd27c 100644 --- a/src/list/index.js +++ b/src/list/index.js @@ -49,6 +49,10 @@ export default createComponent({ }; }, + updated() { + this.innerLoading = this.loading; + }, + mounted() { if (this.immediateCheck) { this.check(); @@ -56,11 +60,8 @@ export default createComponent({ }, watch: { - finished: 'check', - loading(val) { - this.innerLoading = val; - this.check(); - } + loading: 'check', + finished: 'check' }, methods: { From 36e3a1e9182abe753e6ea6ecc5661068088d1e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 28 Nov 2019 16:22:40 +0800 Subject: [PATCH 3/7] build: release 2.2.15 --- package.json | 2 +- src/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3e5cac539..c19afbbce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.2.14", + "version": "2.2.15", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/index.ts b/src/index.ts index c4dc4f3b4..c7538ddb9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -89,7 +89,7 @@ declare global { } } -const version = '2.2.14'; +const version = '2.2.15'; const components = [ ActionSheet, AddressEdit, From 68164da604a2d0f20d326bad6b3e9488ad908091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 28 Nov 2019 16:28:50 +0800 Subject: [PATCH 4/7] docs(changelog): 2.2.15 --- docs/markdown/changelog.en-US.md | 8 ++++++++ docs/markdown/changelog.zh-CN.md | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index f88feb1b6..f18fbd9d9 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -1,5 +1,13 @@ # Changelog +### [v2.2.15](https://github.com/youzan/vant/tree/v2.2.15) +`2019-11-28` + +**Bug Fixes** + +- fix List incorrect list status in some cases + + ### [v2.2.14](https://github.com/youzan/vant/tree/v2.2.14) `2019-11-22` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index 32e0be66e..739d227f7 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,14 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.2.15](https://github.com/youzan/vant/tree/v2.2.15) +`2019-11-28` + +**Bug Fixes** + +- 修复 List 组件在部分情况下加载状态未重置的问题 + + ### [v2.2.14](https://github.com/youzan/vant/tree/v2.2.14) `2019-11-22` From b042082322c99f1d51ada6d6ba9d0237c274a5eb Mon Sep 17 00:00:00 2001 From: Jake Date: Tue, 3 Dec 2019 18:53:47 +0800 Subject: [PATCH 5/7] feat(Stepper): add disable-plus & disable-minus props (#5180) --- src/stepper/README.md | 2 ++ src/stepper/README.zh-CN.md | 2 ++ src/stepper/index.js | 10 ++++++++-- src/stepper/test/index.spec.js | 29 +++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/stepper/README.md b/src/stepper/README.md index c0ac195d7..9e808df39 100644 --- a/src/stepper/README.md +++ b/src/stepper/README.md @@ -114,6 +114,8 @@ export default { | show-plus | Whether to show plus button | *boolean* | `true` | 2.1.2 | | show-minus | Whether to show minus button | *boolean* | `true` | 2.1.2 | | decimal-length | Decimal length | *number* | - | 2.2.1 | +| disable-plus | Whether to disable plus button | *boolean* | - | 2.3.0 | +| disable-minus | Whether to disable minus button | *boolean* | - | 2.3.0 | ### Events diff --git a/src/stepper/README.zh-CN.md b/src/stepper/README.zh-CN.md index fed358fa9..fb6211ff4 100644 --- a/src/stepper/README.zh-CN.md +++ b/src/stepper/README.zh-CN.md @@ -136,6 +136,8 @@ export default { | show-plus | 是否显示增加按钮 | *boolean* | `true` | 2.1.2 | | show-minus | 是否显示减少按钮 | *boolean* | `true` | 2.1.2 | | decimal-length | 固定显示的小数位数 | *number* | - | 2.2.1 | +| disable-plus | 是否禁用增加按钮 | *boolean* | - | 2.3.0 | +| disable-minus | 是否禁用减少按钮 | *boolean* | - | 2.3.0 | ### Events diff --git a/src/stepper/index.js b/src/stepper/index.js index 44a5a6655..3e61ea496 100644 --- a/src/stepper/index.js +++ b/src/stepper/index.js @@ -54,6 +54,12 @@ export default createComponent({ showMinus: { type: Boolean, default: true + }, + disablePlus: { + type: Boolean + }, + disableMinus: { + type: Boolean } }, @@ -72,11 +78,11 @@ export default createComponent({ computed: { minusDisabled() { - return this.disabled || this.currentValue <= this.min; + return this.disabled || this.disableMinus || this.currentValue <= this.min; }, plusDisabled() { - return this.disabled || this.currentValue >= this.max; + return this.disabled || this.disablePlus || this.currentValue >= this.max; }, inputStyle() { diff --git a/src/stepper/test/index.spec.js b/src/stepper/test/index.spec.js index a5a2deff2..29748616e 100644 --- a/src/stepper/test/index.spec.js +++ b/src/stepper/test/index.spec.js @@ -19,6 +19,35 @@ test('disable stepper input', () => { expect(wrapper).toMatchSnapshot(); }); +test('disable button', async () => { + const wrapper = mount(Stepper, { + propsData: { + value: 5 + } + }); + + const plus = wrapper.find('.van-stepper__plus'); + const minus = wrapper.find('.van-stepper__minus'); + + minus.trigger('click'); + + expect(wrapper.emitted('overlimit')).toBeFalsy(); + expect(wrapper.emitted('minus')).toBeTruthy(); + expect(wrapper.emitted('change')[0]).toEqual([4, { name: '' }]); + + wrapper.setProps({ + disablePlus: true, + disableMinus: true + }); + + await later(); + + minus.trigger('click'); + expect(wrapper.emitted('overlimit')[0][0]).toBe('minus'); + plus.trigger('click'); + expect(wrapper.emitted('overlimit')[1][0]).toBe('plus'); +}); + test('click button', () => { const wrapper = mount(Stepper, { propsData: { From 754f06871a315b3ae060f7922e01c407f502cb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 3 Dec 2019 19:01:37 +0800 Subject: [PATCH 6/7] build: release 2.2.16 --- package.json | 2 +- src/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c19afbbce..8d3d4fb40 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.2.15", + "version": "2.2.16", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/index.ts b/src/index.ts index c7538ddb9..00dcb6833 100644 --- a/src/index.ts +++ b/src/index.ts @@ -89,7 +89,7 @@ declare global { } } -const version = '2.2.15'; +const version = '2.2.16'; const components = [ ActionSheet, AddressEdit, From 19cd3c88351ebbf56849dc636fe47839e6064ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 3 Dec 2019 19:03:08 +0800 Subject: [PATCH 7/7] docs(changelog): 2.2.16 --- docs/markdown/changelog.en-US.md | 9 +++++++++ docs/markdown/changelog.zh-CN.md | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index f18fbd9d9..fe8f2e32f 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -1,5 +1,14 @@ # Changelog +### [v2.2.16](https://github.com/youzan/vant/tree/v2.2.16) +`2019-12-03` + +**Features** + +- Stepper: add disable-plus props [\#5180](https://github.com/youzan/vant/pull/5180) +- Stepper: add disable-minus props [\#5180](https://github.com/youzan/vant/pull/5180) + + ### [v2.2.15](https://github.com/youzan/vant/tree/v2.2.15) `2019-11-28` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index 739d227f7..b850f0e16 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,15 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.2.16](https://github.com/youzan/vant/tree/v2.2.16) +`2019-12-03` + +**Features** + +- Stepper: 新增 disable-plus 属性 [\#5180](https://github.com/youzan/vant/pull/5180) +- Stepper: 新增 disable-minus 属性 [\#5180](https://github.com/youzan/vant/pull/5180) + + ### [v2.2.15](https://github.com/youzan/vant/tree/v2.2.15) `2019-11-28`