Merge branch 'zpb-fix-cpicker' into v1-develop

ShuyunFF2E · Oct 24, 2023 · 232a06d · 232a06d
2 parents f65207f + 80a3018
commit 232a06d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/src/components/c-picker/pickers/date-range.js b/src/components/c-picker/pickers/date-range.js
@@ -77,6 +77,7 @@ const DateRangePicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const target = d.clone();
       const min = minDate && (minDate instanceof Date
         ? moment(moment(minDate).format(format), format)
@@ -100,9 +101,9 @@ const DateRangePicker = ({
     (m) => {
       if (_disabledDate) {
         if (_this.formatType === OBJ) {
-          return _disabledDate(m && m.clone().toDate(), m.clone());
+          return _disabledDate(m && m.clone().toDate(), m && m.clone());
         }
-        return _disabledDate(m && m.format(format), m.clone());
+        return _disabledDate(m && m.format(format), m && m.clone());
       }
       return m && getDisabledDate(m);
     },

diff --git a/src/components/c-picker/pickers/date.js b/src/components/c-picker/pickers/date.js
@@ -136,6 +136,7 @@ const DatePicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const current = d.clone();
       const min = minDate
         && (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -155,9 +156,9 @@ const DatePicker = ({
     (m) => {
       if (_disabledDate) {
         if (_this.formatType === OBJ) {
-          return _disabledDate(m && m.clone().toDate(), m.clone());
+          return _disabledDate(m && m.clone().toDate(), m && m.clone());
         }
-        return _disabledDate(m && m.format(format), m.clone());
+        return _disabledDate(m && m.format(format), m && m.clone());
       }
       return getDisabledDate(m);
     },

diff --git a/src/components/c-picker/pickers/month.js b/src/components/c-picker/pickers/month.js
@@ -97,6 +97,7 @@ const MonthPicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const current = d.clone();
       const min = minDate
         && (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -117,7 +118,7 @@ const MonthPicker = ({
   const handleGetDisabledDate = useCallback(
     (m) => {
       if (_disabledDate) {
-        return _disabledDate(m && m.clone().format(format), m.clone());
+        return _disabledDate(m && m.clone().format(format), m && m.clone());
       }
       return getDisabledDate(m);
     },

diff --git a/src/components/c-picker/pickers/quarter.js b/src/components/c-picker/pickers/quarter.js
@@ -93,6 +93,7 @@ const QuarterPicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const current = d.clone();
       const min = minDate
         && (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
@@ -111,7 +112,7 @@ const QuarterPicker = ({
   const handleGetDisabledDate = useCallback(
     (m) => {
       if (_disabledDate) {
-        return _disabledDate(m && m.clone().format(format), m.clone());
+        return _disabledDate(m && m.clone().format(format), m && m.clone());
       }
       return getDisabledDate(m);
     },

diff --git a/src/components/c-picker/pickers/week.js b/src/components/c-picker/pickers/week.js
@@ -93,6 +93,7 @@ const WeekPicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const current = d.clone();
       const min = minDate && (minDate instanceof Date ? moment(minDate) : moment(minDate, format));
       const max = maxDate && (maxDate instanceof Date ? moment(maxDate) : moment(maxDate, format));
@@ -109,7 +110,7 @@ const WeekPicker = ({
   const handleGetDisabledDate = useCallback(
     (m) => {
       if (_disabledDate) {
-        return _disabledDate(m && m.clone().format(format), m.clone());
+        return _disabledDate(m && m.clone().format(format), m && m.clone());
       }
       return getDisabledDate(m);
     },

diff --git a/src/components/c-picker/pickers/year.js b/src/components/c-picker/pickers/year.js
@@ -91,6 +91,7 @@ const YearPicker = ({
 
   const getDisabledDate = useCallback(
     (d) => {
+      if (!d) return false;
       const current = d.clone();
       return (minYear && current.year() < minYear) || (maxYear && current.year() > maxYear);
     },
@@ -100,7 +101,7 @@ const YearPicker = ({
   const handleGetDisabledDate = useCallback(
     (m) => {
       if (_disabledDate) {
-        return _disabledDate(m && m.clone().year(), m.clone());
+        return _disabledDate(m && m.clone().year(), m && m.clone());
       }
       return getDisabledDate(m);
     },