From 8761038f8138b228ff1256ce6e12d9ede8c9c903 Mon Sep 17 00:00:00 2001 From: chonggit <156310943@qq.com> Date: Thu, 7 Dec 2017 23:27:29 +0800 Subject: [PATCH] fix(datepicker): if value is null dont reset date to 1970 (#3207) fix if state.value == null _newState.value will set to '1970-01-01 08:00:00' --- src/timepicker/reducer/timepicker.reducer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/timepicker/reducer/timepicker.reducer.ts b/src/timepicker/reducer/timepicker.reducer.ts index e9ec0d3f3f..413f5cd667 100644 --- a/src/timepicker/reducer/timepicker.reducer.ts +++ b/src/timepicker/reducer/timepicker.reducer.ts @@ -100,7 +100,9 @@ export function timepickerReducer(state = initialState, action: Action) { }; if (state.config.showMeridian !== _newState.config.showMeridian) { - _newState.value = new Date(state.value); + if(state.value){ + _newState.value = new Date(state.value); + } } return Object.assign({}, state, _newState);