From 2baba209b73ee5e30103a4a0fbb7d470398e571e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 23 Aug 2017 16:06:30 +0800
Subject: [PATCH] update ColorPicker

---
 examples/routers/form.vue                    | 6 +++---
 src/components/color-picker/color-picker.vue | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index f19959a9..7715e03d 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -5,7 +5,8 @@
             <AutoComplete v-model="formValidate.name" :data="['Li','Liang','Zhang']" placeholder="请输入姓名"></AutoComplete>
         </Form-item>
         <Form-item label="邮箱" prop="mail">
-            <Input v-model="formValidate.mail" placeholder="请输入邮箱"></Input>
+            <!--<Input v-model="formValidate.mail" placeholder="请输入邮箱"></Input>-->
+            <ColorPicker v-model="formValidate.mail"></ColorPicker>
         </Form-item>
         <Form-item label="城市" prop="city">
             <Select v-model="formValidate.city" placeholder="请选择所在地">
@@ -72,8 +73,7 @@
                         { required: true, message: '姓名不能为空', trigger: 'change' }
                     ],
                     mail: [
-                        { required: true, message: '邮箱不能为空', trigger: 'blur' },
-                        { type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
+                        { required: true, message: '邮箱不能为空', trigger: 'change' }
                     ],
                     city: [
                         { required: true, message: '请选择城市', trigger: 'change' }
diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 47f69f60..26ab49e5 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -66,6 +66,7 @@
     import Alpha from './alpha.vue';
 
     import { oneOf } from '../../utils/assist';
+    import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-color-picker';
     const inputPrefixCls = 'ivu-input';
@@ -121,6 +122,7 @@
 
     export default {
         name: 'ColorPicker',
+        mixins: [ Emitter ],
         components: { Drop, Confirm, RecommendColors, Saturation, Hue, Alpha },
         directives: { clickoutside, TransferDom },
         props: {
@@ -344,11 +346,13 @@
                 const color = this.formatColor;
                 this.$emit('input', color);
                 this.$emit('on-change', color);
+                this.dispatch('FormItem', 'on-form-change', color);
                 this.handleClose();
             },
             handleClear () {
                 this.$emit('input', '');
                 this.$emit('on-change', '');
+                this.dispatch('FormItem', 'on-form-change', '');
                 this.handleClose();
             },
             handleSelectColor (color) {