fix(DatePicker): 优化日期选择器列生成逻辑，确保列精度正确过滤

Author: Passing-of-A-Dream

src/components/date-picker/date-picker-date-utils.ts

@@ -82,9 +82,13 @@ export function generateDatePickerColumns(
   if (rank >= precisionRankRecord.second) defaultColumns.push(SECOND_COLUMN)
 
   const finalColumns = columns?.length ? columns : defaultColumns
+  const renderedColumns = finalColumns.filter(columnType => {
+    const columnPrecision = columnToPrecisionMap[columnType]
+    return rank >= precisionRankRecord[columnPrecision]
+  })
   function getValue(type: DateColumnType): number | null {
-    const index = finalColumns.indexOf(type)
-    if (index !== undefined && index >= 0 && index < selected.length) {
+    const index = renderedColumns.indexOf(type)
+    if (index >= 0 && index < selected.length) {
       const val = parseInt(selected[index], 10)
       return isNaN(val) ? null : val
     }
@@ -136,14 +140,9 @@ export function generateDatePickerColumns(
     return column
   }
 
-  const validColumns = finalColumns.filter(columnType => {
-    const columnPrecision = columnToPrecisionMap[columnType]
-    return rank >= precisionRankRecord[columnPrecision]
-  })
-
-  validColumns.forEach(columnType => {
+  renderedColumns.forEach(columnType => {
     switch (columnType) {
-      case YEAR_COLUMN:
+      case YEAR_COLUMN: {
         const lower = minYear
         const upper = maxYear
         const years = generateColumn(lower, upper, 'year')
@@ -154,8 +153,8 @@ export function generateDatePickerColumns(
           }))
         )
         break
-
-      case MONTH_COLUMN:
+      }
+      case MONTH_COLUMN: {
         const lowerMonth = isInMinYear ? minMonth : 1
         const upperMonth = isInMaxYear ? maxMonth : 12
         const months = generateColumn(lowerMonth, upperMonth, 'month')
@@ -166,8 +165,8 @@ export function generateDatePickerColumns(
           }))
         )
         break
-
-      case DAY_COLUMN:
+      }
+      case DAY_COLUMN: {
         const lowerDay = isInMinMonth ? minDay : 1
         const upperDay = isInMaxMonth
           ? maxDay
@@ -180,8 +179,8 @@ export function generateDatePickerColumns(
           }))
         )
         break
-
-      case HOUR_COLUMN:
+      }
+      case HOUR_COLUMN: {
         const lowerHour = isInMinDay ? minHour : 0
         const upperHour = isInMaxDay ? maxHour : 23
         const hours = generateColumn(lowerHour, upperHour, 'hour')
@@ -192,8 +191,8 @@ export function generateDatePickerColumns(
           }))
         )
         break
-
-      case MINUTE_COLUMN:
+      }
+      case MINUTE_COLUMN: {
         const lowerMinute = isInMinHour ? minMinute : 0
         const upperMinute = isInMaxHour ? maxMinute : 59
         const minutes = generateColumn(lowerMinute, upperMinute, 'minute')
@@ -204,8 +203,8 @@ export function generateDatePickerColumns(
           }))
         )
         break
-
-      case SECOND_COLUMN:
+      }
+      case SECOND_COLUMN: {
         const lowerSecond = isInMinMinute ? minSecond : 0
         const upperSecond = isInMaxMinute ? maxSecond : 59
         const seconds = generateColumn(lowerSecond, upperSecond, 'second')
@@ -216,6 +215,7 @@ export function generateDatePickerColumns(
           }))
         )
         break
+      }
     }
   })
 

src/components/date-picker/date-picker-utils.ts

@@ -64,7 +64,18 @@ export const convertDateToStringArray = (
     [MINUTE_COLUMN]: standard[4],
     [SECOND_COLUMN]: standard[5],
   }
-  return columns.map(col => map[col])
+  const order: DateColumnType[] = [
+    YEAR_COLUMN,
+    MONTH_COLUMN,
+    DAY_COLUMN,
+    HOUR_COLUMN,
+    MINUTE_COLUMN,
+    SECOND_COLUMN,
+  ]
+  const max = precisionLengthRecord[datePrecision]
+  return columns
+    .filter(col => order.indexOf(col) > -1 && order.indexOf(col) < max)
+    .map(col => map[col])
 }
 
 export const convertStringArrayToDate = <