From 3de631a5a91d31225860cd53f6d0b5ab81749237 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 5 Sep 2020 06:10:43 +0800 Subject: [PATCH 1/5] fix(Toast): failed to clear in some cases (#7100) --- src/toast/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/toast/index.js b/src/toast/index.js index f279bfb7c..3df45cdce 100644 --- a/src/toast/index.js +++ b/src/toast/index.js @@ -53,7 +53,9 @@ function createInstance() { return {}; } - queue = queue.filter((item) => isInDocument(item.$el)); + queue = queue.filter( + (item) => !item.$el.parentNode || isInDocument(item.$el) + ); if (!queue.length || multiple) { const toast = new (Vue.extend(VueToast))({ From 938e27425178d631d0a65c859fb124c4efc702d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Sep 2020 06:13:21 +0800 Subject: [PATCH 2/5] build(deps): bump yargs-parser in /packages/vant-markdown-loader (#7101) Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 15.0.0 to 15.0.1. - [Release notes](https://github.com/yargs/yargs-parser/releases) - [Changelog](https://github.com/yargs/yargs-parser/blob/master/docs/CHANGELOG-full.md) - [Commits](https://github.com/yargs/yargs-parser/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/vant-markdown-loader/yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vant-markdown-loader/yarn.lock b/packages/vant-markdown-loader/yarn.lock index 41dea0545..770fecda6 100644 --- a/packages/vant-markdown-loader/yarn.lock +++ b/packages/vant-markdown-loader/yarn.lock @@ -28,8 +28,8 @@ big.js@^5.2.2: camelcase@^5.0.0: version "5.3.1" - resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA= + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== cliui@^5.0.0: version "5.0.0" @@ -59,7 +59,7 @@ commander@~2.20.3: decamelize@^1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= emoji-regex@^7.0.1: @@ -317,9 +317,9 @@ y18n@^4.0.0: integrity sha1-le+U+F7MgdAHwmThkKEg8KPIVms= yargs-parser@^15.0.0: - version "15.0.0" - resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-15.0.0.tgz?cache=0&sync_timestamp=1572648717575&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08" - integrity sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg= + version "15.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" + integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" From 7c3549ad554f340f734acf1b009115e5620c077d Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 5 Sep 2020 06:18:09 +0800 Subject: [PATCH 3/5] fix(Form): scroll to first matched field (#7102) --- src/form/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/form/index.js b/src/form/index.js index d36b5bd8e..83658cb07 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -124,10 +124,12 @@ export default createComponent({ // @exposed-api scrollToField(name, options) { - this.fields.forEach((item) => { + this.fields.some((item) => { if (item.name === name) { item.$el.scrollIntoView(options); + return true; } + return false; }); }, @@ -167,6 +169,7 @@ export default createComponent({ }); if (this.scrollToError) { + console.log('scrollToField', errors[0].name); this.scrollToField(errors[0].name); } }); From d0e6bd3c1685c58399aa2a4e68fa6da9fcad45df Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 5 Sep 2020 06:29:27 +0800 Subject: [PATCH 4/5] chore(Field): remove log (#7104) --- src/form/index.js | 1 - src/notice-bar/test/index.spec.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/form/index.js b/src/form/index.js index 83658cb07..0a73f1858 100644 --- a/src/form/index.js +++ b/src/form/index.js @@ -169,7 +169,6 @@ export default createComponent({ }); if (this.scrollToError) { - console.log('scrollToField', errors[0].name); this.scrollToField(errors[0].name); } }); diff --git a/src/notice-bar/test/index.spec.js b/src/notice-bar/test/index.spec.js index c86bebf70..45df3c8dd 100644 --- a/src/notice-bar/test/index.spec.js +++ b/src/notice-bar/test/index.spec.js @@ -45,7 +45,7 @@ test('replay event', async () => { }); wrapper.find('.van-notice-bar__content').trigger('transitionend'); - await later(50); + await later(80); expect(wrapper.emitted('replay')).toBeTruthy(); }); From f6e3aaebecf36ca11225acccf8387df03f6050a9 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 5 Sep 2020 06:30:00 +0800 Subject: [PATCH 5/5] fix(Form): should reset validation before submit (#7103) --- src/field/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/field/index.js b/src/field/index.js index fa33b94c7..8e74a921c 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -255,6 +255,7 @@ export default createComponent({ resolve(); } + this.resetValidation(); this.runRules(rules).then(() => { if (this.validateFailed) { resolve({