From 8a69ed9f1ffca797d13004500daa4adfb2af7ba8 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Thu, 1 Sep 2016 11:45:44 +0800
Subject: [PATCH] TimePicker: fix picker-options

---
 packages/date-picker/src/picker.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue
index 83c0fc974..27085e9f0 100644
--- a/packages/date-picker/src/picker.vue
+++ b/packages/date-picker/src/picker.vue
@@ -417,7 +417,6 @@ export default {
 
           ranges = Array.isArray(ranges) ? ranges : [ranges];
           this.picker.selectableRange = ranges.map(range => parser(range, format));
-          delete this.pickerOptions.selectableRange;
         }
 
         if (this.type === 'time-select' && options) {
@@ -427,7 +426,9 @@ export default {
         }
 
         for (const option in options) {
-          if (options.hasOwnProperty(option)) {
+          if (options.hasOwnProperty(option) &&
+              // 忽略 time-picker 的该配置项
+              option !== 'selectableRange') {
             this.picker[option] = options[option];
           }
         }