From 053a68e40d2dfa4b5372b19ea31f0351e97ce7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=88=E5=85=89?= <15521648+xiaoyueguang@users.noreply.github.com> Date: Mon, 28 Sep 2020 17:32:24 +0800 Subject: [PATCH 01/16] types(Swipe): add prev, next method types (#7270) --- types/swipe.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/swipe.d.ts b/types/swipe.d.ts index 1d130fbec..e02f98473 100644 --- a/types/swipe.d.ts +++ b/types/swipe.d.ts @@ -5,7 +5,8 @@ export type SwipeToOptions = { }; export class Swipe extends VanComponent { + prev(): void; + next(): void; swipeTo(index: number, options?: SwipeToOptions): void; - resize(): void; } From 8d2c4b1e4671e7e154c16da4228cbb618e195963 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 29 Sep 2020 20:49:22 +0800 Subject: [PATCH 02/16] feat(CollapseItem): add toggle method (#7281) * feat(CollapseItem): add toggle method * chore: update doc --- src/address-edit/README.md | 2 +- src/address-edit/README.zh-CN.md | 2 +- src/area/README.md | 2 +- src/area/README.zh-CN.md | 2 +- src/calendar/README.md | 2 +- src/calendar/README.zh-CN.md | 2 +- src/checkbox/README.md | 4 +- src/checkbox/README.zh-CN.md | 4 +- src/collapse-item/index.js | 10 +++-- src/collapse/README.md | 8 ++++ src/collapse/README.zh-CN.md | 22 +++++++---- src/collapse/test/index.spec.js | 58 +++++++++++++++++++++++++++++ src/count-down/README.md | 2 +- src/count-down/README.zh-CN.md | 2 +- src/datetime-picker/README.md | 2 +- src/datetime-picker/README.zh-CN.md | 2 +- src/dropdown-menu/README.md | 8 ++-- src/dropdown-menu/README.zh-CN.md | 4 +- src/field/README.md | 2 +- src/field/README.zh-CN.md | 2 +- src/form/README.md | 2 +- src/form/README.zh-CN.md | 2 +- src/list/README.md | 2 +- src/list/README.zh-CN.md | 2 +- src/picker/README.md | 2 +- src/picker/README.zh-CN.md | 2 +- src/sku/README.md | 2 +- src/sku/README.zh-CN.md | 2 +- src/swipe-cell/README.md | 2 +- src/swipe-cell/README.zh-CN.md | 2 +- src/swipe/README.md | 2 +- src/swipe/README.zh-CN.md | 2 +- src/tab/README.md | 2 +- src/tab/README.zh-CN.md | 2 +- src/uploader/README.md | 2 +- src/uploader/README.zh-CN.md | 2 +- types/collapse-item.d.ts | 5 +++ types/index.d.ts | 3 +- 38 files changed, 132 insertions(+), 50 deletions(-) create mode 100644 types/collapse-item.d.ts diff --git a/src/address-edit/README.md b/src/address-edit/README.md index 8b4d54a18..c1256d35e 100644 --- a/src/address-edit/README.md +++ b/src/address-edit/README.md @@ -112,7 +112,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get AddressEdit instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get AddressEdit instance and call instance methods. | Name | Description | Attribute | Return value | | ---------------- | ------------------ | --------------------- | ------------ | diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md index 6e0af8dd4..23e331f4a 100644 --- a/src/address-edit/README.zh-CN.md +++ b/src/address-edit/README.zh-CN.md @@ -112,7 +112,7 @@ export default { ### 方法 -通过 ref 可以获取到 AddressEdit 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 AddressEdit 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | ---------------- | ------------ | --------------------- | ------ | diff --git a/src/area/README.md b/src/area/README.md index df47e9d37..2a063927f 100644 --- a/src/area/README.md +++ b/src/area/README.md @@ -89,7 +89,7 @@ To have a selected value，simply pass the `code` of target area to `value` prop ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Area instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Area instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | ------------------------- | ------------- | ------------ | diff --git a/src/area/README.zh-CN.md b/src/area/README.zh-CN.md index 60321d4b6..9ab47d544 100644 --- a/src/area/README.zh-CN.md +++ b/src/area/README.zh-CN.md @@ -89,7 +89,7 @@ Vue.use(Area); ### 方法 -通过 ref 可以获取到 Area 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Area 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/calendar/README.md b/src/calendar/README.md index 259b3b768..70c9db79b 100644 --- a/src/calendar/README.md +++ b/src/calendar/README.md @@ -312,7 +312,7 @@ Following props are supported when the type is multiple ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Calendar instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Calendar instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | ----------------------------------- | --------- | ------------ | diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index 20d8c0b17..a7c8fb1a4 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -316,7 +316,7 @@ export default { ### 方法 -通过 ref 可以获取到 Calendar 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Calendar 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | ------ | ---------------------- | ---- | ------ | diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 2b358a215..3f6321f27 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -255,7 +255,7 @@ export default { ### CheckboxGroup Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get CheckboxGroup instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get CheckboxGroup instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | @@ -263,7 +263,7 @@ Use [ref](https://vuejs.org/v2/api/#ref) to get CheckboxGroup instance and call ### Checkbox Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Checkbox instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Checkbox instance and call instance methods. | Name | Description | Attribute | Return value | | ------ | ------------------- | ------------------- | ------------ | diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index 539ef31d2..20b84d1e1 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -275,7 +275,7 @@ export default { ### CheckboxGroup 方法 -通过 ref 可以获取到 CheckboxGroup 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 CheckboxGroup 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | @@ -283,7 +283,7 @@ export default { ### Checkbox 方法 -通过 ref 可以获取到 Checkbox 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Checkbox 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/collapse-item/index.js b/src/collapse-item/index.js index f84910079..d74fac88e 100644 --- a/src/collapse-item/index.js +++ b/src/collapse-item/index.js @@ -105,15 +105,17 @@ export default createComponent({ methods: { onClick() { - if (this.disabled) { - return; + if (!this.disabled) { + this.toggle(); } + }, + // @exposed-api + toggle(expanded = !this.expanded) { const { parent, currentName } = this; const close = parent.accordion && currentName === parent.value; const name = close ? '' : currentName; - - parent.switch(name, !this.expanded); + this.parent.switch(name, expanded); }, onTransitionEnd() { diff --git a/src/collapse/README.md b/src/collapse/README.md index e72bb1809..82b50d63c 100644 --- a/src/collapse/README.md +++ b/src/collapse/README.md @@ -126,3 +126,11 @@ export default { | icon | Custom icon | | title | Custom title | | right-icon | Custom right icon | + +### CollapseItem Methods + +Use [ref](https://vuejs.org/v2/api/#ref) to get CollapseItem instance and call instance methods. + +| Name | Description | Attribute | Return value | +| --- | --- | --- | --- | +| toggle `v2.10.9` | Toggle expanded status | _expanded: boolean_ | - | diff --git a/src/collapse/README.zh-CN.md b/src/collapse/README.zh-CN.md index f67dc534e..496b781f5 100644 --- a/src/collapse/README.zh-CN.md +++ b/src/collapse/README.zh-CN.md @@ -117,10 +117,18 @@ export default { ### CollapseItem Slots -| 名称 | 说明 | -| ---------- | ----------------------------- | -| default | 面板内容 | -| value | 自定义显示内容 | -| icon | 自定义`icon` | -| title | 自定义`title` | -| right-icon | 自定义右侧按钮，默认是`arrow` | +| 名称 | 说明 | +| ---------- | ------------------------------ | +| default | 面板内容 | +| value | 自定义显示内容 | +| icon | 自定义 `icon` | +| title | 自定义 `title` | +| right-icon | 自定义右侧按钮，默认是 `arrow` | + +### CollapseItem 方法 + +通过 ref 可以获取到 CollapseItem 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 + +| 方法名 | 说明 | 参数 | 返回值 | +| --- | --- | --- | --- | +| toggle `v2.10.9` | 切换面试展开状态，传 `true` 为展开，`false` 为收起，不传参为切换 | _expand?: boolean_ | - | diff --git a/src/collapse/test/index.spec.js b/src/collapse/test/index.spec.js index 6702cd9d9..bc935f91d 100644 --- a/src/collapse/test/index.spec.js +++ b/src/collapse/test/index.spec.js @@ -144,3 +144,61 @@ test('warn when value type is incorrect', () => { expect(error).toHaveBeenCalledTimes(1); console.error = originConsoleError; }); + +test('toggle method', (done) => { + mount({ + template: ` + + + + + `, + data() { + return { active: [] }; + }, + mounted() { + this.$refs.a.toggle(); + expect(this.active).toEqual(['a']); + + this.$refs.b.toggle(); + expect(this.active).toEqual(['a', 'b']); + + this.$refs.b.toggle(false); + expect(this.active).toEqual(['a']); + + this.$refs.a.toggle(); + expect(this.active).toEqual([]); + + done(); + }, + }); +}); + +test('toggle method in accordion mode', (done) => { + mount({ + template: ` + + + + + `, + data() { + return { active: '' }; + }, + mounted() { + this.$refs.a.toggle(); + expect(this.active).toEqual('a'); + + this.$refs.b.toggle(); + expect(this.active).toEqual('b'); + + this.$refs.b.toggle(false); + expect(this.active).toEqual(''); + + this.$refs.a.toggle(); + expect(this.active).toEqual('a'); + + done(); + }, + }); +}); diff --git a/src/count-down/README.md b/src/count-down/README.md index d6240004e..99e5b7c46 100644 --- a/src/count-down/README.md +++ b/src/count-down/README.md @@ -156,7 +156,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get CountDown instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get CountDown instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | ---------------- | --------- | ------------ | diff --git a/src/count-down/README.zh-CN.md b/src/count-down/README.zh-CN.md index b37b30448..83444324c 100644 --- a/src/count-down/README.zh-CN.md +++ b/src/count-down/README.zh-CN.md @@ -166,7 +166,7 @@ export default { ### 方法 -通过 ref 可以获取到 CountDown 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 CountDown 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/datetime-picker/README.md b/src/datetime-picker/README.md index 872973140..0b2c4e23a 100644 --- a/src/datetime-picker/README.md +++ b/src/datetime-picker/README.md @@ -294,7 +294,7 @@ Following props are supported when the type is time ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get DatetimePicker instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get DatetimePicker instance and call instance methods. | Name | Description | Attribute | Return value | | ------------------ | ------------------- | --------- | ------------ | diff --git a/src/datetime-picker/README.zh-CN.md b/src/datetime-picker/README.zh-CN.md index 4b2dda45e..04f5c4b5e 100644 --- a/src/datetime-picker/README.zh-CN.md +++ b/src/datetime-picker/README.zh-CN.md @@ -303,7 +303,7 @@ export default { ### 方法 -通过 ref 可以获取到 DatetimePicker 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 DatetimePicker 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/dropdown-menu/README.md b/src/dropdown-menu/README.md index f39fe3cf8..d7c7e71fb 100644 --- a/src/dropdown-menu/README.md +++ b/src/dropdown-menu/README.md @@ -163,11 +163,11 @@ Use `active-color` prop to custom active color of the title and options. ### DropdownItem Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get DropdownItem instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get DropdownItem instance and call instance methods. -| Name | Description | Attribute | Return value | -| ------ | -------------- | ------------- | ------------ | -| toggle | Toggle display | show: boolean | - | +| Name | Description | Attribute | Return value | +| ------ | -------------- | --------------- | ------------ | +| toggle | Toggle display | _show: boolean_ | - | ### Data Structure of Option diff --git a/src/dropdown-menu/README.zh-CN.md b/src/dropdown-menu/README.zh-CN.md index 8e4424f3d..3c0a72c9b 100644 --- a/src/dropdown-menu/README.zh-CN.md +++ b/src/dropdown-menu/README.zh-CN.md @@ -167,11 +167,11 @@ export default { ### DropdownItem 方法 -通过 ref 可以获取到 DropdownItem 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 DropdownItem 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | -| toggle | 切换菜单展示状态，传`true`为显示，`false`为隐藏，不传参为取反 | show?: boolean | - | +| toggle | 切换菜单展示状态，传 `true` 为显示，`false` 为隐藏，不传参为取反 | _show?: boolean_ | - | ### Option 数据结构 diff --git a/src/field/README.md b/src/field/README.md index 62fd6bd46..43261bdbf 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -270,7 +270,7 @@ Field support all native events of input tag ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Field instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Field instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | ------------------- | --------- | ------------ | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index 6ec7a7e4e..242b745f0 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -295,7 +295,7 @@ export default { ### 方法 -通过 ref 可以获取到 Field 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Field 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | ------ | -------------- | ---- | ------ | diff --git a/src/form/README.md b/src/form/README.md index 5d0330f07..e90b9ff37 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -467,7 +467,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Form instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Form instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index da43df78f..8722be87f 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -508,7 +508,7 @@ export default { ### 方法 -通过 ref 可以获取到 Form 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Form 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/list/README.md b/src/list/README.md index b2b0f31a5..71e7e68b4 100644 --- a/src/list/README.md +++ b/src/list/README.md @@ -162,7 +162,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get List instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get List instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | --------------------- | --------- | ------------ | diff --git a/src/list/README.zh-CN.md b/src/list/README.zh-CN.md index bb1165031..6d50869b0 100644 --- a/src/list/README.zh-CN.md +++ b/src/list/README.zh-CN.md @@ -177,7 +177,7 @@ export default { ### 方法 -通过 ref 可以获取到 List 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 List 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/picker/README.md b/src/picker/README.md index f25ea24fc..13cdabbf7 100644 --- a/src/picker/README.md +++ b/src/picker/README.md @@ -287,7 +287,7 @@ Picker events will pass different parameters according to the columns are single ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Picker instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Picker instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/picker/README.zh-CN.md b/src/picker/README.zh-CN.md index 22bcf5e29..5274f0f39 100644 --- a/src/picker/README.zh-CN.md +++ b/src/picker/README.zh-CN.md @@ -312,7 +312,7 @@ export default { ### 方法 -通过 ref 可以获取到 Picker 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Picker 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/sku/README.md b/src/sku/README.md index 73e64d92d..179e99240 100644 --- a/src/sku/README.md +++ b/src/sku/README.md @@ -157,7 +157,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Sku instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Sku instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/sku/README.zh-CN.md b/src/sku/README.zh-CN.md index 686de63c4..dca1ce63c 100644 --- a/src/sku/README.zh-CN.md +++ b/src/sku/README.zh-CN.md @@ -162,7 +162,7 @@ export default { ### 方法 -通过 ref 可以获取到 Sku 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Sku 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | ------------------------- | ---------------------- | ---- | ------- | diff --git a/src/swipe-cell/README.md b/src/swipe-cell/README.md index 2ccdebf67..16762f6e3 100644 --- a/src/swipe-cell/README.md +++ b/src/swipe-cell/README.md @@ -131,7 +131,7 @@ export default { ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get SwipeCell instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get SwipeCell instance and call instance methods. | Name | Description | Attribute | Return value | | ----- | --------------- | ------------------------ | ------------ | diff --git a/src/swipe-cell/README.zh-CN.md b/src/swipe-cell/README.zh-CN.md index 66b62c287..11ae45774 100644 --- a/src/swipe-cell/README.zh-CN.md +++ b/src/swipe-cell/README.zh-CN.md @@ -141,7 +141,7 @@ beforeClose 的第一个参数为对象，对象中包含以下属性： ### 方法 -通过 ref 可以获取到 SwipeCell 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 SwipeCell 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | ------ | ---------------- | ------------------------ | ------ | diff --git a/src/swipe/README.md b/src/swipe/README.md index 329757768..c1a3daef5 100644 --- a/src/swipe/README.md +++ b/src/swipe/README.md @@ -187,7 +187,7 @@ export default { ### Swipe Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Swipe instance and call instance methods. +Use [ref](https://vuejs.org/v2/api/#ref) to get Swipe instance and call instance methods.. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/swipe/README.zh-CN.md b/src/swipe/README.zh-CN.md index 4834dccb9..00febc693 100644 --- a/src/swipe/README.zh-CN.md +++ b/src/swipe/README.zh-CN.md @@ -193,7 +193,7 @@ export default { ### Swipe 方法 -通过 ref 可以获取到 Swipe 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 +通过 ref 可以获取到 Swipe 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/tab/README.md b/src/tab/README.md index e78980f12..a0bf32707 100644 --- a/src/tab/README.md +++ b/src/tab/README.md @@ -265,7 +265,7 @@ export default { ### Tabs Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Tabs instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Tabs instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/tab/README.zh-CN.md b/src/tab/README.zh-CN.md index 77a10cb63..1df713497 100644 --- a/src/tab/README.zh-CN.md +++ b/src/tab/README.zh-CN.md @@ -273,7 +273,7 @@ export default { ### Tabs 方法 -通过 ref 可以获取到 Tabs 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Tabs 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/src/uploader/README.md b/src/uploader/README.md index e5f2c39c4..d7531e2a2 100644 --- a/src/uploader/README.md +++ b/src/uploader/README.md @@ -253,7 +253,7 @@ Use `disabled` prop to disable uploader. ### Methods -Use [ref](https://vuejs.org/v2/api/#ref) to get Uploader instance and call instance methods +Use [ref](https://vuejs.org/v2/api/#ref) to get Uploader instance and call instance methods. | Name | Description | Attribute | Return value | | --- | --- | --- | --- | diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md index add7f93ec..e1188659e 100644 --- a/src/uploader/README.zh-CN.md +++ b/src/uploader/README.zh-CN.md @@ -281,7 +281,7 @@ before-read、after-read、before-delete 执行时会传递以下回调参数： ### 方法 -通过 ref 可以获取到 Uploader 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa) +通过 ref 可以获取到 Uploader 实例并调用实例方法，详见[组件实例方法](#/zh-CN/quickstart#zu-jian-shi-li-fang-fa)。 | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | diff --git a/types/collapse-item.d.ts b/types/collapse-item.d.ts new file mode 100644 index 000000000..092e80e72 --- /dev/null +++ b/types/collapse-item.d.ts @@ -0,0 +1,5 @@ +import { VanComponent } from './component'; + +export class CollapseItem extends VanComponent { + toggle(expanded?: boolean): void; +} diff --git a/types/index.d.ts b/types/index.d.ts index d3b02188b..38a46936a 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -6,6 +6,7 @@ import { Area } from './area'; import { Calendar } from './calendar'; import { Checkbox } from './checkbox'; import { CheckboxGroup } from './checkbox-group'; +import { CollapseItem } from './collapse-item'; import { CountDown } from './count-down'; import { DatetimePicker } from './datetime-picker'; import { Dialog } from './dialog'; @@ -37,7 +38,6 @@ export class CellGroup extends VanComponent {} export class Circle extends VanComponent {} export class Col extends VanComponent {} export class Collapse extends VanComponent {} -export class CollapseItem extends VanComponent {} export class ContactCard extends VanComponent {} export class ContactEdit extends VanComponent {} export class ContactList extends VanComponent {} @@ -97,6 +97,7 @@ export { Calendar, Checkbox, CheckboxGroup, + CollapseItem, CountDown, DatetimePicker, Dialog, From 04dca5f39d63a2293664a0ebec618bf897f0c937 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 29 Sep 2020 20:56:43 +0800 Subject: [PATCH 03/16] docs: add more intro (#7282) --- src/collapse/README.zh-CN.md | 4 ++++ src/dropdown-menu/README.zh-CN.md | 4 ++++ src/number-keyboard/README.zh-CN.md | 2 +- src/swipe-cell/README.zh-CN.md | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/collapse/README.zh-CN.md b/src/collapse/README.zh-CN.md index 496b781f5..81c71d65e 100644 --- a/src/collapse/README.zh-CN.md +++ b/src/collapse/README.zh-CN.md @@ -1,5 +1,9 @@ # Collapse 折叠面板 +### 介绍 + +将一组内容放置在多个折叠面板中，点击面板的标题可以展开或收缩其内容。 + ### 引入 ```js diff --git a/src/dropdown-menu/README.zh-CN.md b/src/dropdown-menu/README.zh-CN.md index 3c0a72c9b..cc5648cb2 100644 --- a/src/dropdown-menu/README.zh-CN.md +++ b/src/dropdown-menu/README.zh-CN.md @@ -1,5 +1,9 @@ # DropdownMenu 下拉菜单 +### 介绍 + +向下弹出的菜单列表。 + ### 引入 ```js diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md index 99392b922..a52e8685d 100644 --- a/src/number-keyboard/README.zh-CN.md +++ b/src/number-keyboard/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -数字虚拟键盘，可以配合[密码输入框组件](#/zh-CN/password-input)或自定义的输入框组件使用。 +虚拟数字键盘，可以配合[密码输入框组件](#/zh-CN/password-input)或自定义的输入框组件使用。 ### 引入 diff --git a/src/swipe-cell/README.zh-CN.md b/src/swipe-cell/README.zh-CN.md index 11ae45774..8a6c0a555 100644 --- a/src/swipe-cell/README.zh-CN.md +++ b/src/swipe-cell/README.zh-CN.md @@ -1,5 +1,9 @@ # SwipeCell 滑动单元格 +### 介绍 + +可以左右滑动来展示操作按钮的单元格组件。 + ### 引入 ```js From f15534928e9a4d3997c720919b0853a9197bd2c0 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 29 Sep 2020 21:01:28 +0800 Subject: [PATCH 04/16] docs: update design intro (#7283) --- docs/markdown/design.zh-CN.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/markdown/design.zh-CN.md b/docs/markdown/design.zh-CN.md index 6b81c6993..b837933cc 100644 --- a/docs/markdown/design.zh-CN.md +++ b/docs/markdown/design.zh-CN.md @@ -2,7 +2,9 @@ ### 介绍 -这里提供了 Vant 现有的设计资源，更多资源还在整理中。 +Vant 是基于有赞 [Zan Design System](https://design.youzan.com/) 视觉规范实现的组件库，在这里可以下载 Vant 的设计资源。 + +## 设计稿 ### 组件设计稿（Sketch） From 950dd10372ade737645c1cc2b7ce106545f4ded1 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 30 Sep 2020 11:42:23 +0800 Subject: [PATCH 05/16] fix(Field): incorrect maxlength slicing (#7284) * fix(Field): incorrect maxlength slicing * chore: robust --- src/field/index.js | 9 +++++++-- src/field/test/index.spec.js | 12 ++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 4bc2cb8e5..0627b2f20 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -294,10 +294,15 @@ export default createComponent({ updateValue(value, trigger = 'onChange') { value = isDef(value) ? String(value) : ''; - // native maxlength not work when type is number + // native maxlength have incorrect line-break counting + // see: https://github.com/youzan/vant/issues/5033 const { maxlength } = this; if (isDef(maxlength) && value.length > maxlength) { - value = value.slice(0, maxlength); + if (this.value && this.value.length === +maxlength) { + ({ value } = this); + } else { + value = value.slice(0, maxlength); + } } if (this.type === 'number' || this.type === 'digit') { diff --git a/src/field/test/index.spec.js b/src/field/test/index.spec.js index 08d23757f..e0a145001 100644 --- a/src/field/test/index.spec.js +++ b/src/field/test/index.spec.js @@ -171,17 +171,25 @@ test('maxlength', async () => { value: 1234, type: 'number', }, + listeners: { + input(value) { + wrapper && wrapper.setProps({ value }); + }, + }, }); const input = wrapper.find('input'); expect(input.element.value).toEqual('123'); input.element.value = 1234; - await later(); input.trigger('input'); - expect(input.element.value).toEqual('123'); expect(wrapper.emitted('input')[0][0]).toEqual('123'); + + // see: https://github.com/youzan/vant/issues/7265 + input.element.value = 1423; + input.trigger('input'); + expect(input.element.value).toEqual('123'); }); test('clearable prop', () => { From 15c158761fcc4f8ec9624dead9ab6793cdb76c3f Mon Sep 17 00:00:00 2001 From: yuningjiang123 <45219486+yuningjiang123@users.noreply.github.com> Date: Wed, 30 Sep 2020 20:10:34 -0500 Subject: [PATCH 06/16] fix(vant-markdown-vetur): fix Windows system build vetur problem (#7277) (#7287) Co-authored-by: wb.jiangyuning --- packages/vant-markdown-vetur/src/parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-markdown-vetur/src/parser.ts b/packages/vant-markdown-vetur/src/parser.ts index 9ddf1f0cc..faaf90722 100644 --- a/packages/vant-markdown-vetur/src/parser.ts +++ b/packages/vant-markdown-vetur/src/parser.ts @@ -1,6 +1,6 @@ /* eslint-disable no-cond-assign */ const TITLE_REG = /^(#+)\s+([^\n]*)/; -const TABLE_REG = /^\|.+\n\|\s*-+/; +const TABLE_REG = /^\|.+\r?\n\|\s*-+/; const TD_REG = /\s*`[^`]+`\s*|([^|`]+)/g; const TABLE_SPLIT_LINE_REG = /^\|\s*-/; From 3c7ea5d74fe5d7b7592b12c3f185e4b5d5175b04 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 09:12:59 +0800 Subject: [PATCH 07/16] chore(markdown-vetur): fix npm registry --- packages/vant-markdown-vetur/yarn.lock | 76 +++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/vant-markdown-vetur/yarn.lock b/packages/vant-markdown-vetur/yarn.lock index ab414595e..02b4a88e3 100644 --- a/packages/vant-markdown-vetur/yarn.lock +++ b/packages/vant-markdown-vetur/yarn.lock @@ -4,7 +4,7 @@ "@nodelib/fs.scandir@2.1.3": version "2.1.3" - resolved "http://registry.npm.qima-inc.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" + resolved "https://registry.npm.taobao.org/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" integrity sha1-Olgr21OATGum0UZXnEblITDPSjs= dependencies: "@nodelib/fs.stat" "2.0.3" @@ -12,45 +12,45 @@ "@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": version "2.0.3" - resolved "http://registry.npm.qima-inc.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" + resolved "https://registry.npm.taobao.org/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" integrity sha1-NNxfTKu8cg9OYPdadH5+zWwXW9M= "@nodelib/fs.walk@^1.2.3": version "1.2.4" - resolved "http://registry.npm.qima-inc.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" + resolved "https://registry.npm.taobao.org/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" integrity sha1-ARuSAqcKY2bkNspcBlhEUoqwSXY= dependencies: "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" "@types/fs-extra@^8.1.0": - version "8.1.0" - resolved "http://registry.npm.qima-inc.com/@types/fs-extra/download/@types/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d" - integrity sha1-ERSDS1PDkUgGzQOzMEs3s70iGk0= + version "8.1.1" + resolved "https://registry.npm.taobao.org/@types/fs-extra/download/@types/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068" + integrity sha1-HknyLQmqRuGbUcCwE8tj0NkjoGg= dependencies: "@types/node" "*" "@types/node@*": - version "13.9.3" - resolved "http://registry.npm.qima-inc.com/@types/node/download/@types/node-13.9.3.tgz#6356df2647de9eac569f9a52eda3480fa9e70b4d" - integrity sha1-Y1bfJkfenqxWn5pS7aNID6nnC00= + version "14.11.2" + resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.11.2.tgz?cache=0&sync_timestamp=1600732726474&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" + integrity sha1-LeHtZnBDk4faHJ9UmireKwp5klY= at-least-node@^1.0.0: version "1.0.0" - resolved "http://registry.npm.qima-inc.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= braces@^3.0.1: version "3.0.2" - resolved "http://registry.npm.qima-inc.com/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc= dependencies: fill-range "^7.0.1" fast-glob@^3.2.2: - version "3.2.2" - resolved "http://registry.npm.qima-inc.com/fast-glob/download/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" - integrity sha1-reGp2RFIll1L98UfcuHKZi0y5j0= + version "3.2.4" + resolved "https://registry.npm.taobao.org/fast-glob/download/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" + integrity sha1-0grvv5lXk4Pn88xmUpFYybmFVNM= dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -60,23 +60,23 @@ fast-glob@^3.2.2: picomatch "^2.2.1" fastq@^1.6.0: - version "1.6.1" - resolved "http://registry.npm.qima-inc.com/fastq/download/fastq-1.6.1.tgz#4570c74f2ded173e71cf0beb08ac70bb85826791" - integrity sha1-RXDHTy3tFz5xzwvrCKxwu4WCZ5E= + version "1.8.0" + resolved "https://registry.npm.taobao.org/fastq/download/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481" + integrity sha1-VQ4fn1m7xl/hhctqm02VNXEH9IE= dependencies: reusify "^1.0.4" fill-range@^7.0.1: version "7.0.1" - resolved "http://registry.npm.qima-inc.com/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha1-GRmmp8df44ssfHflGYU12prN2kA= dependencies: to-regex-range "^5.0.1" fs-extra@^9.0.0: - version "9.0.0" - resolved "http://registry.npm.qima-inc.com/fs-extra/download/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" - integrity sha1-tq/DEDbiR7JGbcmcKa55fV1FgKM= + version "9.0.1" + resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-9.0.1.tgz?cache=0&sync_timestamp=1592843137563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" + integrity sha1-kQ2gBiQ3ukw5/t2GPxZ1zP78ufw= dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" @@ -85,36 +85,36 @@ fs-extra@^9.0.0: glob-parent@^5.1.0: version "5.1.1" - resolved "http://registry.npm.qima-inc.com/glob-parent/download/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" integrity sha1-tsHvQXxOVmPqSY8cRa+saRa7wik= dependencies: is-glob "^4.0.1" graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.3" - resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM= + version "4.2.4" + resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha1-Ila94U02MpWMRl68ltxGfKB6Kfs= is-extglob@^2.1.1: version "2.1.1" - resolved "http://registry.npm.qima-inc.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-glob@^4.0.1: version "4.0.1" - resolved "http://registry.npm.qima-inc.com/is-glob/download/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + resolved "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw= dependencies: is-extglob "^2.1.1" is-number@^7.0.0: version "7.0.0" - resolved "http://registry.npm.qima-inc.com/is-number/download/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + resolved "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss= jsonfile@^6.0.1: version "6.0.1" - resolved "http://registry.npm.qima-inc.com/jsonfile/download/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" integrity sha1-mJZsuiFDeMjIS4LghZB7QL9hQXk= dependencies: universalify "^1.0.0" @@ -122,13 +122,13 @@ jsonfile@^6.0.1: graceful-fs "^4.1.6" merge2@^1.3.0: - version "1.3.0" - resolved "http://registry.npm.qima-inc.com/merge2/download/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" - integrity sha1-WzZu6DsvFYLEj4fkfPGpNSEDyoE= + version "1.4.1" + resolved "https://registry.npm.taobao.org/merge2/download/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= micromatch@^4.0.2: version "4.0.2" - resolved "http://registry.npm.qima-inc.com/micromatch/download/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk= dependencies: braces "^3.0.1" @@ -136,27 +136,27 @@ micromatch@^4.0.2: picomatch@^2.0.5, picomatch@^2.2.1: version "2.2.2" - resolved "http://registry.npm.qima-inc.com/picomatch/download/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + resolved "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= reusify@^1.0.4: version "1.0.4" - resolved "http://registry.npm.qima-inc.com/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= run-parallel@^1.1.9: version "1.1.9" - resolved "http://registry.npm.qima-inc.com/run-parallel/download/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" + resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" integrity sha1-yd06fPn0ssS2JE4XOm7YZuYd1nk= to-regex-range@^5.0.1: version "5.0.1" - resolved "http://registry.npm.qima-inc.com/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= dependencies: is-number "^7.0.0" universalify@^1.0.0: version "1.0.0" - resolved "http://registry.npm.qima-inc.com/universalify/download/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" integrity sha1-thodoXPoQ1sv48Z9Kbmt+FlL0W0= From bd7c07d94a88126d60e3b1f1253be2037756e4b3 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 09:14:41 +0800 Subject: [PATCH 08/16] chore: release @vant/markdown-vetur@2.0.2 --- packages/vant-markdown-vetur/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/vant-markdown-vetur/package.json b/packages/vant-markdown-vetur/package.json index 0db9be4e0..4216c7cfb 100644 --- a/packages/vant-markdown-vetur/package.json +++ b/packages/vant-markdown-vetur/package.json @@ -1,13 +1,14 @@ { "name": "@vant/markdown-vetur", - "version": "2.0.1", + "version": "2.0.2", "description": "simple parse markdown to vue component description for vetur auto-completion", "main": "lib/index.js", "license": "MIT", "repository": "https://github.com/youzan/vant/tree/dev/packages/vant-markdown-vetur", "author": "zhangshuai", "publishConfig": { - "access": "public" + "access": "public", + "registry": "https://registry.npmjs.org/" }, "files": [ "lib" From 689cea26896e9b4aed06ed76f371076920847378 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 09:16:28 +0800 Subject: [PATCH 09/16] chore: release 2.10.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 299b457e8..22d116b53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.10.8", + "version": "2.10.9", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", From ab62dc765fedd89fbba888482a261651f71e3554 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 09:21:52 +0800 Subject: [PATCH 10/16] docs(changelog): 2.10.9 --- docs/markdown/changelog.en-US.md | 18 ++++++++++++++++++ docs/markdown/changelog.zh-CN.md | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index f5c1f83e9..afb79b7dc 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -10,6 +10,24 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). - Minor version：released every one to two months, including backwards compatible features. - Major version：including breaking changes and new features. +### [v2.10.9](https://github.com/youzan/vant/compare/v2.10.8...v2.10.9) + +`2020-10-01` + +**Feature** + +- Locale: Add German translations [#7245](https://github.com/youzan/vant/issues/7245) +- CollapseItem: add toggle method [#7281](https://github.com/youzan/vant/issues/7281) +- Pagination: add page、prev-text、next-text slot [#7222](https://github.com/youzan/vant/issues/7222) +- Tab: skip rendering empty pane [#7238](https://github.com/youzan/vant/issues/7238) + +**Bug Fixes** + +- Swipe: fix prev、next method types [#7270](https://github.com/youzan/vant/issues/7270) +- Button: incorrect ref in for [#7237](https://github.com/youzan/vant/issues/7237) +- Field: incorrect maxlength slicing [#7284](https://github.com/youzan/vant/issues/7284) +- @vant/markdown-vetur: fix Windows system build vetur problem [#7277](https://github.com/youzan/vant/issues/7277) [#7287](https://github.com/youzan/vant/issues/7287) + ### [v2.10.8](https://github.com/youzan/vant/compare/v2.10.7...v2.10.8) `2020-09-21` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index d95cf46f7..ea3fd8f78 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,24 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.10.9](https://github.com/youzan/vant/compare/v2.10.8...v2.10.9) + +`2020-10-01` + +**Feature** + +- Locale: 新增德语语言包 [#7245](https://github.com/youzan/vant/issues/7245) +- CollapseItem: 新增 toggle 方法，用于主动控制面板展开或收起 [#7281](https://github.com/youzan/vant/issues/7281) +- Pagination: 新增 page、prev-text、next-text 插槽 [#7222](https://github.com/youzan/vant/issues/7222) +- Tab: 当标签页内容为空时，不再渲染空的 `van-tab-pane` 节点 [#7238](https://github.com/youzan/vant/issues/7238) + +**Bug Fixes** + +- Swipe: 修复 prev、next 方法缺少类型定义的问题 [#7270](https://github.com/youzan/vant/issues/7270) +- Button: 修复在 v-for 中渲染时 ref 不正确的问题 [#7237](https://github.com/youzan/vant/issues/7237) +- Field: 修复设置 maxlength 后在中间输入时截断结果不正确的问题 [#7284](https://github.com/youzan/vant/issues/7284) +- @vant/markdown-vetur: 修复 Windows 系统下的兼容问题 [#7277](https://github.com/youzan/vant/issues/7277) [#7287](https://github.com/youzan/vant/issues/7287) + ### [v2.10.8](https://github.com/youzan/vant/compare/v2.10.7...v2.10.8) `2020-09-21` From e4e7d9d9ebe3944ab6599af2c9b14dd8246bcc1c Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 10:01:40 +0800 Subject: [PATCH 11/16] docs(Locale): add faq --- src/locale/README.md | 10 ++++++++-- src/locale/README.zh-CN.md | 29 +++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/locale/README.md b/src/locale/README.md index b2844ed7b..34d053770 100644 --- a/src/locale/README.md +++ b/src/locale/README.md @@ -4,18 +4,20 @@ The default language of Vant is Chinese. If you want to use other languages, you can follow the instructions below. +## Usage + ### Switch languages Vant supports multiple languages with the Locale component, and the `Locale.use` method allows you to switch to different languages. ```js import { Locale } from 'vant'; -import enUS from 'vant/lib/locale/lang/en-US'; +import enUS from 'vant/es/locale/lang/en-US'; Locale.use('en-US', enUS); ``` -### Modify default configs +### Override default configs Use `Locale.add` method to modify the default configs. @@ -52,3 +54,7 @@ Current supported languages: | Turkish | tr-TR | > View all language configs [Here](https://github.com/youzan/vant/tree/dev/src/locale/lang). + +### Add new language + +If you can’t find the language you need, please send us a Pull Request to add the new language pack, you can refer to [Add German language pack](https://github.com/youzan/vant/pull/7245) PR. diff --git a/src/locale/README.zh-CN.md b/src/locale/README.zh-CN.md index 7b4b64e44..a34a39ae6 100644 --- a/src/locale/README.zh-CN.md +++ b/src/locale/README.zh-CN.md @@ -2,7 +2,9 @@ ### 介绍 -Vant 默认采用中文作为语言，如果需要使用其他语言，可以参考下面的方案。 +Vant 采用中文作为默认语言，同时支持多语言切换，请按照下方教程进行国际化设置。 + +## 使用方法 ### 多语言切换 @@ -10,12 +12,13 @@ Vant 通过 Locale 组件实现多语言支持，使用 `Locale.use` 方法可 ```js import { Locale } from 'vant'; -import enUS from 'vant/lib/locale/lang/en-US'; +// 引入英文语言包 +import enUS from 'vant/es/locale/lang/en-US'; Locale.use('en-US', enUS); ``` -### 修改默认文案 +### 覆盖语言包 通过 `Locale.add` 方法可以实现文案的修改和扩展，示例如下： @@ -33,7 +36,7 @@ const messages = { Locale.add(messages); ``` -### 配置文件 +### 语言包 目前支持的语言: @@ -51,8 +54,22 @@ Locale.add(messages); | 罗马尼亚语 | ro-RO | | 挪威语 | nb-NO | -> 在 [这里](https://github.com/youzan/vant/tree/dev/src/locale/lang) 查看所有的 i18n 配置文件。 +> 在 [这里](https://github.com/youzan/vant/tree/dev/src/locale/lang) 查看所有的语言包源文件。 -### Sku 组件 +## 常见问题 + +### 找不到所需的语言包？ + +如果上方列表中没有你需要的语言，欢迎给我们提 Pull Request 来增加新的语言包，改动内容可以参考[增加德语语言包](https://github.com/youzan/vant/pull/7245) 的 PR。 + +### 业务代码如何实现国际化？ + +可以使用 [vue-i18n](https://github.com/kazupon/vue-i18n) 来实现。 + +### 以 CDN 形式引入时，如何使用语言包？ + +目前没有提供 CDN 形式的语言包，可以手动拷贝语言包的内容来使用。 + +### 语言包中不包含 Sku 组件？ 语言包中默认不包含 Sku 业务组件的语言配置，因此如果有 Sku 组件的国际化需求，请自行配置国际化文案。 From 14cd2863cc75d4f7328ddcf19808b9f6eec38fa4 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 10:04:46 +0800 Subject: [PATCH 12/16] fix(Picker): incorrect loading z-index --- src/picker/index.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/picker/index.less b/src/picker/index.less index b5ac22073..07d5a172b 100644 --- a/src/picker/index.less +++ b/src/picker/index.less @@ -54,7 +54,7 @@ right: 0; bottom: 0; left: 0; - z-index: 2; + z-index: 3; display: flex; align-items: center; justify-content: center; @@ -67,7 +67,7 @@ top: 50%; right: @padding-md; left: @padding-md; - z-index: 3; + z-index: 2; transform: translateY(-50%); pointer-events: none; } @@ -76,7 +76,7 @@ position: absolute; top: 0; left: 0; - z-index: 2; + z-index: 1; width: 100%; height: 100%; background-image: linear-gradient( From af43521fa2e50634da51df969b1df73033eaab59 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 17:01:58 +0800 Subject: [PATCH 13/16] docs(PasswordInput): adjust demo --- src/password-input/README.md | 51 +++---- src/password-input/README.zh-CN.md | 56 ++++---- src/password-input/demo/index.vue | 130 +++++++++++------- .../test/__snapshots__/demo.spec.js.snap | 110 ++++++++------- 4 files changed, 195 insertions(+), 152 deletions(-) diff --git a/src/password-input/README.md b/src/password-input/README.md index cc91d5136..dc469b83a 100644 --- a/src/password-input/README.md +++ b/src/password-input/README.md @@ -19,18 +19,14 @@ Vue.use(NumberKeyboard); ### Basic Usage ```html - - ``` @@ -43,30 +39,32 @@ export default { showKeyboard: true, }; }, - methods: { - onInput(key) { - this.value = (this.value + key).slice(0, 6); - }, - onDelete() { - this.value = this.value.slice(0, this.value.length - 1); - }, - }, }; ``` -### Custom length +### Custom Length ```html ``` -### Without mask +### Add Gutter + +```html + +``` + +### Without Mask ```html - - ``` @@ -104,22 +99,18 @@ export default { data() { return { value: '123', - showKeyboard: true, errorInfo: '', + showKeyboard: true, }; }, - methods: { - onInput(key) { - this.value = (this.value + key).slice(0, 6); - if (this.value.length === 6) { + watch: { + value(value) { + if (value.length === 6 && value !== '123456') { this.errorInfo = 'Password Mistake'; } else { this.errorInfo = ''; } }, - onDelete() { - this.value = this.value.slice(0, this.value.length - 1); - }, }, }; ``` diff --git a/src/password-input/README.zh-CN.md b/src/password-input/README.zh-CN.md index fdc6e3d51..c892a818f 100644 --- a/src/password-input/README.zh-CN.md +++ b/src/password-input/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -带网格的输入框组件，可以用于输入支付密码、短信验证码等，通常与[数字键盘](#/zh-CN/number-keyboard)组件配合使用。 +带网格的输入框组件，可以用于输入密码、短信验证码等场景，通常与[数字键盘](#/zh-CN/number-keyboard)组件配合使用。 ### 引入 @@ -18,19 +18,19 @@ Vue.use(NumberKeyboard); ### 基础用法 +搭配数字键盘组件来实现密码输入功能。 + ```html ``` @@ -43,24 +43,30 @@ export default { showKeyboard: true, }; }, - methods: { - onInput(key) { - this.value = (this.value + key).slice(0, 6); - }, - onDelete() { - this.value = this.value.slice(0, this.value.length - 1); - }, - }, }; ``` ### 自定义长度 +通过 `length` 属性来设置密码长度。 + ```html +``` + +### 格子间距 + +通过 `gutter` 属性来设置格子之间的间距。 + +```html + @@ -68,6 +74,8 @@ export default { ### 明文展示 +将 `mask` 设置为 `false` 可以明文展示输入的内容，适用于短信验证码等场景。 + ```html ``` -### 错误提示 +### 提示信息 -通过 `error-info` 属性可以设置错误提示信息，例如当输入六位时提示密码错误。 +通过 `info` 属性设置提示信息，通过 `error-info` 属性设置错误提示，例如当输入六位时提示密码错误。 ```html - - ``` @@ -103,22 +109,18 @@ export default { data() { return { value: '123', - showKeyboard: true, errorInfo: '', + showKeyboard: true, }; }, - methods: { - onInput(key) { - this.value = (this.value + key).slice(0, 6); - if (this.value.length === 6) { + watch: { + value(value) { + if (value.length === 6 && value !== '123456') { this.errorInfo = '密码错误'; } else { this.errorInfo = ''; } }, - onDelete() { - this.value = this.value.slice(0, this.value.length - 1); - }, }, }; ``` diff --git a/src/password-input/demo/index.vue b/src/password-input/demo/index.vue index d321ade5e..28122ac87 100644 --- a/src/password-input/demo/index.vue +++ b/src/password-input/demo/index.vue @@ -1,48 +1,56 @@ @@ -51,46 +59,76 @@ export default { i18n: { 'zh-CN': { info: '密码为 6 位数字', - customLength: '自定义长度', - removeMask: '明文展示', - hintError: '错误提示', + showInfo: '提示信息', + addGutter: '格子间距', errorInfo: '密码错误', + removeMask: '明文展示', + customLength: '自定义长度', }, 'en-US': { info: 'Some tips', - customLength: 'Custom Length', - removeMask: 'Remove Mask', - hintError: 'Hint Error', + showInfo: 'Show Info', + addGutter: 'Add Gutter', errorInfo: 'Password Mistake', + removeMask: 'Remove Mask', + customLength: 'Custom Length', }, }, data() { return { - value1: '123', - value2: '123', - value3: '123', - value4: '123', - keyboard: 'value1', + value: { + showInfo: '123', + addGutter: '123', + basicUsage: '123', + removeMask: '123', + customLength: '123', + }, + current: 'basicUsage', errorInfo: '', }; }, - methods: { - onInput(key) { - const { keyboard } = this; - this[keyboard] = (this[keyboard] + key).slice(0, 6); - if (this[keyboard].length === 6) { - this.errorInfo = this.t('errorInfo'); - } else { - this.errorInfo = ''; + watch: { + current(value) { + if (value) { + const el = this.$refs[value].$el; + const { top } = el.getBoundingClientRect(); + window.scrollTo(0, window.pageYOffset + top); } }, + }, + methods: { + onInput(key) { + const { value, current } = this; + const maxlegnth = current === 'customLength' ? 4 : 6; + const newValue = (value[current] + key).slice(0, maxlegnth); + + value[current] = newValue; + + if ( + current === 'showInfo' && + newValue.length === 6 && + newValue !== '123456' + ) { + this.errorInfo = this.t('errorInfo'); + } + }, onDelete() { - const { keyboard } = this; - this[keyboard] = this[keyboard].slice(0, this[keyboard].length - 1); + const { value, current } = this; + value[current] = value[current].slice(0, value[current].length - 1); + + if (current === 'showInfo') { + this.errorInfo = ''; + } }, }, }; + + diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index ca92591da..6a78e4814 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -14,62 +14,27 @@ exports[`renders demo correctly 1`] = `
    • -
    密码为 6 位数字
    -
    -
    -
    -
    -
    1
    -
    -
    -
    2
    -
    -
    -
    3
    -
    -
    -
    4
    -
    -
    -
    5
    -
    -
    -
    6
    -
    -
    -
    7
    -
    -
    -
    8
    -
    -
    -
    9
    -
    -
    -
    - -
    -
    -
    -
    0
    -
    -
    -
    - -
    -
    -
    -
    +
    +
    +
    +
      +
      • +
      • +
      • +
      • +
      • -
      • -
      • -
      • +
      • +
      • +
      • +
      • +
    @@ -95,6 +60,53 @@ exports[`renders demo correctly 1`] = `
    • +
    密码为 6 位数字
    + + +
    +
    +
    +
    +
    1
    +
    +
    +
    2
    +
    +
    +
    3
    +
    +
    +
    4
    +
    +
    +
    5
    +
    +
    +
    6
    +
    +
    +
    7
    +
    +
    +
    8
    +
    +
    +
    9
    +
    +
    +
    + +
    +
    +
    +
    0
    +
    +
    +
    + +
    +
    +
    From 27822b2e5e1e1da9a67d6b62795ff8aac9213b61 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 17:05:00 +0800 Subject: [PATCH 14/16] docs(Pagination): improve slot desc --- src/pagination/README.md | 8 ++++---- src/pagination/README.zh-CN.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pagination/README.md b/src/pagination/README.md index ecdcb77d9..16807fa62 100644 --- a/src/pagination/README.md +++ b/src/pagination/README.md @@ -82,8 +82,8 @@ export default { ### Slots -| Name | Description | Default | +| Name | Description | SlotProps | | --- | --- | --- | -| prev-text | custom prev slot | `-` | -| next-text | custom next slot | `-` | -| page | pagination item slot | `{ number: number, text: string, active: boolean }` | +| page `v2.10.9` | Custom pagination item | `{ number: number, text: string, active: boolean }` | +| prev-text `v2.10.9` | Custom prev text | `-` | +| next-text `v2.10.9` | Custom next text | `-` | diff --git a/src/pagination/README.zh-CN.md b/src/pagination/README.zh-CN.md index 9363fd0c2..ca2303aca 100644 --- a/src/pagination/README.zh-CN.md +++ b/src/pagination/README.zh-CN.md @@ -82,8 +82,8 @@ export default { ### Slots -| 名称 | 描述 | 默认值 | +| 名称 | 描述 | SlotProps | | --- | --- | --- | -| prev-text | 自定义上一页插槽 | `-` | -| next-text | 自定义下一页插槽 | `-` | -| page | 自定义页码插槽 | `{ number: number, text: string, active: boolean }` | +| page `v2.10.9` | 自定义页码 | `{ number: number, text: string, active: boolean }` | +| prev-text `v2.10.9` | 自定义上一页按钮文字 | `-` | +| next-text `v2.10.9` | 自定义下一页按钮文字 | `-` | From 18312ce9e998e54256d362747123bbd8d1bf38d1 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 1 Oct 2020 17:16:25 +0800 Subject: [PATCH 15/16] docs(Pagination): improve document --- src/pagination/README.md | 4 ++-- src/pagination/README.zh-CN.md | 12 ++++++++++-- src/pagination/demo/index.vue | 6 +++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pagination/README.md b/src/pagination/README.md index 16807fa62..c82cd7d04 100644 --- a/src/pagination/README.md +++ b/src/pagination/README.md @@ -44,7 +44,7 @@ export default { /> ``` -### Custom Render +### Custom Button ```html @@ -84,6 +84,6 @@ export default { | Name | Description | SlotProps | | --- | --- | --- | -| page `v2.10.9` | Custom pagination item | `{ number: number, text: string, active: boolean }` | +| page `v2.10.9` | Custom pagination item | _{ number: number, text: string, active: boolean }_ | | prev-text `v2.10.9` | Custom prev text | `-` | | next-text `v2.10.9` | Custom next text | `-` | diff --git a/src/pagination/README.zh-CN.md b/src/pagination/README.zh-CN.md index ca2303aca..c1f65e1fc 100644 --- a/src/pagination/README.zh-CN.md +++ b/src/pagination/README.zh-CN.md @@ -13,6 +13,8 @@ Vue.use(Pagination); ### 基础用法 +通过 `v-model` 来绑定当前页码。 + ```html ``` @@ -29,12 +31,16 @@ export default { ### 简单模式 + 将 `mode` 设置为 `simple` 来切换到简单模式，此时分页器不会展示具体的页码按钮。 + ```html ``` ### 显示省略号 +设置 `force-ellipses` 后会展示省略号按钮，点击后可以快速跳转。 + ```html ``` -### 自定义渲染 +### 自定义按钮 + +通过 `prev-text`、`next-text` 等插槽来自定义分页按钮的内容。 ```html @@ -84,6 +92,6 @@ export default { | 名称 | 描述 | SlotProps | | --- | --- | --- | -| page `v2.10.9` | 自定义页码 | `{ number: number, text: string, active: boolean }` | +| page `v2.10.9` | 自定义页码 | _{ number: number, text: string, active: boolean }_ | | prev-text `v2.10.9` | 自定义上一页按钮文字 | `-` | | next-text `v2.10.9` | 自定义下一页按钮文字 | `-` | diff --git a/src/pagination/demo/index.vue b/src/pagination/demo/index.vue index 95b56d3c6..dce90025f 100644 --- a/src/pagination/demo/index.vue +++ b/src/pagination/demo/index.vue @@ -23,8 +23,8 @@ Date: Fri, 2 Oct 2020 08:45:24 +0800 Subject: [PATCH 16/16] fix(GridItem): failed to break word (#7292) --- src/grid-item/index.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/grid-item/index.less b/src/grid-item/index.less index 322982c53..63d2f951c 100644 --- a/src/grid-item/index.less +++ b/src/grid-item/index.less @@ -20,7 +20,8 @@ color: @grid-item-text-color; font-size: @grid-item-text-font-size; line-height: 1.5; - word-wrap: break-word; + // https://github.com/youzan/vant/issues/3894 + word-break: break-all; } &__icon + &__text {