diff --git a/src/js/calendar.js b/src/js/calendar.js
index 56be554..7b88c43 100644
--- a/src/js/calendar.js
+++ b/src/js/calendar.js
@@ -108,9 +108,6 @@
               var valueDate = new Date(p.value[i]);
               p.wrapper.find('.picker-calendar-day[data-date="' + valueDate.getFullYear() + '-' + valueDate.getMonth() + '-' + valueDate.getDate() + '"]').addClass('picker-calendar-day-selected');
           }
-          if (p.params.onChange) {
-              p.params.onChange(p, p.value, p.value.map(formatDate));
-          }
           if (p.input && p.input.length > 0) {
               if (p.params.formatValue) inputValue = p.params.formatValue(p, p.value);
               else {
@@ -123,6 +120,9 @@
               $(p.input).val(inputValue);
               $(p.input).trigger('change');
           }
+          if (p.params.onChange) {
+              p.params.onChange(p, p.value, p.value.map(formatDate));
+          }
       };
 
       // Columns Handlers
@@ -678,7 +678,7 @@
       }
       
       //iphone 上无法正确触发 click，会导致点击外面无法关闭
-      if (!p.inline) $(document).on('click touchend', closeOnHTMLClick);
+      if (!p.inline && p.params.closeByOutsideClick) $(document).on('click touchend', closeOnHTMLClick);
 
       // Open
       function onPickerClose() {
@@ -827,6 +827,7 @@
     touchMove: true,
     animate: true,
     closeOnSelect: true,
+    closeByOutsideClick: true,
     monthPicker: true,
     monthPickerTemplate: 
         '<div class="picker-calendar-month-picker">' +