ColorPicker: hide the dropdown when clicking on another colorpicker. (#2929)

pull/2246/merge
cinwell.li 2017-02-21 15:32:54 +08:00 committed by baiyaaaaa
parent 35d594d4fa
commit e9c032c83a
4 changed files with 4 additions and 13 deletions

View File

@ -30,9 +30,7 @@
color: { color: {
required: true required: true
}, },
vertical: { vertical: Boolean
type: Boolean
}
}, },
watch: { watch: {

View File

@ -25,9 +25,7 @@
required: true required: true
}, },
vertical: { vertical: Boolean
type: Boolean
}
}, },
data() { data() {

View File

@ -22,7 +22,6 @@
import HueSlider from './hue-slider'; import HueSlider from './hue-slider';
import AlphaSlider from './alpha-slider'; import AlphaSlider from './alpha-slider';
import Popper from 'element-ui/src/utils/vue-popper'; import Popper from 'element-ui/src/utils/vue-popper';
import Clickoutside from 'element-ui/src/utils/clickoutside';
import Locale from 'element-ui/src/mixins/locale'; import Locale from 'element-ui/src/mixins/locale';
export default { export default {
@ -36,15 +35,11 @@
AlphaSlider AlphaSlider
}, },
directives: { Clickoutside },
props: { props: {
color: { color: {
required: true required: true
}, },
showAlpha: { showAlpha: Boolean
type: Boolean
}
}, },
methods: { methods: {

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="el-color-picker" v-clickoutside="hide"> <div class="el-color-picker" v-clickoutside="hide">
<div class="el-color-picker__trigger" @click.stop="showPicker = !showPicker"> <div class="el-color-picker__trigger" @click="showPicker = !showPicker">
<span class="el-color-picker__color" :class="{ 'is-alpha': showAlpha }"> <span class="el-color-picker__color" :class="{ 'is-alpha': showAlpha }">
<span class="el-color-picker__color-inner" <span class="el-color-picker__color-inner"
:style="{ :style="{