Merge branch 'dev' into next

This commit is contained in:
chenjiahan 2020-09-05 06:33:49 +08:00
commit 71bae3fcb4
4 changed files with 11 additions and 8 deletions

View File

@ -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"

View File

@ -256,6 +256,7 @@ export default createComponent({
resolve();
}
this.resetValidation();
this.runRules(rules).then(() => {
if (this.validateFailed) {
resolve({

View File

@ -126,10 +126,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;
});
},

View File

@ -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();
});