From 45d60aaf88831cc7d92fdceab838e5bb1e1e5c3d Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 3 Sep 2019 11:57:48 +0800 Subject: [PATCH] fix(Slider): should format initial value (#4337) --- src/sidebar/README.md | 2 +- src/sidebar/README.zh-CN.md | 2 +- src/slider/index.js | 5 +++++ src/slider/test/index.spec.js | 21 ++++++++++++++++++++- src/tree-select/README.md | 2 +- src/tree-select/README.zh-CN.md | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/sidebar/README.md b/src/sidebar/README.md index a0276d388..8720be841 100644 --- a/src/sidebar/README.md +++ b/src/sidebar/README.md @@ -62,7 +62,7 @@ export default { |------|------|------|------|------| | title | Content | *string* | `''` | - | | info | Info Message | *string \| number* | `''` | - | -| disabled | Whether to be disabled | *boolean* | `false` | 2.1.9 | +| disabled | Whether to be disabled | *boolean* | `false` | 2.2.0 | | url | Link | *string* | - | - | | to | Target route of the link, same as to of vue-router | *string \| object* | - | 2.0.4 | | replace | If true, the navigation will not leave a history record | *boolean* | `false` | 2.0.4 | diff --git a/src/sidebar/README.zh-CN.md b/src/sidebar/README.zh-CN.md index 14e066ae3..70466008d 100644 --- a/src/sidebar/README.zh-CN.md +++ b/src/sidebar/README.zh-CN.md @@ -66,7 +66,7 @@ export default { |------|------|------|------|------| | title | 内容 | *string* | `''` | - | | info | 提示消息 | *string \| number* | `''` | - | -| disabled | 是否禁用该项 | *boolean* | `false` | 2.1.9 | +| disabled | 是否禁用该项 | *boolean* | `false` | 2.2.0 | | url | 跳转链接 | *string* | - | - | | to | 路由跳转对象,同 vue-router 的 to 属性 | *string \| object* | - | 2.0.4 | | replace | 跳转时是否替换当前页面历史 | *boolean* | `false` | 2.0.4 | diff --git a/src/slider/index.js b/src/slider/index.js index b59aba387..008eb5841 100644 --- a/src/slider/index.js +++ b/src/slider/index.js @@ -40,6 +40,11 @@ export default createComponent({ } }, + created() { + // format initial value + this.updateValue(this.value); + }, + methods: { onTouchStart(event) { if (this.disabled) { diff --git a/src/slider/test/index.spec.js b/src/slider/test/index.spec.js index 472abf459..47c021328 100644 --- a/src/slider/test/index.spec.js +++ b/src/slider/test/index.spec.js @@ -1,5 +1,10 @@ import Slider from '..'; -import { mount, trigger, triggerDrag, mockGetBoundingClientRect } from '../../../test/utils'; +import { + mount, + trigger, + triggerDrag, + mockGetBoundingClientRect +} from '../../../test/utils'; function mockRect(vertical) { return mockGetBoundingClientRect({ @@ -134,3 +139,17 @@ it('should not emit change event when value not changed', () => { expect(wrapper.emitted('change').length).toEqual(1); }); + +it('should format initial value', done => { + mount(Slider, { + propsData: { + value: null + }, + listeners: { + input(value) { + expect(value).toEqual(0); + done(); + } + } + }); +}); diff --git a/src/tree-select/README.md b/src/tree-select/README.md index 1ca9f47a9..eb48bfed5 100644 --- a/src/tree-select/README.md +++ b/src/tree-select/README.md @@ -97,7 +97,7 @@ export default { | height | Height | *string \| number* | `300` | - | | main-Active-index | The index of selected parent node | *number* | `0` | - | | active-id | Id of selected item | *string \| number \| (string \| number)[]* | `0` | - | -| max | Maximum number of selected items | *number* | `Infinity` | 2.1.9 | +| max | Maximum number of selected items | *number* | `Infinity` | 2.2.0 | ### Events diff --git a/src/tree-select/README.zh-CN.md b/src/tree-select/README.zh-CN.md index 4d75e8fc6..2183eac5f 100644 --- a/src/tree-select/README.zh-CN.md +++ b/src/tree-select/README.zh-CN.md @@ -103,7 +103,7 @@ export default { | height | 高度,默认单位为 px | *string \| number* | `300` | - | | main-active-index | 左侧选中项的索引 | *number* | `0` | - | | active-id | 右侧选中项的 id,支持传入数组 | *string \| number \| (string \| number)[]* | `0` | - | -| max | 右侧项最大选中个数 | *number* | *Infinity* | 2.1.9 | +| max | 右侧项最大选中个数 | *number* | *Infinity* | 2.2.0 | ### Events