diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue
index e1c5bd2..c8f24d9 100644
--- a/src/components/date-picker/panel/date.vue
+++ b/src/components/date-picker/panel/date.vue
@@ -103,7 +103,6 @@
         },
         watch: {
             value (newVal) {
-                console.log(12331)
                 if (!newVal) return;
                 newVal = new Date(newVal);
                 if (!isNaN(newVal)) {
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index dc3dfb9..6da5b12 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -181,7 +181,6 @@
             return {
                 prefixCls: prefixCls,
                 showClose: false,
-                visualValue: '',
                 visible: false,
                 picker: null,
                 internalValue: ''
@@ -226,7 +225,6 @@
                             TYPE_VALUE_RESOLVER_MAP['default']
                         ).parser;
                         const parsedValue = parser(value, this.format || DEFAULT_FORMATS[type]);
-
                         if (parsedValue) {
                             if (this.picker) this.picker.value = parsedValue;
                         }
@@ -241,13 +239,36 @@
                 this.visible = false;
             },
             handleFocus () {
+                if (this.readonly) return;
                 this.visible = true;
             },
             handleBlur () {
 
             },
-            handleInputChange (val) {
-                this.visualValue = val;
+            handleInputChange (event) {
+                const oldValue = this.visualValue;
+                const value = event.target.value;
+
+                let correctValue = '';
+                const format = this.format || DEFAULT_FORMATS[this.type];
+                const parsedDate = parseDate(value, format);
+
+                if (parsedDate instanceof Date) {
+                    const options = this.options;
+                    if (options.disabledDate && typeof options.disabledDate === 'function' && options.disabledDate(new Date(parsedDate))) {
+                        correctValue = oldValue;
+                    } else {
+                        correctValue = formatDate(parsedDate, format);
+                    }
+                } else {
+                    correctValue = oldValue;
+                }
+
+                const correctDate = parseDate(correctValue, format);
+
+                this.visualValue = correctValue;
+                event.target.value = correctValue;
+                this.internalValue = correctDate;
             },
             handleInputMouseenter () {
                 if (this.readonly || this.disabled) return;
@@ -277,9 +298,10 @@
                     }
 
                     this.picker.$on('on-pick', (date, visible = false) => {
-                        this.$emit('on-change', date);
+                        this.$emit('on-change', formatDate(date, this.format || DEFAULT_FORMATS[this.type]));
                         this.value = date;
                         this.visible = visible;
+                        this.picker.value = date;
                         this.picker.resetView && this.picker.resetView();
                     });
 
diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index f4194ab..9b989e8 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -141,8 +141,8 @@
             handleBlur () {
                 this.$emit('on-blur');
             },
-            handleChange () {
-                this.$emit('on-change', this.value);
+            handleChange (event) {
+                this.$emit('on-change', event);
             },
             resizeTextarea () {
                 const autosize = this.autosize;
diff --git a/test/routers/date.vue b/test/routers/date.vue
index 73618ab..eaf2ebd 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -3,7 +3,14 @@
         <br>
         <row>
             <i-col span="4">
-                <date-picker style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options" @on-change="change" @on-open-change="change2" :format="format"></date-picker>
+                <date-picker
+                        style="width:200px"
+                        placeholder="请选择日期"
+                        :value.sync="value"
+                        :options="options"
+                        @on-change="change"
+                        :format="format"
+                        @on-open-change="change2"></date-picker>
             </i-col>
             <i-col span="4">
                 <date-picker type="year" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>
--
libgit2 0.21.4