From 8ca8aa1d1dd2248509a5dae72077cbd104c21409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Wed, 5 Feb 2020 17:43:21 +0800 Subject: [PATCH 001/155] chore(Field): fix snapshot --- src/field/test/__snapshots__/demo.spec.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/test/__snapshots__/demo.spec.js.snap b/src/field/test/__snapshots__/demo.spec.js.snap index 35ee97271..8dd583e28 100644 --- a/src/field/test/__snapshots__/demo.spec.js.snap +++ b/src/field/test/__snapshots__/demo.spec.js.snap @@ -141,7 +141,7 @@ exports[`renders demo correctly 1`] = `
留言
-
0/50
+
0/50
From 265bfeaac756e05803858062ab1ece2092a08e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 10:59:21 +0800 Subject: [PATCH 002/155] feat(ActionSheet): add @action-sheet-close-icon-active-color less var --- src/action-sheet/index.less | 4 ++++ src/style/var.less | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less index 9d3c0ef63..4e7081ad3 100644 --- a/src/action-sheet/index.less +++ b/src/action-sheet/index.less @@ -78,5 +78,9 @@ color: @action-sheet-close-icon-color; font-size: @action-sheet-close-icon-size; line-height: inherit; + + &:active { + color: @action-sheet-close-icon-active-color; + } } } diff --git a/src/style/var.less b/src/style/var.less index 36b2e00b5..310b36c27 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -71,8 +71,9 @@ @action-sheet-item-disabled-text-color: @gray-5; @action-sheet-subname-color: @gray-7; @action-sheet-subname-font-size: @font-size-sm; -@action-sheet-close-icon-size: 18px; -@action-sheet-close-icon-color: @gray-6; +@action-sheet-close-icon-size: 20px; +@action-sheet-close-icon-color: @gray-5; +@action-sheet-close-icon-active-color: @gray-6; @action-sheet-close-icon-padding: 0 @padding-md; @action-sheet-cancel-padding-top: @padding-xs; @action-sheet-cancel-padding-color: @background-color; From 660b0399512d3deddcdfb99af5cff1674617c515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 11:04:43 +0800 Subject: [PATCH 003/155] feat(Popup): add @popup-close-icon-active-color less var --- src/popup/README.md | 10 +++++----- src/popup/README.zh-CN.md | 10 +++++----- src/popup/demo/index.vue | 16 ++++++++-------- src/popup/index.less | 2 +- src/style/var.less | 7 ++++--- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/popup/README.md b/src/popup/README.md index e2101f10b..853573b45 100644 --- a/src/popup/README.md +++ b/src/popup/README.md @@ -42,7 +42,7 @@ Use `position` prop to set popup display position ``` @@ -53,7 +53,7 @@ Use `position` prop to set popup display position v-model="show" closeable position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> ``` @@ -80,7 +80,7 @@ Use `position` prop to set popup display position v-model="show" round position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> ``` diff --git a/src/popup/README.zh-CN.md b/src/popup/README.zh-CN.md index 631e7313f..341ae6d1f 100644 --- a/src/popup/README.zh-CN.md +++ b/src/popup/README.zh-CN.md @@ -48,7 +48,7 @@ export default { ``` @@ -61,7 +61,7 @@ export default { v-model="show" closeable position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> ``` @@ -90,7 +90,7 @@ export default { v-model="show" round position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> ``` diff --git a/src/popup/demo/index.vue b/src/popup/demo/index.vue index fb1848eea..e62bf887c 100644 --- a/src/popup/demo/index.vue +++ b/src/popup/demo/index.vue @@ -17,21 +17,21 @@ - + @@ -56,21 +56,21 @@ v-model="showCloseIcon" closeable position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> @@ -84,7 +84,7 @@ v-model="showRoundCorner" round position="bottom" - :style="{ height: '20%' }" + :style="{ height: '30%' }" /> diff --git a/src/popup/index.less b/src/popup/index.less index ec62641cc..0e03b1646 100644 --- a/src/popup/index.less +++ b/src/popup/index.less @@ -96,7 +96,7 @@ cursor: pointer; &:active { - opacity: @active-opacity; + color: @popup-close-icon-active-color; } &--top-left { diff --git a/src/style/var.less b/src/style/var.less index 310b36c27..3af11611d 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -71,7 +71,7 @@ @action-sheet-item-disabled-text-color: @gray-5; @action-sheet-subname-color: @gray-7; @action-sheet-subname-font-size: @font-size-sm; -@action-sheet-close-icon-size: 20px; +@action-sheet-close-icon-size: 22px; @action-sheet-close-icon-color: @gray-5; @action-sheet-close-icon-active-color: @gray-6; @action-sheet-close-icon-padding: 0 @padding-md; @@ -527,8 +527,9 @@ @popup-background-color: @white; @popup-transition: transform @animation-duration-base ease-out; @popup-round-border-radius: 20px; -@popup-close-icon-size: 18px; -@popup-close-icon-color: @gray-6; +@popup-close-icon-size: 22px; +@popup-close-icon-color: @gray-5; +@popup-close-icon-active-color: @gray-6; @popup-close-icon-margin: 16px; @popup-close-icon-z-index: 1; From 2124cc5261be4a7d666cf6f70d4295309f3705d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 11:52:17 +0800 Subject: [PATCH 004/155] feat(Calendar): improve accessibility --- src/calendar/components/Month.js | 15 +- src/calendar/index.less | 2 +- .../test/__snapshots__/demo.spec.js.snap | 188 ++++----- .../test/__snapshots__/index.spec.js.snap | 384 +++++++++--------- 4 files changed, 299 insertions(+), 290 deletions(-) diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js index f5252a6c7..2ecf43d3f 100644 --- a/src/calendar/components/Month.js +++ b/src/calendar/components/Month.js @@ -170,7 +170,7 @@ export default createComponent({ genDays() { if (this.visible) { return ( -
+
{this.genMark()} {this.days.map(this.genDay)}
@@ -183,9 +183,10 @@ export default createComponent({ genDay(item, index) { const { type, topInfo, bottomInfo } = item; const style = this.getDayStyle(type, index); + const disabled = type === 'disabled'; const onClick = () => { - if (type !== 'disabled') { + if (!disabled) { this.$emit('click', item); } }; @@ -198,7 +199,13 @@ export default createComponent({ if (type === 'selected') { return ( -
+
{TopInfo} {item.text} @@ -210,8 +217,10 @@ export default createComponent({ return (
{TopInfo} diff --git a/src/calendar/index.less b/src/calendar/index.less index 5641d5a06..6b75c348e 100644 --- a/src/calendar/index.less +++ b/src/calendar/index.less @@ -18,7 +18,7 @@ } .van-popup__close-icon { - top: 13px; + top: 11px; } } diff --git a/src/calendar/test/__snapshots__/demo.spec.js.snap b/src/calendar/test/__snapshots__/demo.spec.js.snap index a8e4c121e..f73371de5 100644 --- a/src/calendar/test/__snapshots__/demo.spec.js.snap +++ b/src/calendar/test/__snapshots__/demo.spec.js.snap @@ -57,113 +57,113 @@ exports[`renders demo correctly 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
2012年2月
-
+
2
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
2012年3月
-
+
3
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
diff --git a/src/calendar/test/__snapshots__/index.spec.js.snap b/src/calendar/test/__snapshots__/index.spec.js.snap index 763f5a7e1..d053737c1 100644 --- a/src/calendar/test/__snapshots__/index.spec.js.snap +++ b/src/calendar/test/__snapshots__/index.spec.js.snap @@ -9,41 +9,41 @@ exports[`color prop when type is range 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
开始
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
开始
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
结束
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
结束
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
@@ -60,41 +60,41 @@ exports[`color prop when type is single 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
@@ -111,44 +111,44 @@ exports[`formatter prop 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
+
Top Info
11
-
12
Bottom Info
+
12
Bottom Info
-
Text
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
Text
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
@@ -168,41 +168,41 @@ exports[`popup wrapper 2`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
@@ -221,41 +221,41 @@ exports[`row-height prop 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
@@ -272,41 +272,41 @@ exports[`title & footer slot 1`] = `
-
+
1
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
From 0b7c567a78c85fbf1c3d59fcd3ce76c691040ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 12:00:13 +0800 Subject: [PATCH 005/155] fix(Calendar): missing className when selected --- src/calendar/components/Month.js | 4 +- .../test/__snapshots__/demo.spec.js.snap | 140 +++++++++--------- .../test/__snapshots__/index.spec.js.snap | 100 ++++++------- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js index 2ecf43d3f..e290df1a4 100644 --- a/src/calendar/components/Month.js +++ b/src/calendar/components/Month.js @@ -202,7 +202,7 @@ export default createComponent({
@@ -219,7 +219,7 @@ export default createComponent({
diff --git a/src/calendar/test/__snapshots__/demo.spec.js.snap b/src/calendar/test/__snapshots__/demo.spec.js.snap index f73371de5..40e4ffea5 100644 --- a/src/calendar/test/__snapshots__/demo.spec.js.snap +++ b/src/calendar/test/__snapshots__/demo.spec.js.snap @@ -71,88 +71,88 @@ exports[`renders demo correctly 1`] = `
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
-
31
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
+
31
2012年2月
2
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
2012年3月
3
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
diff --git a/src/calendar/test/__snapshots__/index.spec.js.snap b/src/calendar/test/__snapshots__/index.spec.js.snap index d053737c1..4beb11be8 100644 --- a/src/calendar/test/__snapshots__/index.spec.js.snap +++ b/src/calendar/test/__snapshots__/index.spec.js.snap @@ -74,16 +74,16 @@ exports[`color prop when type is single 1`] = `
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
@@ -125,19 +125,19 @@ exports[`formatter prop 1`] = `
10
-
+
Top Info
11
-
12
Bottom Info
+
12
Bottom Info
-
Text
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
Text
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
@@ -182,16 +182,16 @@ exports[`popup wrapper 2`] = `
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
@@ -235,16 +235,16 @@ exports[`row-height prop 1`] = `
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
@@ -286,16 +286,16 @@ exports[`title & footer slot 1`] = `
10
-
11
-
12
-
13
-
14
-
15
-
16
-
17
-
18
-
19
-
20
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
21
22
23
From cc860c2179c5be7090cd007b08648442336cbf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 15:05:31 +0800 Subject: [PATCH 006/155] chore: release 2.4.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ef6d918e..2ed3269f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.4.7-beta.0", + "version": "2.4.7", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", From 8cab62025c88662b672d9795b07bc805236675f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 6 Feb 2020 15:12:44 +0800 Subject: [PATCH 007/155] docs(changelog): 2.4.7 --- docs/markdown/changelog.en-US.md | 22 ++++++++++++++++++++++ docs/markdown/changelog.zh-CN.md | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index a542e69e7..013fec37f 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -1,5 +1,27 @@ # Changelog +### [v2.4.7](https://github.com/youzan/vant/compare/v2.4.7-beta.0...v2.4.7) +`2020-02-06` + +**Feature** + +* Calendar: improve accessibility [2124cc](https://github.com/youzan/vant/commit/2124cc5261be4a7d666cf6f70d4295309f3705d9) +* Field: highlight word num when reaching maxlength [61093e](https://github.com/youzan/vant/commit/61093ef00f2dc421eb94ec7690093c1d565a296c) +* Sku: add sku-actions-top slot [#5617](https://github.com/youzan/vant/issues/5617) +* Uploader: support failed status [#5624](https://github.com/youzan/vant/issues/5624) +* Uploader: support uploading status [#5625](https://github.com/youzan/vant/issues/5625) + +**Style** + +* ActionSheet: add @action-sheet-close-icon-active-color less var [265bfe](https://github.com/youzan/vant/commit/265bfeaac756e05803858062ab1ece2092a08e17) +* Popup: add @popup-close-icon-active-color less var [660b03](https://github.com/youzan/vant/commit/660b0399512d3deddcdfb99af5cff1674617c515) + +**Bug Fixes** + +* Calendar: missing className when selected [0b7c56](https://github.com/youzan/vant/commit/0b7c567a78c85fbf1c3d59fcd3ce76c691040ff1) +* Popup: may throw error when using get-container and destroyed + + ### [v2.4.6](https://github.com/youzan/vant/compare/v2.4.5...v2.4.6) `2020-02-01` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index 12f363b2b..784135bb3 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -11,6 +11,28 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.4.7](https://github.com/youzan/vant/compare/v2.4.7-beta.0...v2.4.7) +`2020-02-06` + +**Feature** + +* Calendar: 优化无障碍访问 [2124cc](https://github.com/youzan/vant/commit/2124cc5261be4a7d666cf6f70d4295309f3705d9) +* Field: 字数统计达到上限时高亮展示 [61093e](https://github.com/youzan/vant/commit/61093ef00f2dc421eb94ec7690093c1d565a296c) +* Sku: 新增 sku-actions-top 插槽 [#5617](https://github.com/youzan/vant/issues/5617) +* Uploader: 支持展示上传中状态 [#5625](https://github.com/youzan/vant/issues/5625) +* Uploader: 支持展示上传失败状态 [#5624](https://github.com/youzan/vant/issues/5624) + +**Style** + +* ActionSheet: 新增 @action-sheet-close-icon-active-color 变量 [265bfe](https://github.com/youzan/vant/commit/265bfeaac756e05803858062ab1ece2092a08e17) +* Popup: 新增 @popup-close-icon-active-color 变量 [660b03](https://github.com/youzan/vant/commit/660b0399512d3deddcdfb99af5cff1674617c515) + +**Bug Fixes** + +* Calendar: 修复选中日期 className 属性未生效的问题 [0b7c56](https://github.com/youzan/vant/commit/0b7c567a78c85fbf1c3d59fcd3ce76c691040ff1) +* Popup: 修复使用 get-container 属性后 destroy 时抛出错误的问题 + + ### [v2.4.6](https://github.com/youzan/vant/compare/v2.4.5...v2.4.6) `2020-02-01` From 613ff2503510a48166fadb12d2c7ad1aee3db6bb Mon Sep 17 00:00:00 2001 From: Lindy <33708359+Lindysen@users.noreply.github.com> Date: Thu, 6 Feb 2020 17:15:24 +0800 Subject: [PATCH 008/155] feat(Uploader): add uploader disabled style (#5628) --- src/style/var.less | 1 + src/uploader/README.md | 5 +++++ src/uploader/README.zh-CN.md | 10 +++++++++- src/uploader/demo/index.vue | 6 ++++++ src/uploader/index.js | 2 +- src/uploader/index.less | 4 ++++ src/uploader/test/__snapshots__/demo.spec.js.snap | 8 ++++++++ 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/style/var.less b/src/style/var.less index 3af11611d..3ed3c104a 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -790,6 +790,7 @@ @uploader-mask-message-line-height: 14px; @uploader-loading-icon-size: 22px; @uploader-loading-icon-color: @white; +@uploader-disabled-opacity: @disabled-opacity; // Sku @sku-item-background-color: @background-color; diff --git a/src/uploader/README.md b/src/uploader/README.md index dd705ea5f..3517323d1 100644 --- a/src/uploader/README.md +++ b/src/uploader/README.md @@ -44,6 +44,11 @@ export default { } }; ``` +### Disabled + +```html + +``` ### Upload Status diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md index f00886ce3..88da47b82 100644 --- a/src/uploader/README.zh-CN.md +++ b/src/uploader/README.zh-CN.md @@ -53,6 +53,14 @@ export default { }; ``` +### 禁用 + +通过`disabled`属性禁用文件上传 + +```html + +``` + ### 上传状态 通过`status`属性可以标识上传状态，`uploading`表示上传中，`failed`表示上传失败，`done`表示上传完成（从 2.4.7 版本开始支持） @@ -190,7 +198,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| | oversize | 文件大小超过限制时触发 | 同`after-read` | -| click-preview | 点击预览图时触发 | 同`after-read` | +| click-preview | 点击预览图时触发 | 同`after-read` | | close-preview | 关闭全屏图片预览时触发 | - | | delete | 删除文件预览时触发 | 同`after-read` | diff --git a/src/uploader/demo/index.vue b/src/uploader/demo/index.vue index a0272964d..a8b33610b 100644 --- a/src/uploader/demo/index.vue +++ b/src/uploader/demo/index.vue @@ -8,6 +8,10 @@ + + + + @@ -38,6 +42,7 @@ export default { failed: '上传失败', upload: '上传文件', preview: '文件预览', + disabled: '禁用', maxCount: '限制上传数量', uploading: '上传中...', beforeRead: '上传前校验', @@ -49,6 +54,7 @@ export default { failed: 'Failed', upload: 'Upload File', preview: 'Preview File', + disabled: 'Disabled', maxCount: 'Max Count', uploading: 'Uploading...', beforeRead: 'Before Read', diff --git a/src/uploader/index.js b/src/uploader/index.js index f53f4bf2e..e5df5871c 100644 --- a/src/uploader/index.js +++ b/src/uploader/index.js @@ -360,7 +360,7 @@ export default createComponent({ render() { return (
-
+
{this.genPreviewList()} {this.genUpload()}
diff --git a/src/uploader/index.less b/src/uploader/index.less index e548717c2..55178deb8 100644 --- a/src/uploader/index.less +++ b/src/uploader/index.less @@ -7,6 +7,10 @@ &__wrapper { display: flex; flex-wrap: wrap; + + &--disabled { + opacity: @uploader-disabled-opacity; + } } &__input { diff --git a/src/uploader/test/__snapshots__/demo.spec.js.snap b/src/uploader/test/__snapshots__/demo.spec.js.snap index 5ffc08cb9..39ca3b7ae 100644 --- a/src/uploader/test/__snapshots__/demo.spec.js.snap +++ b/src/uploader/test/__snapshots__/demo.spec.js.snap @@ -32,6 +32,14 @@ exports[`renders demo correctly 1`] = `
+
+
+
+
+
+
+
+
From e42f3e79c2073d2c17f595da111a45402cf66b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 09:43:53 +0800 Subject: [PATCH 009/155] docs(Sku): add version tag for sku-actions-top --- src/sku/README.md | 2 +- src/sku/README.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sku/README.md b/src/sku/README.md index c5123e27d..b06a668bd 100644 --- a/src/sku/README.md +++ b/src/sku/README.md @@ -178,7 +178,7 @@ Use [ref](https://vuejs.org/v2/api/#ref) to get Sku instance and call instance m | extra-sku-group | Extra custom content | | sku-stepper | Custom stepper | | sku-messages | Custom messages | -| sku-actions-top | Custom content before sku-actions | +| sku-actions-top `v2.4.7` | Custom content before sku-actions | | sku-actions | Custom button actions | ### Sku Data Structure diff --git a/src/sku/README.zh-CN.md b/src/sku/README.zh-CN.md index 1e3024672..f719cceb7 100644 --- a/src/sku/README.zh-CN.md +++ b/src/sku/README.zh-CN.md @@ -184,7 +184,7 @@ Sku 组件默认划分好了若干区块，这些区块都定义成了插槽， | extra-sku-group | 额外商品 sku 展示区，一般用不到 | | sku-stepper | 商品数量选择区 | | sku-messages | 商品留言区 | -| sku-actions-top | 操作按钮区顶部内容，无默认展示内容，按需使用 | +| sku-actions-top `v2.4.7` | 操作按钮区顶部内容，无默认展示内容，按需使用 | | sku-actions | 操作按钮区 | ### sku 对象结构 From d97e679e68685f7b22702f124b921734d765ed8b Mon Sep 17 00:00:00 2001 From: rex Date: Fri, 7 Feb 2020 10:07:39 +0800 Subject: [PATCH 010/155] feat(AddressList): add new slot item-bottom (#5629) --- src/address-list/Item.tsx | 32 +++++++----- src/address-list/README.md | 9 ++-- src/address-list/README.zh-CN.md | 9 ++-- src/address-list/index.less | 5 ++ src/address-list/index.tsx | 4 ++ .../test/__snapshots__/demo.spec.js.snap | 52 +++++++++++-------- .../test/__snapshots__/index.spec.js.snap | 28 +++++----- 7 files changed, 82 insertions(+), 57 deletions(-) diff --git a/src/address-list/Item.tsx b/src/address-list/Item.tsx index de936a08e..8aa233297 100644 --- a/src/address-list/Item.tsx +++ b/src/address-list/Item.tsx @@ -10,7 +10,7 @@ import Radio from '../radio'; // Types import { CreateElement, RenderContext } from 'vue/types'; -import { DefaultSlots } from '../utils/types'; +import { DefaultSlots, ScopedSlot } from '../utils/types'; export type AddressItemData = { id: string | number; @@ -27,6 +27,10 @@ export type AddressItemProps = { defaultTagText?: string; }; +export type AddressItemSlots = DefaultSlots & { + bottom?: ScopedSlot; +}; + export type AddressItemEvents = { onEdit(): void; onClick(): void; @@ -38,7 +42,7 @@ const [createComponent, bem] = createNamespace('address-item'); function AddressItem( h: CreateElement, props: AddressItemProps, - slots: DefaultSlots, + slots: AddressItemSlots, ctx: RenderContext ) { const { disabled, switchable } = props; @@ -95,18 +99,18 @@ function AddressItem( } return ( - +
+ + {slots.bottom?.({ ...props.data, disabled })} +
); } diff --git a/src/address-list/README.md b/src/address-list/README.md index 415984d15..3b3575309 100644 --- a/src/address-list/README.md +++ b/src/address-list/README.md @@ -104,7 +104,8 @@ export default { ### Slots -| Name | Description | -|------|------| -| default | Custom content after list | -| top | Custom content before list | +| Name | Description | SlotProps | +|------|------|------| +| default | Custom content after list | - | +| top | Custom content before list | - | +| item-bottom | Custom content after list item | item | diff --git a/src/address-list/README.zh-CN.md b/src/address-list/README.zh-CN.md index 60505d0d6..0d6387976 100644 --- a/src/address-list/README.zh-CN.md +++ b/src/address-list/README.zh-CN.md @@ -104,7 +104,8 @@ export default { ### Slots -| 名称 | 说明 | -|------|------| -| default | 在列表下方插入内容 | -| top | 在顶部插入内容 | +| 名称 | 说明 | SlotProps | +|------|------|------| +| default | 在列表下方插入内容 | - | +| top | 在顶部插入内容 | - | +| item-bottom | 在列表项底部插入内容 | 列表项的值 | diff --git a/src/address-list/index.less b/src/address-list/index.less index 45d47da63..d49805799 100644 --- a/src/address-list/index.less +++ b/src/address-list/index.less @@ -31,6 +31,7 @@ .van-address-item { padding: @address-list-item-padding; + background-color: @white; border-radius: @border-radius-lg; &:not(:last-child) { @@ -79,6 +80,10 @@ transform: translate(0, -50%); } + .van-cell { + padding: 0; + } + .van-radio__label { margin-left: @padding-sm; } diff --git a/src/address-list/index.tsx b/src/address-list/index.tsx index 06bb14b1f..1726e0508 100644 --- a/src/address-list/index.tsx +++ b/src/address-list/index.tsx @@ -23,6 +23,7 @@ export type AddressListProps = { export type AddressListSlots = DefaultSlots & { top?: ScopedSlot; + 'item-bottom'?: ScopedSlot; }; const [createComponent, bem, t] = createNamespace('address-list'); @@ -45,6 +46,9 @@ function AddressList( disabled={disabled} switchable={props.switchable} defaultTagText={props.defaultTagText} + scopedSlots={{ + bottom: slots['item-bottom'], + }} onSelect={() => { emit(ctx, disabled ? 'select-disabled' : 'select', item, index); diff --git a/src/address-list/test/__snapshots__/demo.spec.js.snap b/src/address-list/test/__snapshots__/demo.spec.js.snap index f7de8ec31..46d2927fc 100644 --- a/src/address-list/test/__snapshots__/demo.spec.js.snap +++ b/src/address-list/test/__snapshots__/demo.spec.js.snap @@ -5,34 +5,40 @@ exports[`renders demo correctly 1`] = `
-
-
- -
-
- -
- +
+
+
+ +
+ +
以下地址超出配送范围
-
-
-
王五 1320000000
-
浙江省杭州市滨江区江南大道 15 号
-
- +
+
+
+
王五 1320000000
+
浙江省杭州市滨江区江南大道 15 号
+
+ +
diff --git a/src/address-list/test/__snapshots__/index.spec.js.snap b/src/address-list/test/__snapshots__/index.spec.js.snap index 867138aca..d9ffb7d07 100644 --- a/src/address-list/test/__snapshots__/index.spec.js.snap +++ b/src/address-list/test/__snapshots__/index.spec.js.snap @@ -3,19 +3,23 @@ exports[`unswitchable 1`] = `
-
-
-
张三 13000000000
-
浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室
-
- +
+
+
+
张三 13000000000
+
浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室
+
+ +
-
-
-
李四 1310000000
-
浙江省杭州市拱墅区莫干山路 50 号
-
- +
+
+
+
李四 1310000000
+
浙江省杭州市拱墅区莫干山路 50 号
+
+ +
From 03c826c4d44efd95a5ee509b5f183d8ded574fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 10:43:00 +0800 Subject: [PATCH 011/155] fix(Field): input slot should align center --- src/field/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/field/index.less b/src/field/index.less index f7ba70439..00b6aeb61 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -17,6 +17,7 @@ &__body { display: flex; align-items: center; + height: 100%; } &__control { From fd9cd12fe598d7116f695eaf0cb749e82d824841 Mon Sep 17 00:00:00 2001 From: rex Date: Fri, 7 Feb 2020 10:57:36 +0800 Subject: [PATCH 012/155] feat(AddressEdit): add new prop disable-area (#5630) --- src/address-edit/README.md | 3 +++ src/address-edit/README.zh-CN.md | 3 +++ src/address-edit/index.js | 9 +++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/address-edit/README.md b/src/address-edit/README.md index fafcf28e2..8bd371d86 100644 --- a/src/address-edit/README.md +++ b/src/address-edit/README.md @@ -73,6 +73,9 @@ export default { | show-delete | Whether to show delete button | *boolean* | `false` | | show-set-default | Whether to show default address switch | *boolean* | `false` | | show-search-result | Whether to show address search result | *boolean* | `false` | +| show-area | Whether to show area cell | *boolean* | `true` | +| show-detail | Whether to show detail field | *boolean* | `true` | +| disable-area | Whether to disable area select | *boolean* | `false` | | save-button-text | Save button text | *string* | `Save` | | delete-button-text | Delete button text | *string* | `Delete` | | detail-rows | Detail input rows | *number \| string* | `1` | diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md index ac93c6d30..80efbddb8 100644 --- a/src/address-edit/README.zh-CN.md +++ b/src/address-edit/README.zh-CN.md @@ -73,6 +73,9 @@ export default { | show-delete | 是否显示删除按钮 | *boolean* | `false` | | show-set-default | 是否显示默认地址栏 | *boolean* | `false` | | show-search-result | 是否显示搜索结果 | *boolean* | `false` | +| show-area | 是否显示地区 | *boolean* | `true` | +| show-detail | 是否显示详细地址 | *boolean* | `true` | +| disable-area | 是否禁用地区选择 | *boolean* | `false` | | save-button-text | 保存按钮文字 | *string* | `保存` | | delete-button-text | 删除按钮文字 | *string* | `删除` | | detail-rows | 详细地址输入框行数 | *number \| string* | `1` | diff --git a/src/address-edit/index.js b/src/address-edit/index.js index e24164db3..3e9d42179 100644 --- a/src/address-edit/index.js +++ b/src/address-edit/index.js @@ -52,6 +52,7 @@ export default createComponent({ type: Boolean, default: true, }, + disableArea: Boolean, detailRows: { type: [Number, String], default: 1, @@ -250,7 +251,7 @@ export default createComponent({ }, render() { - const { data, errorInfo, searchResult } = this; + const { data, errorInfo, searchResult, disableArea } = this; const onFocus = name => () => this.onFocus(name); // hide bottom field when use search && detail get focused @@ -280,15 +281,15 @@ export default createComponent({ { - this.showAreaPopup = true; + this.showAreaPopup = !disableArea; }} /> Date: Fri, 7 Feb 2020 14:33:44 +0800 Subject: [PATCH 013/155] feat(Field): add name prop --- src/field/README.md | 3 ++- src/field/README.zh-CN.md | 3 ++- src/field/index.js | 2 ++ src/field/test/__snapshots__/index.spec.js.snap | 8 ++++++++ src/field/test/index.spec.js | 9 +++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/field/README.md b/src/field/README.md index 9f97c46d2..7310ff529 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -214,8 +214,9 @@ Use `input-align` prop to align the input value | Attribute | Description | Type | Default | |------|------|------|------| -| value | Field value | *number \| string* | - | +| v-model (value) | Field value | *number \| string* | - | | label | Field label | *string* | - | +| name | Name | *string* | - | | type | Input type, can be set to `tel` `digit`
`number` `textarea` `password` | *string* | `text` | | size | Size，can be set to `large` | *string* | - | | maxlength | Max length of value | *number \| string* | - | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index cea5cace8..dd0aac3c7 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -233,8 +233,9 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| +| v-model (value) | 当前输入的值 | *number \| string* | - | | label | 输入框左侧文本 | *string* | - | -| value | 当前输入的值 | *number \| string* | - | +| name | 名称，提交表单的标识符 | *string* | - | | type | 输入框类型, 可选值为 `tel` `digit`
`number` `textarea` `password` 等 | *string* | `text` | | size | 大小，可选值为 `large` | *string* | - | | maxlength | 输入的最大字符数 | *number \| string* | - | diff --git a/src/field/index.js b/src/field/index.js index 32b58c80c..2bb812c91 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -17,6 +17,7 @@ export default createComponent({ props: { ...cellProps, + name: String, error: Boolean, disabled: Boolean, readonly: Boolean, @@ -237,6 +238,7 @@ export default createComponent({ }, attrs: { ...this.$attrs, + name: this.name, disabled: this.disabled, readonly: this.readonly, placeholder: this.placeholder, diff --git a/src/field/test/__snapshots__/index.spec.js.snap b/src/field/test/__snapshots__/index.spec.js.snap index 0938a1696..15b8e29c4 100644 --- a/src/field/test/__snapshots__/index.spec.js.snap +++ b/src/field/test/__snapshots__/index.spec.js.snap @@ -53,6 +53,14 @@ exports[`label-width prop without unit 1`] = `
`; +exports[`name prop 1`] = ` +
+
+
+
+
+`; + exports[`reach max word-limit 1`] = `
diff --git a/src/field/test/index.spec.js b/src/field/test/index.spec.js index 6554f4150..1823f89cc 100644 --- a/src/field/test/index.spec.js +++ b/src/field/test/index.spec.js @@ -291,3 +291,12 @@ test('reach max word-limit', () => { }); expect(wrapper).toMatchSnapshot(); }); + +test('name prop', () => { + const wrapper = mount(Field, { + propsData: { + name: 'foo', + }, + }); + expect(wrapper).toMatchSnapshot(); +}); From 0f137852e059a749bbdf1d1c36577a810be08271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 10:43:00 +0800 Subject: [PATCH 014/155] fix(Field): input slot should align center --- src/field/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/field/index.less b/src/field/index.less index f7ba70439..00b6aeb61 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -17,6 +17,7 @@ &__body { display: flex; align-items: center; + height: 100%; } &__control { From f3398dc2cdd1191613b97454b4725275458bde1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 14:33:44 +0800 Subject: [PATCH 015/155] feat(Field): add name prop --- src/field/README.md | 3 ++- src/field/README.zh-CN.md | 3 ++- src/field/index.js | 2 ++ src/field/test/__snapshots__/index.spec.js.snap | 8 ++++++++ src/field/test/index.spec.js | 9 +++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/field/README.md b/src/field/README.md index 9f97c46d2..7310ff529 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -214,8 +214,9 @@ Use `input-align` prop to align the input value | Attribute | Description | Type | Default | |------|------|------|------| -| value | Field value | *number \| string* | - | +| v-model (value) | Field value | *number \| string* | - | | label | Field label | *string* | - | +| name | Name | *string* | - | | type | Input type, can be set to `tel` `digit`
`number` `textarea` `password` | *string* | `text` | | size | Size，can be set to `large` | *string* | - | | maxlength | Max length of value | *number \| string* | - | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index cea5cace8..dd0aac3c7 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -233,8 +233,9 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| +| v-model (value) | 当前输入的值 | *number \| string* | - | | label | 输入框左侧文本 | *string* | - | -| value | 当前输入的值 | *number \| string* | - | +| name | 名称，提交表单的标识符 | *string* | - | | type | 输入框类型, 可选值为 `tel` `digit`
`number` `textarea` `password` 等 | *string* | `text` | | size | 大小，可选值为 `large` | *string* | - | | maxlength | 输入的最大字符数 | *number \| string* | - | diff --git a/src/field/index.js b/src/field/index.js index 32b58c80c..2bb812c91 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -17,6 +17,7 @@ export default createComponent({ props: { ...cellProps, + name: String, error: Boolean, disabled: Boolean, readonly: Boolean, @@ -237,6 +238,7 @@ export default createComponent({ }, attrs: { ...this.$attrs, + name: this.name, disabled: this.disabled, readonly: this.readonly, placeholder: this.placeholder, diff --git a/src/field/test/__snapshots__/index.spec.js.snap b/src/field/test/__snapshots__/index.spec.js.snap index 0938a1696..15b8e29c4 100644 --- a/src/field/test/__snapshots__/index.spec.js.snap +++ b/src/field/test/__snapshots__/index.spec.js.snap @@ -53,6 +53,14 @@ exports[`label-width prop without unit 1`] = `
`; +exports[`name prop 1`] = ` +
+
+
+
+
+`; + exports[`reach max word-limit 1`] = `
diff --git a/src/field/test/index.spec.js b/src/field/test/index.spec.js index 6554f4150..1823f89cc 100644 --- a/src/field/test/index.spec.js +++ b/src/field/test/index.spec.js @@ -291,3 +291,12 @@ test('reach max word-limit', () => { }); expect(wrapper).toMatchSnapshot(); }); + +test('name prop', () => { + const wrapper = mount(Field, { + propsData: { + name: 'foo', + }, + }); + expect(wrapper).toMatchSnapshot(); +}); From 79a38a3354ddc6a64647829e9c273d0458599d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 15:11:41 +0800 Subject: [PATCH 016/155] Revert "fix(Field): input slot should align center" This reverts commit 0f137852e059a749bbdf1d1c36577a810be08271. --- src/field/index.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/field/index.less b/src/field/index.less index 00b6aeb61..f7ba70439 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -17,7 +17,6 @@ &__body { display: flex; align-items: center; - height: 100%; } &__control { From 9326ad84f8ba792749f90eb401e1d6bc453c4fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 15:18:46 +0800 Subject: [PATCH 017/155] feat: add form component --- src/field/index.js | 56 ++++++++++++++++-- src/form/README.md | 30 ++++++++++ src/form/README.zh-CN.md | 31 ++++++++++ src/form/demo/index.vue | 58 +++++++++++++++++++ src/form/index.js | 36 ++++++++++++ src/form/test/__snapshots__/demo.spec.js.snap | 35 +++++++++++ src/form/test/demo.spec.js | 4 ++ src/form/test/index.spec.js | 1 + 8 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 src/form/README.md create mode 100644 src/form/README.zh-CN.md create mode 100644 src/form/demo/index.vue create mode 100644 src/form/index.js create mode 100644 src/form/test/__snapshots__/demo.spec.js.snap create mode 100644 src/form/test/demo.spec.js create mode 100644 src/form/test/index.spec.js diff --git a/src/field/index.js b/src/field/index.js index 2bb812c91..299f6418e 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -15,9 +15,16 @@ const [createComponent, bem] = createNamespace('field'); export default createComponent({ inheritAttrs: false, + inject: { + vanForm: { + default: null, + }, + }, + props: { ...cellProps, name: String, + rules: Array, error: Boolean, disabled: Boolean, readonly: Boolean, @@ -44,6 +51,8 @@ export default createComponent({ data() { return { focused: false, + validateError: false, + validateMessage: '', }; }, @@ -56,6 +65,16 @@ export default createComponent({ mounted() { this.format(); this.$nextTick(this.adjustSize); + + if (this.vanForm) { + this.vanForm.fields.push(this); + } + }, + + beforeDestroy() { + if (this.vanForm) { + this.vanForm.fields = this.vanForm.fields.fiilter(item => item !== this); + } }, computed: { @@ -106,6 +125,23 @@ export default createComponent({ } }, + // @exposed-api + validate() { + if (!this.rules) { + return true; + } + + return !this.rules.some(rule => { + if (rule.required && !this.value) { + this.validateError = true; + this.validateMessage = rule.message; + return true; + } + + return false; + }); + }, + format(target = this.$refs.input) { if (!target) { return; @@ -316,6 +352,18 @@ export default createComponent({ ); } }, + + genMessage() { + const message = this.errorMessage || this.validateMessage; + + if (message) { + return ( +
+ {message} +
+ ); + } + }, }, render() { @@ -343,7 +391,7 @@ export default createComponent({ titleClass={[bem('label', labelAlign), this.labelClass]} arrowDirection={this.arrowDirection} class={bem({ - error: this.error, + error: this.error || this.validateError, [`label-${labelAlign}`]: labelAlign, 'min-height': this.type === 'textarea' && !this.autosize, })} @@ -365,11 +413,7 @@ export default createComponent({ )}
{this.genWordLimit()} - {this.errorMessage && ( -
- {this.errorMessage} -
- )} + {this.genMessage()} ); }, diff --git a/src/form/README.md b/src/form/README.md new file mode 100644 index 000000000..e0452706e --- /dev/null +++ b/src/form/README.md @@ -0,0 +1,30 @@ +# Form + +### Install + +```js +import Vue from 'vue'; +import { Form } from 'vant'; + +Vue.use(Form); +``` + +## Usage + +### Basic Usage + +## API + +### Props + +| Attribute | Description | Type | Default | +|------|------|------|------| + +### Events + +| Event | Description | Arguments | + +### Slots + +| Name | Description | +|------|------| diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md new file mode 100644 index 000000000..f2458d0d2 --- /dev/null +++ b/src/form/README.zh-CN.md @@ -0,0 +1,31 @@ +# Form 表单 + +### 引入 + +```js +import Vue from 'vue'; +import { Form } from 'vant'; + +Vue.use(Form); +``` + +## 代码演示 + +### 基础用法 + +## API + +### Props + +| 参数 | 说明 | 类型 | 默认值 | +|------|------|------|------| + +### Events + +| 事件名 | 说明 | 回调参数 | +|------|------|------| + +### Slots + +| 名称 | 说明 | +|------|------| diff --git a/src/form/demo/index.vue b/src/form/demo/index.vue new file mode 100644 index 000000000..2834d9cb9 --- /dev/null +++ b/src/form/demo/index.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/form/index.js b/src/form/index.js new file mode 100644 index 000000000..f760be921 --- /dev/null +++ b/src/form/index.js @@ -0,0 +1,36 @@ +// Utils +import { createNamespace } from '../utils'; + +const [createComponent, bem] = createNamespace('form'); + +export default createComponent({ + provide() { + return { + vanForm: this, + }; + }, + + data() { + return { + fields: [], + }; + }, + + methods: { + onSubmit(event) { + event.preventDefault(); + + const results = this.fields.map(item => item.validate()); + + console.log(results); + }, + }, + + render() { + return ( +
+ {this.slots()} +
+ ); + }, +}); diff --git a/src/form/test/__snapshots__/demo.spec.js.snap b/src/form/test/__snapshots__/demo.spec.js.snap new file mode 100644 index 000000000..a479872af --- /dev/null +++ b/src/form/test/__snapshots__/demo.spec.js.snap @@ -0,0 +1,35 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`renders demo correctly 1`] = ` +
+
+
+
+
username
+
+
+
+
+
+
password
+
+
+
+
+
+
agree
+
+
+
+ +
+
+
+
+
+
+
+`; diff --git a/src/form/test/demo.spec.js b/src/form/test/demo.spec.js new file mode 100644 index 000000000..5c70922b5 --- /dev/null +++ b/src/form/test/demo.spec.js @@ -0,0 +1,4 @@ +import Demo from '../demo'; +import { snapshotDemo } from '../../../test/demo'; + +snapshotDemo(Demo); diff --git a/src/form/test/index.spec.js b/src/form/test/index.spec.js new file mode 100644 index 000000000..e76fc2be8 --- /dev/null +++ b/src/form/test/index.spec.js @@ -0,0 +1 @@ +// import { mount } from '../../../test'; From 9d8cf7f8d339c11655898c7dfd04551d50452f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 15:40:32 +0800 Subject: [PATCH 018/155] fix(Field): align center when using input slot --- src/field/index.js | 6 +++++- src/field/index.less | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 299f6418e..5d949beb8 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -263,7 +263,11 @@ export default createComponent({ const inputSlot = this.slots('input'); if (inputSlot) { - return
{inputSlot}
; + return ( +
+ {inputSlot} +
+ ); } const inputProps = { diff --git a/src/field/index.less b/src/field/index.less index 00b6aeb61..43ea3a91f 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -17,7 +17,6 @@ &__body { display: flex; align-items: center; - height: 100%; } &__control { @@ -57,6 +56,12 @@ text-align: right; } + &--custom { + display: flex; + align-items: center; + min-height: @cell-line-height; + } + // for ios wechat &[type='date'], &[type='time'], From 70ed34aa246b43a7268632c57fe3965aa205f99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 7 Feb 2020 15:51:58 +0800 Subject: [PATCH 019/155] =?UTF-8?q?feat(Form):=20add=20submit=E3=80=81fail?= =?UTF-8?q?ed=20event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/field/index.js | 8 +++++--- src/form/demo/index.vue | 4 +++- src/form/index.js | 20 ++++++++++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 5d949beb8..cdbf0bff7 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -51,7 +51,6 @@ export default createComponent({ data() { return { focused: false, - validateError: false, validateMessage: '', }; }, @@ -59,6 +58,10 @@ export default createComponent({ watch: { value() { this.$nextTick(this.adjustSize); + + if (this.validateMessage) { + this.validateMessage = ''; + } }, }, @@ -133,7 +136,6 @@ export default createComponent({ return !this.rules.some(rule => { if (rule.required && !this.value) { - this.validateError = true; this.validateMessage = rule.message; return true; } @@ -395,7 +397,7 @@ export default createComponent({ titleClass={[bem('label', labelAlign), this.labelClass]} arrowDirection={this.arrowDirection} class={bem({ - error: this.error || this.validateError, + error: this.error || this.validateMessage, [`label-${labelAlign}`]: labelAlign, 'min-height': this.type === 'textarea' && !this.autosize, })} diff --git a/src/form/demo/index.vue b/src/form/demo/index.vue index 2834d9cb9..ff24d5d0d 100644 --- a/src/form/demo/index.vue +++ b/src/form/demo/index.vue @@ -42,7 +42,9 @@ export default { }, methods: { - onSubmit() {}, + onSubmit(values) { + console.log(values); + }, }, }; diff --git a/src/form/index.js b/src/form/index.js index f760be921..db6519f24 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -17,12 +17,28 @@ export default createComponent({ }, methods: { + // @exposed-api + validate() { + return this.fields.map(item => item.validate()).every(item => item); + }, + + getFormData() { + return this.fields.reduce((form, field) => { + form[field.name] = field.value; + return form; + }, {}); + }, + onSubmit(event) { event.preventDefault(); - const results = this.fields.map(item => item.validate()); + const valid = this.validate(); - console.log(results); + if (valid) { + this.$emit('submit', this.getFormData()); + } else { + this.$emit('failed'); + } }, }, From da7c86412c2b2c41e3916f73d5cdc8938e4236f4 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 8 Feb 2020 19:59:34 +0800 Subject: [PATCH 020/155] fix(Tabs): scrollspy not work when custom scroller (#5637) --- src/tabs/index.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/tabs/index.js b/src/tabs/index.js index dbdd1d45c..ca688facd 100644 --- a/src/tabs/index.js +++ b/src/tabs/index.js @@ -6,10 +6,11 @@ import { isHidden } from '../utils/dom/style'; import { on, off } from '../utils/dom/event'; import { BORDER_TOP_BOTTOM } from '../utils/constant'; import { - setRootScrollTop, + getScroller, + getVisibleTop, getElementTop, getVisibleHeight, - getVisibleTop, + setRootScrollTop, } from '../utils/dom/scroll'; // Mixins @@ -27,9 +28,14 @@ export default createComponent({ mixins: [ ParentMixin('vanTabs'), BindEventMixin(function(bind) { + if (!this.scroller) { + this.scroller = getScroller(this.$el); + } + bind(window, 'resize', this.resize, true); + if (this.scrollspy) { - bind(window, 'scroll', this.onScroll, true); + bind(this.scroller, 'scroll', this.onScroll, true); } }), ], @@ -152,9 +158,9 @@ export default createComponent({ scrollspy(val) { if (val) { - on(window, 'scroll', this.onScroll, true); + on(this.scroller, 'scroll', this.onScroll, true); } else { - off(window, 'scroll', this.onScroll); + off(this.scroller, 'scroll', this.onScroll); } }, }, From 6189b7539500152f7fdc648b546fa7ad3e93101f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sat, 8 Feb 2020 20:08:54 +0800 Subject: [PATCH 021/155] docs(Checkbox): improve param type --- src/checkbox/README.md | 14 +++++++------- src/checkbox/README.zh-CN.md | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 0249a0b36..199c42852 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -187,9 +187,9 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| +| v-model (value) | Check status | *boolean* | `false` | | name | Checkbox name | *any* | - | | shape | Can be set to `square` | *string* | `round` | -| v-model | Check status | *boolean* | `false` | | disabled | Disable checkbox | *boolean* | `false` | | label-disabled | Whether to disable label click | *boolean* | `false` | | label-position | Can be set to `left` | *string* | `right` | @@ -201,7 +201,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| -| v-model | Names of all checked checkboxes | *any[]* | - | +| v-model (value) | Names of all checked checkboxes | *any[]* | - | | max | Maximum amount of checked options | *number \| string* | `0`(Unlimited) | | disabled | Disable all checkboxes | *boolean* | `false` | | icon-size `v2.2.3` | Icon size of all checkboxes | *number \| string* | `20px` | @@ -211,14 +211,14 @@ export default { | Event | Description | Parameters | |------|------|------| -| change | Triggered when value changed | current value | -| click | Triggered when click checkbox | event: Event | +| change | Triggered when value changed | *checked: boolean* | +| click | Triggered when click checkbox | *event: Event* | ### CheckboxGroup Events | Event | Description | Parameters | |------|------|------| -| change | Triggered when value changed | current value | +| change | Triggered when value changed | *names: any[]* | ### Checkbox Slots @@ -233,7 +233,7 @@ Use [ref](https://vuejs.org/v2/api/#ref) to get CheckboxGroup instance and call | Name | Description | Attribute | Return value | |------|------|------|------| -| toggleAll | Toggle check status of all checkboxes | checked?: boolean | - | +| toggleAll | Toggle check status of all checkboxes | *checked?: boolean* | - | ### Checkbox Methods @@ -241,4 +241,4 @@ Use [ref](https://vuejs.org/v2/api/#ref) to get Checkbox instance and call insta | Name | Description | Attribute | Return value | |------|------|------|------| -| toggle | Toggle check status | checked?: boolean | - | +| toggle | Toggle check status | *checked?: boolean* | - | diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index c5bf85d41..45fb56ac1 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -203,9 +203,9 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| +| v-model (value) | 是否为选中状态 | *boolean* | `false` | | name | 标识符 | *any* | - | | shape | 形状，可选值为 `square` | *string* | `round` | -| v-model | 是否为选中状态 | *boolean* | `false` | | disabled | 是否禁用复选框 | *boolean* | `false` | | label-disabled | 是否禁用复选框文本点击 | *boolean* | `false` | | label-position | 文本位置，可选值为 `left` | *string* | `right` | @@ -217,7 +217,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| v-model | 所有选中项的标识符 | *any[]* | - | +| v-model (value) | 所有选中项的标识符 | *any[]* | - | | disabled | 是否禁用所有复选框 | *boolean* | `false` | | max | 最大可选数，0 为无限制 | *number \| string* | `0` | | icon-size `v2.2.3` | 所有复选框的图标大小，默认单位为`px` | *number \| string* | `20px` | @@ -227,14 +227,14 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| change | 当绑定值变化时触发的事件 | 当前组件的值 | -| click | 点击复选框时触发 | event: Event | +| change | 当绑定值变化时触发的事件 | *checked: boolean* | +| click | 点击复选框时触发 | *event: Event* | ### CheckboxGroup Events | 事件名 | 说明 | 回调参数 | |------|------|------| -| change | 当绑定值变化时触发的事件 | 当前组件的值 | +| change | 当绑定值变化时触发的事件 | *names: any[]* | ### Checkbox Slots @@ -249,7 +249,7 @@ export default { | 方法名 | 说明 | 参数 | 返回值 | |------|------|------|------| -| toggleAll | 切换所有复选框，传`true`为选中，`false`为取消选中，不传参为取反 | checked?: boolean | - | +| toggleAll | 切换所有复选框，传`true`为选中，`false`为取消选中，不传参为取反 | *checked?: boolean* | - | ### Checkbox 方法 @@ -257,4 +257,4 @@ export default { | 方法名 | 说明 | 参数 | 返回值 | |------|------|------|------| -| toggle | 切换选中状态，传`true`为选中，`false`为取消选中，不传参为取反 | checked?: boolean | - | +| toggle | 切换选中状态，传`true`为选中，`false`为取消选中，不传参为取反 | *checked?: boolean* | - | From e7d3f536c7454426635be138f6ef5713078ff1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sat, 8 Feb 2020 20:16:04 +0800 Subject: [PATCH 022/155] docs: improve link spacing --- packages/vant-cli/site/desktop/components/Content.vue | 3 ++- src/action-sheet/README.zh-CN.md | 4 ++-- src/address-edit/README.zh-CN.md | 2 +- src/area/README.zh-CN.md | 4 ++-- src/button/README.zh-CN.md | 2 +- src/calendar/README.zh-CN.md | 4 ++-- src/cell/README.zh-CN.md | 2 +- src/checkbox/README.zh-CN.md | 4 ++-- src/collapse/README.zh-CN.md | 2 +- src/count-down/README.zh-CN.md | 2 +- src/datetime-picker/README.zh-CN.md | 4 ++-- src/dropdown-menu/README.zh-CN.md | 4 ++-- src/field/README.zh-CN.md | 6 +++--- src/goods-action/README.zh-CN.md | 4 ++-- src/grid/README.zh-CN.md | 2 +- src/image/README.zh-CN.md | 4 ++-- src/list/README.zh-CN.md | 2 +- src/notice-bar/README.zh-CN.md | 2 +- src/number-keyboard/README.zh-CN.md | 2 +- src/panel/README.zh-CN.md | 2 +- src/picker/README.zh-CN.md | 4 ++-- src/popup/README.zh-CN.md | 2 +- src/rate/README.zh-CN.md | 4 ++-- src/search/README.zh-CN.md | 4 ++-- src/sku/README.zh-CN.md | 4 ++-- src/submit-bar/README.zh-CN.md | 4 ++-- src/swipe-cell/README.zh-CN.md | 2 +- src/swipe/README.zh-CN.md | 2 +- src/tab/README.zh-CN.md | 2 +- src/tabbar/README.zh-CN.md | 4 ++-- src/toast/README.zh-CN.md | 2 +- src/uploader/README.zh-CN.md | 2 +- 32 files changed, 49 insertions(+), 48 deletions(-) diff --git a/packages/vant-cli/site/desktop/components/Content.vue b/packages/vant-cli/site/desktop/components/Content.vue index 9ddbc2ad0..7042f0c41 100644 --- a/packages/vant-cli/site/desktop/components/Content.vue +++ b/packages/vant-cli/site/desktop/components/Content.vue @@ -37,6 +37,7 @@ export default { } a { + margin: 0 1px; color: @van-doc-green; -webkit-font-smoothing: auto; } @@ -162,7 +163,7 @@ export default { box-sizing: border-box; width: 6px; height: 6px; - margin-top: 8px; + margin-top: 10px; border: 1px solid @van-doc-dark-grey; border-radius: 50%; content: ''; diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index d959eea46..a152508af 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -141,7 +141,7 @@ export default { | title | 顶部标题 | *string* | - | | cancel-text | 取消按钮文字 | *string* | - | | description `v2.2.8` | 选项上方的描述信息 | *string* | - | -| close-icon `v2.2.13` | 关闭 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `cross` | +| close-icon `v2.2.13` | 关闭[图标名称](#/zh-CN/icon)或图片链接 | *string* | `cross` | | duration `v2.0.3` | 动画时长，单位秒 | *number \| string* | `0.3` | | round `v2.0.9` | 是否显示圆角 | *boolean* | `true` | | overlay | 是否显示遮罩层 | *boolean* | `true` | @@ -149,7 +149,7 @@ export default { | lazy-render | 是否在显示弹层时才渲染节点 | *boolean* | `true` | | close-on-click-action | 是否在点击选项后关闭 | *boolean* | `false` | | close-on-click-overlay | 是否在点击遮罩层后关闭 | *boolean* | `true` | -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | | get-container | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | *string \| () => Element* | - | ### Action 数据结构 diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md index 80efbddb8..a60ce1985 100644 --- a/src/address-edit/README.zh-CN.md +++ b/src/address-edit/README.zh-CN.md @@ -107,7 +107,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.zh-CN.md b/src/area/README.zh-CN.md index 32ceeae99..aa5ac7203 100644 --- a/src/area/README.zh-CN.md +++ b/src/area/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -省市区三级联动选择，通常与 [弹出层](#/zh-CN/popup) 组件配合使用 +省市区三级联动选择，通常与[弹出层](#/zh-CN/popup)组件配合使用 ### 引入 @@ -80,7 +80,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/button/README.zh-CN.md b/src/button/README.zh-CN.md index ca167b771..148b0dce5 100644 --- a/src/button/README.zh-CN.md +++ b/src/button/README.zh-CN.md @@ -127,7 +127,7 @@ Vue.use(Button); | size | 尺寸，可选值为 `large` `small` `mini` | *string* | `normal` | | text | 按钮文字 | *string* | - | | color `v2.1.8` | 按钮颜色，支持传入`linear-gradient`渐变色 | *string* | - | -| icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | tag | HTML 标签 | *string* | `button` | | native-type | 原生 button 标签 type 属性 | *string* | - | | block | 是否为块级元素 | *boolean* | `false` | diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index c3ab4d972..567d4dfaa 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -227,7 +227,7 @@ export default { | show-confirm | 是否展示确认按钮 | *boolean* | `true` | | close-on-popstate `v2.4.4` | 是否在页面回退时自动关闭 | *boolean* | `false` | | close-on-click-overlay | 是否在点击遮罩层后关闭 | *boolean* | `true` | -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | | confirm-text | 确认按钮的文字 | *string* | `确定` | | confirm-disabled-text | 确认按钮处于禁用状态时的文字 | *string* | `确定` | | max-range `v2.4.3` | 日期区间最多可选天数，默认无限制 | *number \| string* | - | @@ -263,7 +263,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/cell/README.zh-CN.md b/src/cell/README.zh-CN.md index d70d4383f..8efc5d813 100644 --- a/src/cell/README.zh-CN.md +++ b/src/cell/README.zh-CN.md @@ -125,7 +125,7 @@ Vue.use(CellGroup); | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | title | 左侧标题 | *number \| string* | - | | value | 右侧内容 | *number \| string* | - | | label | 标题下方的描述信息 | *string* | - | diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index 45fb56ac1..0b8c438d0 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -245,7 +245,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) | 方法名 | 说明 | 参数 | 返回值 | |------|------|------|------| @@ -253,7 +253,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/README.zh-CN.md b/src/collapse/README.zh-CN.md index dc458eed5..75430e99a 100644 --- a/src/collapse/README.zh-CN.md +++ b/src/collapse/README.zh-CN.md @@ -101,7 +101,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | name | 唯一标识符，默认为索引值 | *number \| string* | `index` | -| icon | 标题栏左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon | 标题栏左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | size | 标题栏大小，可选值为 `large` | *string* | - | | title | 标题栏左侧内容 | *number \| string* | - | | value | 标题栏右侧内容 | *number \| string* | - | diff --git a/src/count-down/README.zh-CN.md b/src/count-down/README.zh-CN.md index d1ea48cb7..661151de5 100644 --- a/src/count-down/README.zh-CN.md +++ b/src/count-down/README.zh-CN.md @@ -160,7 +160,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.zh-CN.md b/src/datetime-picker/README.zh-CN.md index 94e4c8aa0..aa83774fa 100644 --- a/src/datetime-picker/README.zh-CN.md +++ b/src/datetime-picker/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -时间选择器，支持日期、年月、时分等维度，通常与 [弹出层](#/zh-CN/popup) 组件配合使用 +时间选择器，支持日期、年月、时分等维度，通常与[弹出层](#/zh-CN/popup)组件配合使用 ### 引入 @@ -199,7 +199,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.zh-CN.md b/src/dropdown-menu/README.zh-CN.md index bcf2fdd1b..bcd3680f0 100644 --- a/src/dropdown-menu/README.zh-CN.md +++ b/src/dropdown-menu/README.zh-CN.md @@ -154,7 +154,7 @@ 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) | 方法名 | 说明 | 参数 | 返回值 | |------|------|------|------| @@ -166,4 +166,4 @@ export default { |------|------|------| | text | 文字 | *string* | | value | 标识符 | *number \| string* | -| icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | +| icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index dd0aac3c7..33b3ca8f9 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -259,8 +259,8 @@ export default { | input-align | 输入框内容对齐方式，可选值为 `center` `right` | *string* | `left` | | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | *string* | `left` | | autosize | 是否自适应内容高度，只对 textarea 有效，
可传入对象,如 { maxHeight: 100, minHeight: 50 }，
单位为`px` | *boolean \| object* | `false` | -| left-icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | -| right-icon | 右侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| left-icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | +| right-icon | 右侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | ### Events @@ -278,7 +278,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/goods-action/README.zh-CN.md b/src/goods-action/README.zh-CN.md index 0d638a90d..14b6a5578 100644 --- a/src/goods-action/README.zh-CN.md +++ b/src/goods-action/README.zh-CN.md @@ -86,7 +86,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | ### GoodsActionIcon Props @@ -108,7 +108,7 @@ export default { | text | 按钮文字 | *string* | - | | type | 按钮类型，可选值为 `primary` `info` `warning` `danger` | *string* | `default` | | color `v2.1.8` | 按钮颜色，支持传入`linear-gradient`渐变色 | *string* | - | -| icon `v2.4.4` | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon `v2.4.4` | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | disabled | 是否禁用按钮 | *boolean* | `false` | - | | loading | 是否显示为加载状态 | *boolean* | `false` | - | | url | 点击后跳转的链接地址 | *string* | - | diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md index 072f14c91..c77ab6ae3 100644 --- a/src/grid/README.zh-CN.md +++ b/src/grid/README.zh-CN.md @@ -133,7 +133,7 @@ Vue.use(GridItem); | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | text | 文字 | *string* | - | -| icon | [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon | [图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | dot `v2.2.1` | 是否显示图标右上角小红点 | *boolean* | `false` | | info `v2.2.1` | 图标右上角徽标的内容 | *number \| string* | - | | url | 点击后跳转的链接地址 | *string* | - | diff --git a/src/image/README.zh-CN.md b/src/image/README.zh-CN.md index d8f8d8f47..4e3470361 100644 --- a/src/image/README.zh-CN.md +++ b/src/image/README.zh-CN.md @@ -111,8 +111,8 @@ Vue.use(Lazyload); | lazy-load | 是否开启图片懒加载，须配合 [Lazyload](#/zh-CN/lazyload) 组件使用 | *boolean* | `false` | | show-error `v2.0.9` | 是否展示图片加载失败提示 | *boolean* | `true` | | show-loading `v2.0.9` | 是否展示图片加载中提示 | *boolean* | `true` | -| error-icon `v2.4.2` | 失败时提示的 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `warning-o` | -| loading-icon `v2.4.2` | 加载时提示的 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `photo-o` | +| error-icon `v2.4.2` | 失败时提示的[图标名称](#/zh-CN/icon)或图片链接 | *string* | `warning-o` | +| loading-icon `v2.4.2` | 加载时提示的[图标名称](#/zh-CN/icon)或图片链接 | *string* | `photo-o` | ### 图片填充模式 diff --git a/src/list/README.zh-CN.md b/src/list/README.zh-CN.md index c67985f2d..e7847e66b 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/notice-bar/README.zh-CN.md b/src/notice-bar/README.zh-CN.md index efe7e0b57..2f1556d17 100644 --- a/src/notice-bar/README.zh-CN.md +++ b/src/notice-bar/README.zh-CN.md @@ -75,7 +75,7 @@ Vue.use(NoticeBar); | text | 通知文本内容 | *string* | `''` | | color | 文本颜色 | *string* | `#f60` | | background | 滚动条背景 | *string* | `#fff7cc` | -| left-icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| left-icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | delay | 动画延迟时间 (s) | *number \| string* | `1` | | speed | 滚动速率 (px/s) | *number \| string* | `50` | | scrollable | 是否在长度溢出时滚动播放 | *boolean* | `true` | diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md index 970a7b545..f38fe8b4d 100644 --- a/src/number-keyboard/README.zh-CN.md +++ b/src/number-keyboard/README.zh-CN.md @@ -153,7 +153,7 @@ export default { | delete-button-text | 删除按钮文字 | *string* | `删除` | | show-delete-key | 是否展示删除按钮 | *boolean* | `true` | | hide-on-click-outside | 点击外部时是否收起键盘 | *boolean* | `true` | -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | ### Events diff --git a/src/panel/README.zh-CN.md b/src/panel/README.zh-CN.md index 1081fbb4c..6ffa2d525 100644 --- a/src/panel/README.zh-CN.md +++ b/src/panel/README.zh-CN.md @@ -44,7 +44,7 @@ Vue.use(Panel); | title | 标题 | *string* | - | | desc | 描述 | *string* | - | | status | 状态 | *string* | - | -| icon | 标题左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon | 标题左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | ### Slots diff --git a/src/picker/README.zh-CN.md b/src/picker/README.zh-CN.md index aff6c460a..74640fa40 100644 --- a/src/picker/README.zh-CN.md +++ b/src/picker/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -提供多个选项集合供用户选择，支持单列选择和多列级联，通常与 [弹出层](#/zh-CN/popup) 组件配合使用 +提供多个选项集合供用户选择，支持单列选择和多列级联，通常与[弹出层](#/zh-CN/popup)组件配合使用 ### 引入 @@ -318,7 +318,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/popup/README.zh-CN.md b/src/popup/README.zh-CN.md index 341ae6d1f..e029ce892 100644 --- a/src/popup/README.zh-CN.md +++ b/src/popup/README.zh-CN.md @@ -144,7 +144,7 @@ export default { | close-icon-position `v2.2.2` | 关闭图标位置，可选值为`top-left`
`bottom-left` `bottom-right` | *string* | `top-right` | | transition | 动画类名，等价于 [transtion](https://cn.vuejs.org/v2/api/index.html#transition) 的`name`属性 | *string* | - | | get-container | 指定挂载的节点 | *string \| () => Element* | - | -| safe-area-inset-bottom `v2.2.1` | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | +| safe-area-inset-bottom `v2.2.1` | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | ### Events diff --git a/src/rate/README.zh-CN.md b/src/rate/README.zh-CN.md index 53c3a187e..fc7f0c9fa 100644 --- a/src/rate/README.zh-CN.md +++ b/src/rate/README.zh-CN.md @@ -117,8 +117,8 @@ export default { | color | 选中时的颜色 | *string* | `#ffd21e` | | void-color | 未选中时的颜色 | *string* | `#c8c9cc` | | disabled-color | 禁用时的颜色 | *string* | `#bdbdbd` | -| icon | 选中时的 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `star` | -| void-icon | 未选中时的 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `star-o` | +| icon | 选中时的[图标名称](#/zh-CN/icon)或图片链接 | *string* | `star` | +| void-icon | 未选中时的[图标名称](#/zh-CN/icon)或图片链接 | *string* | `star-o` | | allow-half | 是否允许半选 | *boolean* | `false` | | readonly | 是否为只读状态 | *boolean* | `false` | | disabled | 是否禁用评分 | *boolean* | `false` | diff --git a/src/search/README.zh-CN.md b/src/search/README.zh-CN.md index 22886fea6..b2ad3a00e 100644 --- a/src/search/README.zh-CN.md +++ b/src/search/README.zh-CN.md @@ -128,8 +128,8 @@ export default { | readonly | 是否将输入框设为只读 | *boolean* | `false` | | error | 是否将输入内容标红 | *boolean* | `false` | | input-align | 输入框内容对齐方式，可选值为 `center` `right` | *string* | `left` | -| left-icon | 输入框左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | `search` | -| right-icon | 输入框右侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| left-icon | 输入框左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | `search` | +| right-icon | 输入框右侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | ### Events diff --git a/src/sku/README.zh-CN.md b/src/sku/README.zh-CN.md index f719cceb7..c9099bac9 100644 --- a/src/sku/README.zh-CN.md +++ b/src/sku/README.zh-CN.md @@ -144,7 +144,7 @@ export default { | get-container | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | *string \| () => Element* | - | | initial-sku | 默认选中的 sku，具体参考高级用法 | *object* | `{}` | | show-soldout-sku | 是否展示售罄的 sku，默认展示并置灰 | *boolean* | `true` | -| safe-area-inset-bottom `v2.2.1` | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | +| safe-area-inset-bottom `v2.2.1` | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | | start-sale-num `v2.3.0` | 起售数量 | *number* | `1` | | properties `v2.4.2` | 商品属性 | *array* | - | @@ -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/submit-bar/README.zh-CN.md b/src/submit-bar/README.zh-CN.md index 3f9e68b0c..671f970c0 100644 --- a/src/submit-bar/README.zh-CN.md +++ b/src/submit-bar/README.zh-CN.md @@ -79,12 +79,12 @@ Vue.use(SubmitBar); | button-text | 按钮文字 | *string* | - | | button-type | 按钮类型 | *string* | `danger` | | tip | 提示文案 | *string* | - | -| tip-icon | 左侧 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| tip-icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | currency | 货币符号 | *string* | `¥` | | decimal-length | 价格小数点后位数 | *number \| string* | `2` | | disabled | 是否禁用按钮 | *boolean* | `false` | | loading | 是否显示加载中的按钮 | *boolean* | `false` | -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | ### Events diff --git a/src/swipe-cell/README.zh-CN.md b/src/swipe-cell/README.zh-CN.md index cf4e58e99..8f834e115 100644 --- a/src/swipe-cell/README.zh-CN.md +++ b/src/swipe-cell/README.zh-CN.md @@ -145,7 +145,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.zh-CN.md b/src/swipe/README.zh-CN.md index c7cc45b12..0c927b408 100644 --- a/src/swipe/README.zh-CN.md +++ b/src/swipe/README.zh-CN.md @@ -180,7 +180,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.zh-CN.md b/src/tab/README.zh-CN.md index 234ea4660..ed88127da 100644 --- a/src/tab/README.zh-CN.md +++ b/src/tab/README.zh-CN.md @@ -242,7 +242,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/tabbar/README.zh-CN.md b/src/tabbar/README.zh-CN.md index 9120d957a..e0e9ebc66 100644 --- a/src/tabbar/README.zh-CN.md +++ b/src/tabbar/README.zh-CN.md @@ -172,7 +172,7 @@ export default { | active-color | 选中标签的颜色 | *string* | `#1989fa` | | inactive-color | 未选中标签的颜色 | *string* | `#7d7e80` | | route | 是否开启路由模式 | *boolean* | `false` | -| safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | +| safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `false` | ### Tabbar Events @@ -185,7 +185,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | name | 标签名称，作为匹配的标识符 | *number \| string* | 当前标签的索引值 | -| icon | [图标名称](#/zh-CN/icon) 或图片链接| *string* | - | +| icon | [图标名称](#/zh-CN/icon)或图片链接| *string* | - | | dot | 是否显示图标右上角小红点 | *boolean* | `false` | | info | 图标右上角徽标的内容 | *number \| string* | - | | url | 点击后跳转的链接地址 | *string* | - | diff --git a/src/toast/README.zh-CN.md b/src/toast/README.zh-CN.md index 57316fffa..3b4af4e9e 100644 --- a/src/toast/README.zh-CN.md +++ b/src/toast/README.zh-CN.md @@ -144,7 +144,7 @@ Toast.resetDefaultOptions('loading'); | type | 提示类型，可选值为 `loading` `success`
`fail` `html` | *string* | `text` | | position | 位置，可选值为 `top` `bottom` | *string* | `middle` | | message | 文本内容，支持通过`\n`换行 | *string* | `''` | - | -| icon `v2.0.1` | 自定义图标，支持传入 [图标名称](#/zh-CN/icon) 或图片链接 | *string* | - | +| icon `v2.0.1` | 自定义图标，支持传入[图标名称](#/zh-CN/icon)或图片链接 | *string* | - | | iconPrefix `v2.0.9` | 图标类名前缀 | *string* | `van-icon` | | overlay `v2.2.13` | 是否显示背景遮罩层 | *boolean* | `false` | | forbidClick | 是否禁止背景点击 | *boolean* | `false` | diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md index 88da47b82..5b4a838db 100644 --- a/src/uploader/README.zh-CN.md +++ b/src/uploader/README.zh-CN.md @@ -229,7 +229,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) | 方法名 | 说明 | 参数 | 返回值 | |------|------|------|------| From 779c83bd676f61f96be955533bebfc128c2fec01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sat, 8 Feb 2020 20:22:57 +0800 Subject: [PATCH 023/155] docs(Radio): improve param type --- src/checkbox/README.md | 2 +- src/checkbox/README.zh-CN.md | 2 +- src/radio/README.md | 8 ++++---- src/radio/README.zh-CN.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 199c42852..52528f8fe 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -225,7 +225,7 @@ export default { | Name | Description | SlotProps | |------|------|------| | default | Custom label | - | -| icon | Custom icon | checked: whether to be checked | +| icon | Custom icon | *checked: boolean* | ### CheckboxGroup Methods diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index 0b8c438d0..571ffa523 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -241,7 +241,7 @@ export default { | 名称 | 说明 | SlotProps | |------|------|------| | default | 自定义文本 | - | -| icon | 自定义图标 | checked: 是否为选中状态 | +| icon | 自定义图标 | *checked: boolean* | ### CheckboxGroup 方法 diff --git a/src/radio/README.md b/src/radio/README.md index 3190a9597..ec0fbac49 100644 --- a/src/radio/README.md +++ b/src/radio/README.md @@ -148,7 +148,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| -| v-model | Name of checked radio | *any* | - | +| v-model (v-model) | Name of checked radio | *any* | - | | disabled | Disable all radios | *boolean* | `false` | | icon-size `v2.2.3` | Icon size of all radios | *number \| string* | `20px` | | checked-color `v2.2.3` | Checked color of all radios | *string* | `#1989fa` | - | @@ -157,17 +157,17 @@ export default { | Event | Description | Parameters | |------|------|------| -| click | Triggered when click radio | event: Event | +| click | Triggered when click radio | *event: Event* | ### RadioGroup Events | Event | Description | Parameters | |------|------|------| -| change | Triggered when value changed | current value | +| change | Triggered when value changed | *name: string* | ### Radio Slots | Name | Description | SlotProps | |------|------|------| | default | Custom label | - | -| icon | Custom icon | checked: whether to be checked | +| icon | Custom icon | *checked: boolean* | diff --git a/src/radio/README.zh-CN.md b/src/radio/README.zh-CN.md index 275d2b964..29b50828d 100644 --- a/src/radio/README.zh-CN.md +++ b/src/radio/README.zh-CN.md @@ -158,7 +158,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| v-model | 当前选中项的标识符 | *any* | - | +| v-model (value) | 当前选中项的标识符 | *any* | - | | disabled | 是否禁用所有单选框 | *boolean* | `false` | | icon-size `v2.2.3` | 所有单选框的图标大小，默认单位为`px` | *number \| string* | `20px` | | checked-color `v2.2.3` | 所有单选框的选中状态颜色 | *string* | `#1989fa` | @@ -167,17 +167,17 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击单选框时触发 | event: Event | +| click | 点击单选框时触发 | *event: Event* | ### RadioGroup Events | 事件名 | 说明 | 回调参数 | |------|------|------| -| change | 当绑定值变化时触发的事件 | 当前选中项的 name | +| change | 当绑定值变化时触发的事件 | *name: string* | ### Radio Slots | 名称 | 说明 | SlotProps | |------|------|------| | default | 自定义文本 | - | -| icon | 自定义图标 | checked: 是否为选中状态 | +| icon | 自定义图标 | *checked: boolean* | From aceaa2f739b020f9e3e7762d61008785ffa47066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 9 Feb 2020 11:12:15 +0800 Subject: [PATCH 024/155] docs: improve event param typing --- src/action-sheet/README.md | 2 +- src/action-sheet/README.zh-CN.md | 2 +- src/button/README.md | 4 ++-- src/button/README.zh-CN.md | 4 ++-- src/calendar/README.md | 4 ++-- src/calendar/README.zh-CN.md | 4 ++-- src/card/README.md | 4 ++-- src/card/README.zh-CN.md | 4 ++-- src/cell/README.md | 2 +- src/cell/README.zh-CN.md | 2 +- src/col/README.md | 4 ++-- src/col/README.zh-CN.md | 4 ++-- src/contact-card/README.md | 2 +- src/contact-card/README.zh-CN.md | 2 +- src/count-down/README.md | 6 +++--- src/count-down/README.zh-CN.md | 6 +++--- src/field/README.md | 14 +++++++------- src/field/README.zh-CN.md | 14 +++++++------- src/grid/README.md | 2 +- src/grid/README.zh-CN.md | 2 +- src/icon/README.md | 2 +- src/icon/README.zh-CN.md | 2 +- src/image/README.md | 2 +- src/image/README.zh-CN.md | 2 +- src/notice-bar/README.md | 4 ++-- src/notice-bar/README.zh-CN.md | 4 ++-- src/overlay/README.md | 2 +- src/overlay/README.zh-CN.md | 2 +- src/popup/README.md | 2 +- src/popup/README.zh-CN.md | 2 +- src/search/README.md | 10 +++++----- src/search/README.zh-CN.md | 10 +++++----- src/stepper/README.md | 6 +++--- src/stepper/README.zh-CN.md | 8 ++++---- src/swipe/README.md | 2 +- src/swipe/README.zh-CN.md | 2 +- src/switch/README.md | 6 +++--- src/switch/README.zh-CN.md | 8 ++++---- src/tag/README.md | 2 +- src/tag/README.zh-CN.md | 2 +- 40 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md index 13e0f19ba..940a5ce53 100644 --- a/src/action-sheet/README.md +++ b/src/action-sheet/README.md @@ -153,7 +153,7 @@ export default { | Event | Description | Arguments | |------|------|------| -| select | Triggered when click option | item, index | +| select | Triggered when click option | *action: Action, index: number* | | cancel | Triggered when cancel click | - | | click-overlay | Triggered when click overlay | - | | open | Triggered when open ActionSheet | - | diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index a152508af..8e410fac4 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -169,7 +169,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| select | 选中选项时触发，禁用或加载状态下不会触发 | item: 选项对应的对象, index: 选择对应的索引 | +| select | 选中选项时触发，禁用或加载状态下不会触发 | *action: Action, index: number* | | cancel | 取消按钮点击时触发 | - | | click-overlay | 点击遮罩层时触发 | - | | open | 打开菜单时触发 | - | diff --git a/src/button/README.md b/src/button/README.md index 0937207e4..a0164f6c1 100644 --- a/src/button/README.md +++ b/src/button/README.md @@ -125,5 +125,5 @@ Vue.use(Button); | Event | Description | Arguments | |------|------|------| -| click | Triggered when click button and not disabled or loading | event: Event | -| touchstart | Triggered when touch start | event: TouchEvent | +| click | Triggered when click button and not disabled or loading | *event: Event* | +| touchstart | Triggered when touch start | *event: TouchEvent* | diff --git a/src/button/README.zh-CN.md b/src/button/README.zh-CN.md index 148b0dce5..a8c53967f 100644 --- a/src/button/README.zh-CN.md +++ b/src/button/README.zh-CN.md @@ -148,5 +148,5 @@ Vue.use(Button); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击按钮，且按钮状态不为加载或禁用时触发 | event: Event | -| touchstart | 开始触摸按钮时触发 | event: TouchEvent | +| click | 点击按钮，且按钮状态不为加载或禁用时触发 | *event: Event* | +| touchstart | 开始触摸按钮时触发 | *event: TouchEvent* | diff --git a/src/calendar/README.md b/src/calendar/README.md index ab9093ab7..af0d30730 100644 --- a/src/calendar/README.md +++ b/src/calendar/README.md @@ -249,8 +249,8 @@ Set `poppable` to `false`, the calendar will be displayed directly on the page i | Event | Description | Arguments | |------|------|------| -| select | Triggered when select date | value: Date \| Date[] | -| confirm | Triggered after date selection is complete，if `show-confirm` is` true`, it is triggered after clicking the confirm button | value: Date \| Date[] | +| select | Triggered when select date | *value: Date \| Date[]* | +| confirm | Triggered after date selection is complete，if `show-confirm` is` true`, it is triggered after clicking the confirm button | *value: Date \| Date[]* | ### Slots diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index 567d4dfaa..b9cc1079c 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -251,8 +251,8 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| select | 点击任意日期时触发 | value: Date \| Date[] | -| confirm | 日期选择完成后触发，若`show-confirm`为`true`，则点击确认按钮后触发 | value: Date \| Date[] | +| select | 点击任意日期时触发 | *value: Date \| Date[]* | +| confirm | 日期选择完成后触发，若`show-confirm`为`true`，则点击确认按钮后触发 | *value: Date \| Date[]* | ### Slots diff --git a/src/card/README.md b/src/card/README.md index 8ab9534a0..dfd4e7c2a 100644 --- a/src/card/README.md +++ b/src/card/README.md @@ -82,8 +82,8 @@ Use slot to custom content. | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | -| click-thumb | Triggered when thumb clicked | event: Event | +| click | Triggered when clicked | *event: Event* | +| click-thumb | Triggered when thumb clicked | *event: Event* | ### Slots diff --git a/src/card/README.zh-CN.md b/src/card/README.zh-CN.md index 2b5948779..7e5274764 100644 --- a/src/card/README.zh-CN.md +++ b/src/card/README.zh-CN.md @@ -84,8 +84,8 @@ Vue.use(Card); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | -| click-thumb | 点击自定义图片时触发 | event: Event | +| click | 点击时触发 | *event: Event* | +| click-thumb | 点击自定义图片时触发 | *event: Event* | ### Slots diff --git a/src/cell/README.md b/src/cell/README.md index b3c1cfe7a..84cf1b072 100644 --- a/src/cell/README.md +++ b/src/cell/README.md @@ -137,7 +137,7 @@ Vue.use(CellGroup); | Event | Description | Arguments | |------|------|------| -| click | Triggered when click cell | event: Event | +| click | Triggered when click cell | *event: Event* | ### CellGroup Slots diff --git a/src/cell/README.zh-CN.md b/src/cell/README.zh-CN.md index 8efc5d813..8efdc3e39 100644 --- a/src/cell/README.zh-CN.md +++ b/src/cell/README.zh-CN.md @@ -148,7 +148,7 @@ Vue.use(CellGroup); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击单元格时触发 | event: Event | +| click | 点击单元格时触发 | *event: Event* | ### CellGroup Slots diff --git a/src/col/README.md b/src/col/README.md index 456fd1e18..99ff5584f 100644 --- a/src/col/README.md +++ b/src/col/README.md @@ -112,10 +112,10 @@ Setting `type` to `flex` to enable flex layout | Event | Description | Arguments | |------|------|------| -| click | Triggered when click row | event: Event | +| click | Triggered when click row | *event: Event* | ### Col Events | Event | Description | Arguments | |------|------|------| -| click | Triggered when click col | event: Event | +| click | Triggered when click col | *event: Event* | diff --git a/src/col/README.zh-CN.md b/src/col/README.zh-CN.md index a539f59c3..8731ef7b2 100644 --- a/src/col/README.zh-CN.md +++ b/src/col/README.zh-CN.md @@ -115,10 +115,10 @@ Layout 组件提供了`24列栅格`，通过在`Col`上添加`span`属性设置 | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | ### Col Events | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | diff --git a/src/contact-card/README.md b/src/contact-card/README.md index c8b74c382..84880d732 100644 --- a/src/contact-card/README.md +++ b/src/contact-card/README.md @@ -145,7 +145,7 @@ export default { | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | +| click | Triggered when clicked | *event: Event* | ### ContactList Props diff --git a/src/contact-card/README.zh-CN.md b/src/contact-card/README.zh-CN.md index eba9f75a2..2f2d65837 100644 --- a/src/contact-card/README.zh-CN.md +++ b/src/contact-card/README.zh-CN.md @@ -149,7 +149,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | ### ContactList Props diff --git a/src/count-down/README.md b/src/count-down/README.md index aad50c501..6d3e618f7 100644 --- a/src/count-down/README.md +++ b/src/count-down/README.md @@ -130,15 +130,15 @@ export default { | Event | Description | Arguments | |------|------|------| | finish | Triggered when count down finished | - | -| change `v2.4.4` | Triggered when count down changed | timeData | +| change `v2.4.4` | Triggered when count down changed | *timeData: TimeData* | ### Slots | Name | Description | SlotProps | |------|------|------| -| default | Custom Content | timeData | +| default | Custom Content | *timeData: TimeData* | -### timeData Structure +### TimeData Structure | Name | Description | Type | |------|------|------| diff --git a/src/count-down/README.zh-CN.md b/src/count-down/README.zh-CN.md index 661151de5..4587609aa 100644 --- a/src/count-down/README.zh-CN.md +++ b/src/count-down/README.zh-CN.md @@ -140,15 +140,15 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| | finish | 倒计时结束时触发 | - | -| change `v2.4.4` | 倒计时变化时触发 | timeData | +| change `v2.4.4` | 倒计时变化时触发 | *timeData: TimeData* | ### Slots | 名称 | 说明 | SlotProps | |------|------|------| -| default | 自定义内容 | timeData | +| default | 自定义内容 | *timeData: TimeData* | -### timeData 格式 +### TimeData 格式 | 名称 | 说明 | 类型 | |------|------|------| diff --git a/src/field/README.md b/src/field/README.md index 7310ff529..1996d9b26 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -249,13 +249,13 @@ Field support all native events of input tag | Event | Description | Parameters | |------|------|------| -| input | Triggered when input value changed | value: current value | -| focus | Triggered when input gets focus | event: Event | -| blur | Triggered when input loses focus | event: Event | -| clear | Triggered when click clear icon | event: Event | -| click | Triggered when click Field | event: Event | -| click-left-icon | Triggered when click the left icon of Field | event: Event | -| click-right-icon | Triggered when click the right icon of Field | event: Event | +| input | Triggered when input value changed | *value: string* | +| focus | Triggered when input gets focus | *event: Event* | +| blur | Triggered when input loses focus | *event: Event* | +| clear | Triggered when click clear icon | *event: Event* | +| click | Triggered when click Field | *event: Event* | +| click-left-icon | Triggered when click the left icon of Field | *event: Event* | +| click-right-icon | Triggered when click the right icon of Field | *event: Event* | ### Methods diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index 33b3ca8f9..ab154edaa 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -268,13 +268,13 @@ export default { | 事件 | 说明 | 回调参数 | |------|------|------| -| input | 输入框内容变化时触发 | value: 输入框当前值 | -| focus | 输入框获得焦点时触发 | event: Event | -| blur | 输入框失去焦点时触发 | event: Event | -| clear | 点击清除按钮时触发 | event: Event | -| click | 点击时触发 | event: Event | -| click-left-icon | 点击左侧图标时触发 | event: Event | -| click-right-icon | 点击右侧图标时触发 | event: Event | +| input | 输入框内容变化时触发 | *value: string (当前输入的值)* | +| focus | 输入框获得焦点时触发 | *event: Event* | +| blur | 输入框失去焦点时触发 | *event: Event* | +| clear | 点击清除按钮时触发 | *event: Event* | +| click | 点击时触发 | *event: Event* | +| click-left-icon | 点击左侧图标时触发 | *event: Event* | +| click-right-icon | 点击右侧图标时触发 | *event: Event* | ### 方法 diff --git a/src/grid/README.md b/src/grid/README.md index 1008a055a..b3b37a7cc 100644 --- a/src/grid/README.md +++ b/src/grid/README.md @@ -126,7 +126,7 @@ Vue.use(GridItem); | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | +| click | Triggered when clicked | *event: Event* | ### GridItem Slots diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md index c77ab6ae3..a4c5c5e7c 100644 --- a/src/grid/README.zh-CN.md +++ b/src/grid/README.zh-CN.md @@ -144,7 +144,7 @@ Vue.use(GridItem); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击格子时触发 | event: Event | +| click | 点击格子时触发 | *event: Event* | ### GridItem Slots diff --git a/src/icon/README.md b/src/icon/README.md index cf6deef47..63da9842e 100644 --- a/src/icon/README.md +++ b/src/icon/README.md @@ -97,4 +97,4 @@ import 'vant/lib/icon/local.css'; | Event | Description | Arguments | |------|------|------| -| click | Triggered when click icon | event: Event | +| click | Triggered when click icon | *event: Event* | diff --git a/src/icon/README.zh-CN.md b/src/icon/README.zh-CN.md index 521a528b1..23e06b76c 100644 --- a/src/icon/README.zh-CN.md +++ b/src/icon/README.zh-CN.md @@ -103,4 +103,4 @@ import 'vant/lib/icon/local.css'; | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击图标时触发 | event: Event | +| click | 点击图标时触发 | *event: Event* | diff --git a/src/image/README.md b/src/image/README.md index 94fd6f8f9..101d86206 100644 --- a/src/image/README.md +++ b/src/image/README.md @@ -96,7 +96,7 @@ Vue.use(Lazyload); | Event | Description | Arguments | |------|------|------| -| click | Triggered when click image | event: Event | +| click | Triggered when click image | *event: Event* | | load | Triggered when image loaded | - | | error | Triggered when image load failed | - | diff --git a/src/image/README.zh-CN.md b/src/image/README.zh-CN.md index 4e3470361..e13642aba 100644 --- a/src/image/README.zh-CN.md +++ b/src/image/README.zh-CN.md @@ -128,7 +128,7 @@ Vue.use(Lazyload); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击图片时触发 | event: Event | +| click | 点击图片时触发 | *event: Event* | | load | 图片加载完毕时触发 | - | | error | 图片加载失败时触发 | - | diff --git a/src/notice-bar/README.md b/src/notice-bar/README.md index caeefec9d..08adb596b 100644 --- a/src/notice-bar/README.md +++ b/src/notice-bar/README.md @@ -77,8 +77,8 @@ Vue.use(NoticeBar); | Event | Description | Arguments | |------|------|------| -| click | Triggered when click NoticeBar | event: Event | -| close | Triggered when closed | event: Event | +| click | Triggered when click NoticeBar | *event: Event* | +| close | Triggered when closed | *event: Event* | ### Slots diff --git a/src/notice-bar/README.zh-CN.md b/src/notice-bar/README.zh-CN.md index 2f1556d17..18651ea9e 100644 --- a/src/notice-bar/README.zh-CN.md +++ b/src/notice-bar/README.zh-CN.md @@ -85,8 +85,8 @@ Vue.use(NoticeBar); | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击通知栏时触发 | event: Event | -| close | 关闭通知栏时触发 | event: Event | +| click | 点击通知栏时触发 | *event: Event* | +| close | 关闭通知栏时触发 | *event: Event* | ### Slots diff --git a/src/overlay/README.md b/src/overlay/README.md index 7543bfb33..0147b4e61 100644 --- a/src/overlay/README.md +++ b/src/overlay/README.md @@ -69,7 +69,7 @@ export default { | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | +| click | Triggered when clicked | *event: Event* | ### Slots diff --git a/src/overlay/README.zh-CN.md b/src/overlay/README.zh-CN.md index 79afff5f7..195270ef2 100644 --- a/src/overlay/README.zh-CN.md +++ b/src/overlay/README.zh-CN.md @@ -75,7 +75,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | ### Slots diff --git a/src/popup/README.md b/src/popup/README.md index 853573b45..c5e309570 100644 --- a/src/popup/README.md +++ b/src/popup/README.md @@ -139,7 +139,7 @@ export default { | Event | Description | Arguments | |------|------|------| -| click | Triggered when click Popup | event: Event | +| click | Triggered when click Popup | *event: Event* | | open | Triggered when open Popup | - | | opened | Triggered when opened Popup | - | | close | Triggered when close Popup | - | diff --git a/src/popup/README.zh-CN.md b/src/popup/README.zh-CN.md index e029ce892..53ce1277b 100644 --- a/src/popup/README.zh-CN.md +++ b/src/popup/README.zh-CN.md @@ -150,7 +150,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击弹出层时触发 | event: Event | +| click | 点击弹出层时触发 | *event: Event* | | open | 打开弹出层时触发 | - | | opened | 打开弹出层且动画结束后触发 | - | | close | 关闭弹出层时触发 | - | diff --git a/src/search/README.md b/src/search/README.md index 402c306c9..02b4d7029 100644 --- a/src/search/README.md +++ b/src/search/README.md @@ -135,11 +135,11 @@ Use `action` slot to custom right button, `cancel` event will no longer be trigg | Event | Description | Arguments | |------|------|------| -| search | Triggered when confirm search | value: current value | -| input | Triggered when input value changed | value: current value | -| focus | Triggered when input gets focus | event: Event | -| blur | Triggered when input loses focus | event: Event | -| clear | Triggered when click clear icon | event: Event | +| search | Triggered when confirm search | *value: string* | +| input | Triggered when input value changed | *value: string* | +| focus | Triggered when input gets focus | *event: Event* | +| blur | Triggered when input loses focus | *event: Event* | +| clear | Triggered when click clear icon | *event: Event* | | cancel | Triggered when click cancel button | - | ### Slots diff --git a/src/search/README.zh-CN.md b/src/search/README.zh-CN.md index b2ad3a00e..a8d02390f 100644 --- a/src/search/README.zh-CN.md +++ b/src/search/README.zh-CN.md @@ -135,11 +135,11 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| search | 确定搜索时触发 | value: 输入框当前值 | -| input | 输入框内容变化时触发 | value: 输入框当前值 | -| focus | 输入框获得焦点时触发 | event: Event | -| blur | 输入框失去焦点时触发 | event: Event | -| clear | 点击清除按钮后触发 | event: Event | +| search | 确定搜索时触发 | *value: string (当前输入的值)* | +| input | 输入框内容变化时触发 | *value: string (当前输入的值)* | +| focus | 输入框获得焦点时触发 | *event: Event* | +| blur | 输入框失去焦点时触发 | *event: Event* | +| clear | 点击清除按钮后触发 | *event: Event* | | cancel | 点击取消按钮时触发 | - | ### Slots diff --git a/src/stepper/README.md b/src/stepper/README.md index 232684b16..829fb5a42 100644 --- a/src/stepper/README.md +++ b/src/stepper/README.md @@ -130,9 +130,9 @@ export default { | Event | Description | Arguments | |------|------|------| -| change | Triggered when value change | value: current value, detail: Detail info, contains name | +| change | Triggered when value change | *value: string, detail: { name: string }* | | overlimit | Triggered when click disabled button | - | | plus | Triggered when click plus button | - | | minus | Triggered when click minus button | - | -| focus | Triggered when input focused | event: Event | -| blur | Triggered when input blured | event: Event | +| focus | Triggered when input focused | *event: Event* | +| blur | Triggered when input blured | *event: Event* | diff --git a/src/stepper/README.zh-CN.md b/src/stepper/README.zh-CN.md index 728d25f78..dbe90766e 100644 --- a/src/stepper/README.zh-CN.md +++ b/src/stepper/README.zh-CN.md @@ -131,7 +131,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| -| v-model | 当前输入值 | *number \| string* | - | +| v-model | 当前输入的值 | *number \| string* | - | | min | 最小值 | *number \| string* | `1` | | max | 最大值 | *number \| string* | - | | default-value | 初始值，当 v-model 为空时生效 | *number \| string* | `1` | @@ -154,9 +154,9 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| change | 当绑定值变化时触发的事件 | value: 当前组件的值, detail: 额外信息，包含 name 的字段 | +| change | 当绑定值变化时触发的事件 | *value: string, detail: { name: string }* | | overlimit | 点击不可用的按钮时触发 | - | | plus | 点击增加按钮时触发 | - | | minus | 点击减少按钮时触发 | - | -| focus | 输入框聚焦时触发 | event: Event | -| blur | 输入框失焦时触发 | event: Event | +| focus | 输入框聚焦时触发 | *event: Event* | +| blur | 输入框失焦时触发 | *event: Event* | diff --git a/src/swipe/README.md b/src/swipe/README.md index ad7a02682..e737a8c70 100644 --- a/src/swipe/README.md +++ b/src/swipe/README.md @@ -170,7 +170,7 @@ export default { | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | +| click | Triggered when clicked | *event: Event* | ### Swipe Methods diff --git a/src/swipe/README.zh-CN.md b/src/swipe/README.zh-CN.md index 0c927b408..6ffc18647 100644 --- a/src/swipe/README.zh-CN.md +++ b/src/swipe/README.zh-CN.md @@ -176,7 +176,7 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | ### Swipe 方法 diff --git a/src/switch/README.md b/src/switch/README.md index 6c0d2233c..377cbfb96 100644 --- a/src/switch/README.md +++ b/src/switch/README.md @@ -91,7 +91,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| -| v-model | Check status of Switch | *any* | `false` | +| v-model | Check status of Switch | *ActiveValue \| InactiveValue* | `false` | | loading | Whether to show loading icon | *boolean* | `false` | | disabled | Whether to disable switch | *boolean* | `false` | | size `v2.2.11` | Size of switch | *number \| string* | `30px` | @@ -104,5 +104,5 @@ export default { | Event | Description | Parameters | |------|------|------| -| change | Triggered when check status changed | checked: is switch checked | -| click `v2.2.11` | Triggered when clicked | event: Event | +| change | Triggered when check status changed | *value: any* | +| click `v2.2.11` | Triggered when clicked | *event: Event* | diff --git a/src/switch/README.zh-CN.md b/src/switch/README.zh-CN.md index 43042eb16..040babd08 100644 --- a/src/switch/README.zh-CN.md +++ b/src/switch/README.zh-CN.md @@ -109,12 +109,12 @@ export default { | size `v2.2.11` | 开关尺寸，默认单位为`px` | *number \| string* | `30px` | | active-color | 打开时的背景色 | *string* | `#1989fa` | | inactive-color | 关闭时的背景色 | *string* | `white` | -| active-value | 打开时的值 | *any* | `true` | -| inactive-value | 关闭时的值 | *any* | `false` | +| active-value | 打开时对应的值 | *any* | `true` | +| inactive-value | 关闭时对应的值 | *any* | `false` | ### Events | 事件名 | 说明 | 回调参数 | |------|------|------| -| change | 开关状态切换回调 | checked: 是否选中开关 | -| click `v2.2.11` | 点击时触发 | event: Event | +| change | 开关状态切换时触发 | *value: any* | +| click `v2.2.11` | 点击时触发 | *event: Event* | diff --git a/src/tag/README.md b/src/tag/README.md index 71f538bc6..30fafaebc 100644 --- a/src/tag/README.md +++ b/src/tag/README.md @@ -135,5 +135,5 @@ export default { | Event | Description | Arguments | |------|------|------| -| click | Triggered when clicked | event: Event | +| click | Triggered when clicked | *event: Event* | | close | Triggered when click close icon | - | diff --git a/src/tag/README.zh-CN.md b/src/tag/README.zh-CN.md index d92bf7249..da2db434b 100644 --- a/src/tag/README.zh-CN.md +++ b/src/tag/README.zh-CN.md @@ -145,5 +145,5 @@ export default { | 事件名 | 说明 | 回调参数 | |------|------|------| -| click | 点击时触发 | event: Event | +| click | 点击时触发 | *event: Event* | | close | 关闭标签时触发 | - | From 1fe96f3edca3ab7c87279b4456612a19ceffa467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 10:57:57 +0800 Subject: [PATCH 025/155] feat(Form): binding checkbox --- src/field/index.js | 12 +++++++++++- src/form/demo/index.vue | 6 +++++- src/form/index.js | 2 +- src/mixins/checkbox.js | 3 ++- src/mixins/field.js | 13 +++++++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/mixins/field.js diff --git a/src/field/index.js b/src/field/index.js index cdbf0bff7..a1da6f4a9 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -15,6 +15,12 @@ const [createComponent, bem] = createNamespace('field'); export default createComponent({ inheritAttrs: false, + provide() { + return { + vanField: this, + }; + }, + inject: { vanForm: { default: null, @@ -111,6 +117,10 @@ export default createComponent({ return { width: addUnit(labelWidth) }; } }, + + formValue() { + return this.children ? this.children.value : this.value; + }, }, methods: { @@ -135,7 +145,7 @@ export default createComponent({ } return !this.rules.some(rule => { - if (rule.required && !this.value) { + if (rule.required && !this.formValue) { this.validateMessage = rule.message; return true; } diff --git a/src/form/demo/index.vue b/src/form/demo/index.vue index ff24d5d0d..b6de21ed3 100644 --- a/src/form/demo/index.vue +++ b/src/form/demo/index.vue @@ -17,7 +17,11 @@ :rules="[{ required: true, message: 'password is required' }]" placeholder="password" /> - + submit diff --git a/src/form/index.js b/src/form/index.js index db6519f24..8eb02fce3 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -24,7 +24,7 @@ export default createComponent({ getFormData() { return this.fields.reduce((form, field) => { - form[field.name] = field.value; + form[field.name] = field.formValue; return form; }, {}); }, diff --git a/src/mixins/checkbox.js b/src/mixins/checkbox.js index 1b378a0d2..c57228f6b 100644 --- a/src/mixins/checkbox.js +++ b/src/mixins/checkbox.js @@ -2,11 +2,12 @@ * Common part of Checkbox & Radio */ import Icon from '../icon'; +import { FieldMixin } from './field'; import { ChildrenMixin } from './relation'; import { addUnit } from '../utils'; export const CheckboxMixin = ({ parent, bem, role }) => ({ - mixins: [ChildrenMixin(parent)], + mixins: [ChildrenMixin(parent), FieldMixin], props: { name: null, diff --git a/src/mixins/field.js b/src/mixins/field.js new file mode 100644 index 000000000..bf55f9682 --- /dev/null +++ b/src/mixins/field.js @@ -0,0 +1,13 @@ +export const FieldMixin = { + inject: { + vanField: { + default: null, + }, + }, + + created() { + if (this.vanField) { + this.vanField.children = this; + } + }, +}; From e17a4a24993822b0f35114dacbbb3bebc5b51a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 10:58:48 +0800 Subject: [PATCH 026/155] fix: text-fill-color may affect child element --- src/field/index.less | 4 ++-- src/stepper/index.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/field/index.less b/src/field/index.less index 43ea3a91f..d0ee6cd15 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -38,7 +38,7 @@ &:disabled { color: @field-input-disabled-text-color; - -webkit-text-fill-color: @field-input-disabled-text-color; // fix disabled color in iOS + -webkit-text-fill-color: currentColor; // fix disabled color in iOS background-color: transparent; cursor: not-allowed; opacity: 1; @@ -148,7 +148,7 @@ &, &::placeholder { color: @field-input-error-text-color; - -webkit-text-fill-color: @field-input-error-text-color; + -webkit-text-fill-color: currentColor; } } } diff --git a/src/stepper/index.less b/src/stepper/index.less index dcfdd6eee..0a537f56c 100644 --- a/src/stepper/index.less +++ b/src/stepper/index.less @@ -86,7 +86,7 @@ &:disabled { color: @stepper-input-disabled-text-color; background-color: @stepper-input-disabled-background-color; - -webkit-text-fill-color: @stepper-input-disabled-text-color; // fix disabled color in iOS + -webkit-text-fill-color: currentColor; // fix disabled color in iOS opacity: 1; } From 494e30306167ab60aeaf4b69de9773f4eecd0cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 11:04:03 +0800 Subject: [PATCH 027/155] fix(Form): reset validate when checkbox changed --- src/field/index.js | 11 +++++++---- src/mixins/field.js | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index a1da6f4a9..8621c7206 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -63,11 +63,8 @@ export default createComponent({ watch: { value() { + this.resetValidate(); this.$nextTick(this.adjustSize); - - if (this.validateMessage) { - this.validateMessage = ''; - } }, }, @@ -154,6 +151,12 @@ export default createComponent({ }); }, + resetValidate() { + if (this.validateMessage) { + this.validateMessage = ''; + } + }, + format(target = this.$refs.input) { if (!target) { return; diff --git a/src/mixins/field.js b/src/mixins/field.js index bf55f9682..ab1f1399a 100644 --- a/src/mixins/field.js +++ b/src/mixins/field.js @@ -5,6 +5,14 @@ export const FieldMixin = { }, }, + watch: { + value() { + if (this.vanField) { + this.vanField.resetValidate(); + } + }, + }, + created() { if (this.vanField) { this.vanField.children = this; From cb832403727f9ddadf43562553d82b54069a669b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 15:54:03 +0800 Subject: [PATCH 028/155] feat(Form): add failed event params --- src/field/index.js | 30 ++++++++++++++++++++---------- src/form/index.js | 31 +++++++++++++++++++++++-------- vant.config.js | 8 ++++++++ 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/field/index.js b/src/field/index.js index 8621c7206..e6a5d1604 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -135,19 +135,29 @@ export default createComponent({ } }, - // @exposed-api validate() { - if (!this.rules) { - return true; - } - - return !this.rules.some(rule => { - if (rule.required && !this.formValue) { - this.validateMessage = rule.message; - return true; + return new Promise(resolve => { + if (!this.rules) { + resolve(); } - return false; + const messages = []; + + this.rules.forEach(rule => { + if (rule.required && !this.formValue) { + messages.push(rule.message); + } + }); + + if (messages.length) { + this.validateMessage = messages[0]; + resolve({ + name: this.name, + messages, + }); + } else { + resolve(); + } }); }, diff --git a/src/form/index.js b/src/form/index.js index 8eb02fce3..1f062bebe 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -19,10 +19,20 @@ export default createComponent({ methods: { // @exposed-api validate() { - return this.fields.map(item => item.validate()).every(item => item); + return new Promise((resolve, reject) => { + Promise.all(this.fields.map(item => item.validate())).then(errors => { + errors = errors.filter(item => item); + + if (errors.length) { + reject(errors); + } else { + resolve(); + } + }); + }); }, - getFormData() { + getValues() { return this.fields.reduce((form, field) => { form[field.name] = field.formValue; return form; @@ -32,13 +42,18 @@ export default createComponent({ onSubmit(event) { event.preventDefault(); - const valid = this.validate(); + const values = this.getValues(); - if (valid) { - this.$emit('submit', this.getFormData()); - } else { - this.$emit('failed'); - } + this.validate() + .then(() => { + this.$emit('submit', values); + }) + .catch(errors => { + this.$emit('failed', { + values, + errors, + }); + }); }, }, diff --git a/vant.config.js b/vant.config.js index 2d32daf19..b20f0c729 100644 --- a/vant.config.js +++ b/vant.config.js @@ -126,6 +126,10 @@ module.exports = { path: 'field', title: 'Field 输入框', }, + { + path: 'form', + title: 'Form 表单', + }, { path: 'number-keyboard', title: 'NumberKeyboard 数字键盘', @@ -461,6 +465,10 @@ module.exports = { path: 'field', title: 'Field', }, + { + path: 'form', + title: 'Form', + }, { path: 'number-keyboard', title: 'NumberKeyboard', From 0e23124c3adab501782252a934d847bcfb224181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 15:54:29 +0800 Subject: [PATCH 029/155] docs(Field): add basic usage document --- src/form/README.md | 42 ++++++++++++++++++++++++ src/form/README.zh-CN.md | 42 ++++++++++++++++++++++++ src/form/demo/BasicUsage.vue | 61 +++++++++++++++++++++++++++++++++++ src/form/demo/FieldType.vue | 41 ++++++++++++++++++++++++ src/form/demo/index.vue | 62 +++++------------------------------- 5 files changed, 194 insertions(+), 54 deletions(-) create mode 100644 src/form/demo/BasicUsage.vue create mode 100644 src/form/demo/FieldType.vue diff --git a/src/form/README.md b/src/form/README.md index e0452706e..9c22c7501 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -13,6 +13,48 @@ Vue.use(Form); ### Basic Usage +```html + + + +
+ Submit +
+ +``` + +```js +export default { + data() { + return { + username: '', + password: '', + }; + }, + methods: { + onSubmit(values) { + console.log('submit', values); + }, + onFailed(errorInfo) { + console.log('failed', errorInfo); + }, + }, +} +``` + ## API ### Props diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index f2458d0d2..3e6a35d76 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -13,6 +13,48 @@ Vue.use(Form); ### 基础用法 +```html + + + +
+ 提交 +
+ +``` + +```js +export default { + data() { + return { + username: '', + password: '', + }; + }, + methods: { + onSubmit(values) { + console.log('submit', values); + }, + onFailed(errorInfo) { + console.log('failed', errorInfo); + }, + }, +} +``` + ## API ### Props diff --git a/src/form/demo/BasicUsage.vue b/src/form/demo/BasicUsage.vue new file mode 100644 index 000000000..837030881 --- /dev/null +++ b/src/form/demo/BasicUsage.vue @@ -0,0 +1,61 @@ + + + diff --git a/src/form/demo/FieldType.vue b/src/form/demo/FieldType.vue new file mode 100644 index 000000000..2a2079cf3 --- /dev/null +++ b/src/form/demo/FieldType.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/form/demo/index.vue b/src/form/demo/index.vue index b6de21ed3..c2aaaf767 100644 --- a/src/form/demo/index.vue +++ b/src/form/demo/index.vue @@ -1,64 +1,18 @@ - - From 1db95361824da4b532d47753e9a404da4a2b236c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 10 Feb 2020 16:30:17 +0800 Subject: [PATCH 030/155] feat(Form): support using switch --- src/form/demo/FieldType.vue | 22 ++++-- src/form/demo/Validate.vue | 0 src/form/test/__snapshots__/demo.spec.js.snap | 32 ++++++-- src/switch/index.js | 73 +++++++++++++++++ src/switch/index.tsx | 78 ------------------- src/switch/test/index.spec.js | 30 +++---- 6 files changed, 125 insertions(+), 110 deletions(-) create mode 100644 src/form/demo/Validate.vue create mode 100644 src/switch/index.js delete mode 100644 src/switch/index.tsx diff --git a/src/form/demo/FieldType.vue b/src/form/demo/FieldType.vue index 2a2079cf3..0b3d89d92 100644 --- a/src/form/demo/FieldType.vue +++ b/src/form/demo/FieldType.vue @@ -1,13 +1,14 @@