Merge pull request #5109 from betavs/hotfix/color-picker-change
fix(color-picker): change event only shows old color valuepull/4628/merge
commit
47a5020c11
|
@ -96,8 +96,7 @@ export default {
|
|||
this.selfUpdate = true;
|
||||
this.updateColorHandle();
|
||||
this.updateInput();
|
||||
this.updateModel();
|
||||
this.$emit('change', { event: event, value: this.modelValue });
|
||||
this.updateModel(event);
|
||||
},
|
||||
pickHue(event) {
|
||||
let top = this.hueView.getBoundingClientRect().top + (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0);
|
||||
|
@ -111,28 +110,32 @@ export default {
|
|||
this.selfUpdate = true;
|
||||
this.updateColorSelector();
|
||||
this.updateHue();
|
||||
this.updateModel();
|
||||
this.updateModel(event);
|
||||
this.updateInput();
|
||||
this.$emit('change', { event: event, value: this.modelValue });
|
||||
},
|
||||
updateModel() {
|
||||
updateModel(event) {
|
||||
let value = this.modelValue;
|
||||
|
||||
switch (this.format) {
|
||||
case 'hex':
|
||||
this.$emit('update:modelValue', this.HSBtoHEX(this.hsbValue));
|
||||
value = this.HSBtoHEX(this.hsbValue);
|
||||
break;
|
||||
|
||||
case 'rgb':
|
||||
this.$emit('update:modelValue', this.HSBtoRGB(this.hsbValue));
|
||||
value = this.HSBtoRGB(this.hsbValue);
|
||||
break;
|
||||
|
||||
case 'hsb':
|
||||
this.$emit('update:modelValue', this.hsbValue);
|
||||
value = this.hsbValue;
|
||||
break;
|
||||
|
||||
default:
|
||||
//NoOp
|
||||
break;
|
||||
}
|
||||
|
||||
this.$emit('update:modelValue', value);
|
||||
this.$emit('change', { event, value });
|
||||
},
|
||||
updateColorSelector() {
|
||||
if (this.colorSelector) {
|
||||
|
|
Loading…
Reference in New Issue