fix: 受控模式下返回的selectedOptions进行校验处理 (#2951)

* fix: 受控模式下返回的selectedOptions进行校验处理 * fix: added the datehour judgment
jdf2e · Jan 23, 2025 · 3300424 · 3300424
1 parent 399ceb2
commit 3300424
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/packages/datepicker/datepicker.taro.tsx b/src/packages/datepicker/datepicker.taro.tsx
@@ -270,6 +270,18 @@ export const DatePicker: FunctionComponent<
         Number(formatDate[2]),
         getMonthEndDay(Number(formatDate[0]), Number(formatDate[1]))
       )
+
+      if (
+        selectedOptions.length >= 2 &&
+        ['date', 'datehour', 'datetime', 'month-day'].includes(rangeType)
+      ) {
+        const dayOption = formatOption('day', day)
+        if (rangeType === 'month-day') {
+          selectedOptions[1] = dayOption
+        } else {
+          selectedOptions[2] = dayOption
+        }
+      }
       let date: Date | null = null
       if (
         rangeType === 'date' ||

diff --git a/src/packages/datepicker/datepicker.tsx b/src/packages/datepicker/datepicker.tsx
@@ -270,6 +270,18 @@ export const DatePicker: FunctionComponent<
         Number(formatDate[2]),
         getMonthEndDay(Number(formatDate[0]), Number(formatDate[1]))
       )
+
+      if (
+        selectedOptions.length >= 2 &&
+        ['date', 'datehour', 'datetime', 'month-day'].includes(rangeType)
+      ) {
+        const dayOption = formatOption('day', day)
+        if (rangeType === 'month-day') {
+          selectedOptions[1] = dayOption
+        } else {
+          selectedOptions[2] = dayOption
+        }
+      }
       let date: Date | null = null
       if (
         rangeType === 'date' ||