Merge pull request #6385 from demi798/2.0

优化slider #6007
This commit is contained in:
debugIsFalse 2019-12-11 13:51:22 +08:00 committed by GitHub
commit 47896b49b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View file

@ -87,7 +87,7 @@
default: false
},
placement: {
validator (value) {
validator (value) {
return oneOf(value, ['top', 'bottom', 'top-start', 'bottom-start', 'top-end', 'bottom-end']);
},
default: 'bottom'

View file

@ -58,9 +58,9 @@
},
methods: {
isIcon(node){
let nodeName = (node.nodeName || "").toLocaleUpperCase();
let isIvu = node.classList.contains("ivu-icon");
if(nodeName == "I" && isIvu){
let nodeName = (node.nodeName || '').toLocaleUpperCase();
let isIvu = node.classList.contains('ivu-icon');
if(nodeName == 'I' && isIvu){
return true;
}
return false;

View file

@ -397,10 +397,10 @@
this.currentValue = [...value];
if (!this.dragging) {
if (this.currentValue[index] !== this.oldValue[index]) {
this.emitChange();
this.oldValue[index] = this.currentValue[index];
}
// if (this.currentValue[index] !== this.oldValue[index]) {
this.emitChange();
// this.oldValue[index] = this.currentValue[index];
// }
}
},
handleDecimal(pos,step){