From 2fc5575c304a3646e4e83b04a407baefe8e1beec Mon Sep 17 00:00:00 2001 From: XuZhiqiang Date: Wed, 17 Jun 2026 21:28:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(web-antdv-next):=20=E4=BF=AE=E5=A4=8D=20Dat?= =?UTF-8?q?eRangePicker=20=E5=85=B1=E4=BA=AB=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E4=BA=8C=E5=85=83=E7=BB=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/utils/rangePickerProps.ts | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/web-antdv-next/src/utils/rangePickerProps.ts b/apps/web-antdv-next/src/utils/rangePickerProps.ts index 2ba4be294..df52a2dc1 100644 --- a/apps/web-antdv-next/src/utils/rangePickerProps.ts +++ b/apps/web-antdv-next/src/utils/rangePickerProps.ts @@ -1,7 +1,16 @@ +import type { Dayjs } from 'dayjs'; + import dayjs from 'dayjs'; import { $t } from '#/locales'; +type DateRangeTuple = [Dayjs, Dayjs]; +type StringRangeTuple = [string, string]; + +function dateRange(start: Dayjs, end: Dayjs): DateRangeTuple { + return [start, end]; +} + /** 时间段选择器拓展 */ export function getRangePickerDefaultProps() { return { @@ -13,55 +22,55 @@ export function getRangePickerDefaultProps() { placeholder: [ $t('utils.rangePicker.beginTime'), $t('utils.rangePicker.endTime'), - ], + ] as StringRangeTuple, // 快捷时间范围 presets: [ { label: $t('utils.rangePicker.today'), - value: [dayjs().startOf('day'), dayjs().endOf('day')], + value: dateRange(dayjs().startOf('day'), dayjs().endOf('day')), }, { label: $t('utils.rangePicker.last7Days'), - value: [ + value: dateRange( dayjs().subtract(7, 'day').startOf('day'), dayjs().endOf('day'), - ], + ), }, { label: $t('utils.rangePicker.last30Days'), - value: [ + value: dateRange( dayjs().subtract(30, 'day').startOf('day'), dayjs().endOf('day'), - ], + ), }, { label: $t('utils.rangePicker.yesterday'), - value: [ + value: dateRange( dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day'), - ], + ), }, { label: $t('utils.rangePicker.thisWeek'), - value: [dayjs().startOf('week'), dayjs().endOf('day')], + value: dateRange(dayjs().startOf('week'), dayjs().endOf('day')), }, { label: $t('utils.rangePicker.thisMonth'), - value: [dayjs().startOf('month'), dayjs().endOf('day')], + value: dateRange(dayjs().startOf('month'), dayjs().endOf('day')), }, { label: $t('utils.rangePicker.lastWeek'), - value: [ + value: dateRange( dayjs().subtract(1, 'week').startOf('day'), dayjs().endOf('day'), - ], + ), }, ], showTime: { - defaultValue: [ + defaultValue: dateRange( dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss'), - ], + ), format: 'HH:mm:ss', }, };