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

ColorPicker: add immediate watcher for currentColor (#13278)

pull/13299/head
SkyAo 2018-11-05 15:51:12 +08:00 committed by hetech
parent bdc9363635
commit f8a27565b0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/color-picker/src/components/picker-dropdown.vue
View File

@ -109,9 +109,12 @@
} }
}, },
currentColor(val) { currentColor: {
immediate: true,
handler(val) {
this.customInput = val; this.customInput = val;
} }
} }
}
}; };
</script> </script>

1
packages/color-picker/src/main.vue
View File

@ -165,6 +165,7 @@
enableAlpha: this.showAlpha, enableAlpha: this.showAlpha,
format: this.colorFormat format: this.colorFormat
}); });
return { return {
color, color,
showPicker: false, showPicker: false,