mirror of https://github.com/ElemeFE/element
Input: fix wrong style of Input suffix (#12108)
* Input: fix wrong style of Input * update input.vue * add test casepull/12134/head
parent
69dd5399aa
commit
1cc45b83d8
|
@ -291,8 +291,16 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
calcIconOffset(place) {
|
calcIconOffset(place) {
|
||||||
const el = this.$el.querySelector(`.el-input__${place}`);
|
let elList = [].slice.call(this.$el.querySelectorAll(`.el-input__${place}`) || []);
|
||||||
if (!el || el.parentNode !== this.$el) return;
|
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 = {
|
const pendantMap = {
|
||||||
suffix: 'append',
|
suffix: 'append',
|
||||||
prefix: 'prepend'
|
prefix: 'prepend'
|
||||||
|
|
|
@ -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', () => {
|
describe('Input Events', () => {
|
||||||
it('event:focus & blur', done => {
|
it('event:focus & blur', done => {
|
||||||
vm = createVue({
|
vm = createVue({
|
||||||
|
|
Loading…
Reference in New Issue