drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed #153

Browse source 
fixed #153
This commit is contained in:
梁灏 2016-12-29 12:11:22 +08:00
parent b27687d35f
commit 4db5926d6b
5 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/date-picker/picker.vue
View file

@ -449,9 +449,9 @@
TYPE_VALUE_RESOLVER_MAP['default']
).parser;
if (type === 'time' && !(val instanceof Date)) {
if (val && type === 'time' && !(val instanceof Date)) {
val = parser(val, this.format || DEFAULT_FORMATS[type]);
} else if (type === 'timerange' && Array.isArray(val) && val.length === 2 && !(val[0] instanceof Date) && !(val[1] instanceof Date)) {
} else if (val && type === 'timerange' && Array.isArray(val) && val.length === 2 && !(val[0] instanceof Date) && !(val[1] instanceof Date)) {
val = val.join(RANGE_SEPARATOR);
val = parser(val, this.format || DEFAULT_FORMATS[type]);
}