Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-05 06:33:49 +08:00
4 changed files with 11 additions and 8 deletions
+1
View File
@@ -256,6 +256,7 @@ export default createComponent({
resolve();
}
this.resetValidation();
this.runRules(rules).then(() => {
if (this.validateFailed) {
resolve({
+3 -1
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;
});
},
+1 -1
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();
});