diff --git a/CHANGELOG.md b/CHANGELOG.md
index df832505..32e11e1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 ## 版本更新日志
+## v0.1.7
+
+- 修复 date-picker 最值bug
+- 修复 picker modal click bug
+- 新增 picker close-on-click-modal 属性
 
 ## v0.1.6
 
diff --git a/example/components/pickerPage.vue b/example/components/pickerPage.vue
index b32835e1..4bf05a38 100644
--- a/example/components/pickerPage.vue
+++ b/example/components/pickerPage.vue
@@ -8,6 +8,7 @@
           <za-panel-body>
             <za-cell title="单列">
               <za-picker
+                :close-on-click-modal='false'
                 :visible.sync='visible'
                 v-model='v1'
                 :dataSource='data1'
diff --git a/package.json b/package.json
index cc6196e0..b21baaec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zarm-vue",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "zarm in vue",
   "author": "chrisHchen <chenchris1986@163.com>",
   "tags": [
diff --git a/src/picker/src/picker.vue b/src/picker/src/picker.vue
index 49821f1d..e568ff9a 100644
--- a/src/picker/src/picker.vue
+++ b/src/picker/src/picker.vue
@@ -12,7 +12,11 @@
         [`${prefixCls}-container`]: true,
         [customCls]: !!customCls,
       }' @click.stop='() => {}'>
-      <za-popup class='za-popup-inner' :visible='currentVisible' @close='onPopupClose'>
+      <za-popup
+        class='za-popup-inner'
+        :visible='currentVisible'
+        @close='onPopupClose'
+        :closeOnClickModal='closeOnClickModal'>
         <div :class='`${prefixCls}-wrapper`'>
           <div :class='`${prefixCls}-header`'>
             <div :class='`${prefixCls}-cancel`' @click='handleCancel'>{{cancelText}}</div>
@@ -107,6 +111,10 @@ export default {
       type: String,
       default: 'value',
     },
+    closeOnClickModal: {
+      type: Boolean,
+      default: true,
+    },
     // custom value generator: receive value
     displayGenerator: Function,
     customCls: String,
@@ -207,8 +215,10 @@ export default {
     },
     onPopupClose(reason) {
       if (reason === 'clickaway') {
-        this.currentVisible = !this.currentVisible;
-        this.$emit('update:visible', this.currentVisible);
+        this.toggle();
+        this.currentValue = this.oldValue;
+        // this.currentVisible = !this.currentVisible;
+        // this.$emit('update:visible', this.currentVisible);
       }
     },
     handleCancel(event) {