Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/input/src/input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,16 @@
}
},
calcIconOffset(place) {
const el = this.$el.querySelector(`.el-input__${place}`);
if (!el || el.parentNode !== this.$el) return;
let elList = [].slice.call(this.$el.querySelectorAll(`.el-input__${place}`) || []);
if (!elList.length) return;
let el = null;
for (let i = 0; i < elList.length; i++) {
if (elList[i].parentNode === this.$el) {
el = elList[i];
break;
}
}
if (!el) return;
const pendantMap = {
suffix: 'append',
prefix: 'prepend'
Expand Down
27 changes: 27 additions & 0 deletions test/unit/specs/input.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,33 @@ describe('Input', () => {
});
});

it('Input contains Select and append slot', (done) => {
vm = createVue({
template: `
<el-input v-model="value" clearable class="input-with-select" ref="input">
<el-select v-model="select" slot="prepend" placeholder="请选择">
<el-option label="餐厅名" value="1"></el-option>
<el-option label="订单号" value="2"></el-option>
<el-option label="用户电话" value="3"></el-option>
</el-select>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
`,
data() {
return {
value: '1234'
};
}
}, true);
vm.$refs.input.hovering = true;
setTimeout(() => {
const suffixEl = document.querySelector('.input-with-select > .el-input__suffix');
expect(suffixEl).to.not.be.null;
expect(suffixEl.style.transform).to.not.be.empty;
done();
}, 20);
});

describe('Input Events', () => {
it('event:focus & blur', done => {
vm = createVue({
Expand Down