Skip to content

Commit 80a3018

Browse files
author
张鹏博
committed
fix: 开始或结束时间为空时报错
1 parent f640ae1 commit 80a3018

6 files changed

Lines changed: 14 additions & 8 deletions

File tree

src/components/c-picker/pickers/date-range.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const DateRangePicker = ({
7777

7878
const getDisabledDate = useCallback(
7979
(d) => {
80+
if (!d) return false;
8081
const target = d.clone();
8182
const min = minDate && (minDate instanceof Date
8283
? moment(moment(minDate).format(format), format)
@@ -100,9 +101,9 @@ const DateRangePicker = ({
100101
(m) => {
101102
if (_disabledDate) {
102103
if (_this.formatType === OBJ) {
103-
return _disabledDate(m && m.clone().toDate(), m.clone());
104+
return _disabledDate(m && m.clone().toDate(), m && m.clone());
104105
}
105-
return _disabledDate(m && m.format(format), m.clone());
106+
return _disabledDate(m && m.format(format), m && m.clone());
106107
}
107108
return m && getDisabledDate(m);
108109
},

src/components/c-picker/pickers/date.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ const DatePicker = ({
136136

137137
const getDisabledDate = useCallback(
138138
(d) => {
139+
if (!d) return false;
139140
const current = d.clone();
140141
const min = minDate
141142
&& (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -155,9 +156,9 @@ const DatePicker = ({
155156
(m) => {
156157
if (_disabledDate) {
157158
if (_this.formatType === OBJ) {
158-
return _disabledDate(m && m.clone().toDate(), m.clone());
159+
return _disabledDate(m && m.clone().toDate(), m && m.clone());
159160
}
160-
return _disabledDate(m && m.format(format), m.clone());
161+
return _disabledDate(m && m.format(format), m && m.clone());
161162
}
162163
return getDisabledDate(m);
163164
},

src/components/c-picker/pickers/month.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ const MonthPicker = ({
9797

9898
const getDisabledDate = useCallback(
9999
(d) => {
100+
if (!d) return false;
100101
const current = d.clone();
101102
const min = minDate
102103
&& (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -117,7 +118,7 @@ const MonthPicker = ({
117118
const handleGetDisabledDate = useCallback(
118119
(m) => {
119120
if (_disabledDate) {
120-
return _disabledDate(m && m.clone().format(format), m.clone());
121+
return _disabledDate(m && m.clone().format(format), m && m.clone());
121122
}
122123
return getDisabledDate(m);
123124
},

src/components/c-picker/pickers/quarter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const QuarterPicker = ({
9393

9494
const getDisabledDate = useCallback(
9595
(d) => {
96+
if (!d) return false;
9697
const current = d.clone();
9798
const min = minDate
9899
&& (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -111,7 +112,7 @@ const QuarterPicker = ({
111112
const handleGetDisabledDate = useCallback(
112113
(m) => {
113114
if (_disabledDate) {
114-
return _disabledDate(m && m.clone().format(format), m.clone());
115+
return _disabledDate(m && m.clone().format(format), m && m.clone());
115116
}
116117
return getDisabledDate(m);
117118
},

src/components/c-picker/pickers/week.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const WeekPicker = ({
9393

9494
const getDisabledDate = useCallback(
9595
(d) => {
96+
if (!d) return false;
9697
const current = d.clone();
9798
const min = minDate && (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
9899
const max = maxDate && (maxDate instanceof Date ? moment(maxDate) : moment(maxDate, format));
@@ -109,7 +110,7 @@ const WeekPicker = ({
109110
const handleGetDisabledDate = useCallback(
110111
(m) => {
111112
if (_disabledDate) {
112-
return _disabledDate(m && m.clone().format(format), m.clone());
113+
return _disabledDate(m && m.clone().format(format), m && m.clone());
113114
}
114115
return getDisabledDate(m);
115116
},

src/components/c-picker/pickers/year.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ const YearPicker = ({
9191

9292
const getDisabledDate = useCallback(
9393
(d) => {
94+
if (!d) return false;
9495
const current = d.clone();
9596
return (minYear && current.year() < minYear) || (maxYear && current.year() > maxYear);
9697
},
@@ -100,7 +101,7 @@ const YearPicker = ({
100101
const handleGetDisabledDate = useCallback(
101102
(m) => {
102103
if (_disabledDate) {
103-
return _disabledDate(m && m.clone().year(), m.clone());
104+
return _disabledDate(m && m.clone().year(), m && m.clone());
104105
}
105106
return getDisabledDate(m);
106107
},

0 commit comments

Comments
 (0)