浏览代码

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

cinwell.li 8 年之前
父节点
当前提交
e9c032c83a

+ 1 - 3
packages/color-picker/src/components/alpha-slider.vue

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

+ 1 - 3
packages/color-picker/src/components/hue-slider.vue

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

+ 1 - 6
packages/color-picker/src/components/picker-dropdown.vue

@@ -22,7 +22,6 @@
   import HueSlider from './hue-slider';
   import AlphaSlider from './alpha-slider';
   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';
 
   export default {
@@ -36,15 +35,11 @@
       AlphaSlider
     },
 
-    directives: { Clickoutside },
-
     props: {
       color: {
         required: true
       },
-      showAlpha: {
-        type: Boolean
-      }
+      showAlpha: Boolean
     },
 
     methods: {

+ 1 - 1
packages/color-picker/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <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-inner"
           :style="{