Commit 6d71acb0 authored by 杨奕's avatar 杨奕 Committed by GitHub

Merge pull request #131 from QingWei-Li/next

TimePicker: fix picker-options
parents 0367dc59 0ed08bd9
...@@ -417,7 +417,6 @@ export default { ...@@ -417,7 +417,6 @@ export default {
ranges = Array.isArray(ranges) ? ranges : [ranges]; ranges = Array.isArray(ranges) ? ranges : [ranges];
this.picker.selectableRange = ranges.map(range => parser(range, format)); this.picker.selectableRange = ranges.map(range => parser(range, format));
delete this.pickerOptions.selectableRange;
} }
if (this.type === 'time-select' && options) { if (this.type === 'time-select' && options) {
...@@ -427,7 +426,9 @@ export default { ...@@ -427,7 +426,9 @@ export default {
} }
for (const option in options) { for (const option in options) {
if (options.hasOwnProperty(option)) { if (options.hasOwnProperty(option) &&
// 忽略 time-picker 的该配置项
option !== 'selectableRange') {
this.picker[option] = options[option]; this.picker[option] = options[option];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment