github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Slider: fix incorrect initial value when min>0 and showInput is true

pull/3391/head
Leopoldthecoder 2017-03-05 20:22:27 +08:00 committed by 杨奕
parent 32f848fdc5
commit 2a632f04e5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/slider/src/main.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="el-slider"> <div class="el-slider">
<el-input-number <el-input-number
v-model="inputValue" v-model="firstValue"
v-if="showInput && !range" v-if="showInput && !range"
class="el-slider__input" class="el-slider__input"
ref="input" ref="input"
@ -100,16 +100,11 @@
secondValue: null, secondValue: null,
oldValue: null, oldValue: null,
precision: 0, precision: 0,
inputValue: null,
dragging: false dragging: false
}; };
}, },
watch: { watch: {
inputValue(val) {
this.firstValue = val;
},
value(val, oldVal) { value(val, oldVal) {
if (this.dragging || if (this.dragging ||
Array.isArray(val) && Array.isArray(val) &&
@ -130,7 +125,6 @@
if (this.range) { if (this.range) {
this.$emit('input', [this.minValue, this.maxValue]); this.$emit('input', [this.minValue, this.maxValue]);
} else { } else {
this.inputValue = val;
this.$emit('input', val); this.$emit('input', val);
} }
}, },
@ -281,7 +275,6 @@
return decimal ? decimal.length : 0; return decimal ? decimal.length : 0;
}); });
this.precision = Math.max.apply(null, precisions); this.precision = Math.max.apply(null, precisions);
this.inputValue = this.inputValue || this.firstValue;
} }
}; };
</script> </script>