test/element
1
0
Fork 0
mirror of https://gitee.com/ElemeFE/element.git synced 2024-12-01 03:38:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Select: fix clear value & remote label

Browse Source
This commit is contained in:
Leopoldthecoder 2016-11-04 16:42:39 +08:00
parent f67104f28e
commit 845d716e3f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/select/src/select.vue
View File

@ -243,6 +243,10 @@
this.inputLength = 20;
}
} else {
if (this.selectedInit) {
this.selectedInit = false;
return;
}
this.valueChangeBySelected = true;
this.$emit('input', val.value);
this.$emit('change', val.value);
@ -258,11 +262,9 @@
}
if (this.remote && typeof this.remoteMethod === 'function') {
this.hoverIndex = -1;
if (!this.multiple) {
this.selected = {};
}
this.remoteMethod(val);
this.voidRemoteQuery = val === '';
this.broadcast('option', 'resetIndex');
} else if (typeof this.filterMethod === 'function') {
this.filterMethod(val);
} else {
@ -358,6 +360,7 @@
this.resetHoverIndex();
}
} else {
this.selectedInit = !!init;
this.selected = option;
this.selectedLabel = option.currentLabel;
this.hoverIndex = option.index;
@ -424,9 +427,6 @@
}
if (!this.disabled) {
this.visible = !this.visible;
if (this.remote && this.visible) {
this.selectedLabel = '';
}
}
},

8
test/unit/specs/pagination.spec.js
View File

@ -178,10 +178,12 @@ describe('Pagination', () => {
});
expect(vm.trigger).to.false;
vm.$el.querySelectorAll('li.el-select-dropdown__item')[1].click();
setTimeout(_ => {
expect(vm.trigger).to.true;
done();
vm.$el.querySelectorAll('li.el-select-dropdown__item')[1].click();
setTimeout(_ => {
expect(vm.trigger).to.true;
done();
}, 50);
}, 50);
});