Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

input number fix change event & improve #1999

Merged
merged 1 commit into from
Dec 27, 2016
Merged

input number fix change event & improve #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
123 changes: 46 additions & 77 deletions packages/input-number/src/input-number.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,35 @@
{ 'is-without-controls': !controls}
]"
>
<el-input
:value="currentValue"
@keydown.up.native="increase"
@keydown.down.native="decrease"
@blur="handleBlur"
@input="handleInput"
:disabled="disabled"
:size="size"
:class="{
'is-active': inputActive
}">
<template slot="prepend" v-if="$slots.prepend">
<slot name="prepend"></slot>
</template>
<template slot="append" v-if="$slots.append">
<slot name="append"></slot>
</template>
</el-input>
<span
v-if="controls"
class="el-input-number__decrease el-icon-minus"
:class="{'is-disabled': minDisabled}"
v-repeat-click="decrease"
@mouseenter="activeInput(minDisabled)"
@mouseleave="inactiveInput(minDisabled)"
>
</span>
<span
v-if="controls"
class="el-input-number__increase el-icon-plus"
:class="{'is-disabled': maxDisabled}"
v-repeat-click="increase"
@mouseenter="activeInput(maxDisabled)"
@mouseleave="inactiveInput(maxDisabled)"
>
</span>
<el-input
v-model.number="currentValue"
@keydown.up.native="increase"
@keydown.down.native="decrease"
@blur="handleBlur"
:disabled="disabled"
:size="size"
>
<template slot="prepend" v-if="$slots.prepend">
<slot name="prepend"></slot>
</template>
<template slot="append" v-if="$slots.append">
<slot name="append"></slot>
</template>
</el-input>
</div>
</template>
<script>
Expand All @@ -50,29 +43,6 @@

export default {
name: 'ElInputNumber',
props: {
step: {
type: Number,
default: 1
},
max: {
type: Number,
default: Infinity
},
min: {
type: Number,
default: 0
},
value: {
default: 0
},
disabled: Boolean,
size: String,
controls: {
type: Boolean,
default: true
}
},
directives: {
repeatClick: {
bind(el, binding, vnode) {
Expand Down Expand Up @@ -104,6 +74,29 @@
components: {
ElInput
},
props: {
step: {
type: Number,
default: 1
},
max: {
type: Number,
default: Infinity
},
min: {
type: Number,
default: 0
},
value: {
default: 0
},
disabled: Boolean,
size: String,
controls: {
type: Boolean,
default: true
}
},
data() {
// correct the init value
let value = this.value;
Expand All @@ -116,8 +109,7 @@
value = this.max;
}
return {
currentValue: value,
inputActive: false
currentValue: value
};
},
watch: {
Expand All @@ -126,10 +118,9 @@
},

currentValue(newVal, oldVal) {
let value = Number(newVal);
if (value <= this.max && value >= this.min) {
this.$emit('change', value, oldVal);
this.$emit('input', value);
if (newVal <= this.max && newVal >= this.min) {
this.$emit('change', newVal, oldVal);
this.$emit('input', newVal);
}
}
},
Expand Down Expand Up @@ -188,41 +179,19 @@
return (arg1 + arg2) / m;
},
increase() {
if (this.maxDisabled) return;
const value = this.value || 0;
if (value + this.step > this.max || this.disabled) return;
this.currentValue = this.accAdd(this.step, value);
if (this.maxDisabled) {
this.inputActive = false;
}
},
decrease() {
if (this.minDisabled) return;
const value = this.value || 0;
if (value - this.step < this.min || this.disabled) return;
this.currentValue = this.accSub(value, this.step);
if (this.minDisabled) {
this.inputActive = false;
}
},
activeInput(disabled) {
if (!this.disabled && !disabled) {
this.inputActive = true;
}
},
inactiveInput(disabled) {
if (!this.disabled && !disabled) {
this.inputActive = false;
}
},
handleBlur(event) {
let value = Number(this.currentValue);
if (isNaN(value) || value > this.max || value < this.min) {
this.currentValue = this.value;
} else {
this.currentValue = value;
}
},
handleInput(value) {
this.currentValue = value;
handleBlur() {
this.currentValue = this.value;
}
}
};
Expand Down
5 changes: 5 additions & 0 deletions packages/theme-default/src/input-number.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@
color: #99A9BF;
cursor: pointer;
position: absolute;
z-index: 1;

&:hover {
color: var(--color-primary);

&:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) {
border-color: var(--input-focus-border);
}
}

@when disabled {
Expand Down
74 changes: 46 additions & 28 deletions test/unit/specs/input-number.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,14 @@ describe('InputNumber', () => {
let input = vm.$el.querySelector('input');
let btnDecrease = vm.$el.querySelector('.el-input-number__decrease');

triggerEvent(btnDecrease, 'mouseenter');
triggerEvent(btnDecrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
expect(vm.$el.querySelector('.el-input.is-active')).to.exist;
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(4);
expect(input.value).to.be.equal('4');

triggerEvent(btnDecrease, 'mouseleave');

vm.$nextTick(_ => {
expect(vm.$el.querySelector('.el-input.is-active')).to.not.exist;
done();
});
}, 300);
done();
});
});
it('increase', done => {
vm = createVue({
Expand All @@ -74,11 +66,11 @@ describe('InputNumber', () => {
triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(2.5);
expect(input.value).to.be.equal('2.5');
done();
}, 100);
});
});
it('disabled', done => {
vm = createVue({
Expand All @@ -100,19 +92,19 @@ describe('InputNumber', () => {
triggerEvent(btnDecrease, 'mousedown');
triggerEvent(document, 'mouseup');

triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(2);
expect(input.value).to.be.equal('2');

setTimeout(_ => {
triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

vm.$nextTick(_ => {
expect(vm.value).to.be.equal(2);
expect(input.value).to.be.equal('2');
done();
}, 100);
}, 100);
});
});
});
it('step', done => {
vm = createVue({
Expand All @@ -134,19 +126,19 @@ describe('InputNumber', () => {
triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(8.2);
expect(input.value).to.be.equal('8.2');

triggerEvent(btnDecrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(5);
expect(input.value).to.be.equal('5');
done();
}, 100);
}, 100);
});
});
});
it('min', done => {
vm = createVue({
Expand Down Expand Up @@ -181,11 +173,11 @@ describe('InputNumber', () => {
triggerEvent(btnDecrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(6);
expect(input.value).to.be.equal('6');
done();
}, 100);
});
});
it('max', done => {
vm = createVue({
Expand Down Expand Up @@ -220,11 +212,11 @@ describe('InputNumber', () => {
triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

setTimeout(_ => {
vm.$nextTick(_ => {
expect(vm.value).to.be.equal(8);
expect(input.value).to.be.equal('8');
done();
}, 100);
});
});
it('controls', () => {
vm = createVue({
Expand All @@ -242,4 +234,30 @@ describe('InputNumber', () => {
expect(vm.$el.querySelector('.el-input-number__decrease')).to.not.exist;
expect(vm.$el.querySelector('.el-input-number__increase')).to.not.exist;
});
it('event:change', done => {
vm = createVue({
template: `
<el-input-number v-model="value" ref="input">
</el-input-number>
`,
data() {
return {
value: 1.5
};
}
}, true);

let btnIncrease = vm.$el.querySelector('.el-input-number__increase');
const spy = sinon.spy();

vm.$refs.input.$on('change', spy);

triggerEvent(btnIncrease, 'mousedown');
triggerEvent(document, 'mouseup');

vm.$nextTick(_ => {
expect(spy.withArgs(2.5, 1.5).calledOnce).to.be.true;
done();
});
});
});