From 26c26381462537bd818457c2ec02d2df5617da0a Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Wed, 23 Apr 2025 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=81=E7=A7=BB=20time.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/utils/TimeUtils.ts | 1 + packages/@core/base/shared/src/utils/index.ts | 1 + packages/@core/base/shared/src/utils/time.ts | 46 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 packages/@core/base/shared/src/utils/time.ts diff --git a/apps/web-antd/src/utils/TimeUtils.ts b/apps/web-antd/src/utils/TimeUtils.ts index 3d3ab4554..8c45beda7 100644 --- a/apps/web-antd/src/utils/TimeUtils.ts +++ b/apps/web-antd/src/utils/TimeUtils.ts @@ -1,3 +1,4 @@ +// 迁移至 packages/@core/base/shared/src/utils/time.ts import dayjs from 'dayjs'; /** 时间段选择器拓展 */ diff --git a/packages/@core/base/shared/src/utils/index.ts b/packages/@core/base/shared/src/utils/index.ts index 2ee0b489c..a1d553fad 100644 --- a/packages/@core/base/shared/src/utils/index.ts +++ b/packages/@core/base/shared/src/utils/index.ts @@ -8,6 +8,7 @@ export * from './letter'; export * from './merge'; export * from './nprogress'; export * from './state-handler'; +export * from './time'; export * from './to'; export * from './tree'; export * from './unique'; diff --git a/packages/@core/base/shared/src/utils/time.ts b/packages/@core/base/shared/src/utils/time.ts new file mode 100644 index 000000000..bd4f0e56a --- /dev/null +++ b/packages/@core/base/shared/src/utils/time.ts @@ -0,0 +1,46 @@ +import dayjs from 'dayjs'; + +/** 时间段选择器拓展 */ +export function rangePickerExtend() { + return { + format: 'YYYY-MM-DD HH:mm:ss', // 显示格式 + placeholder: ['开始时间', '结束时间'], + ranges: { + 今天: [dayjs().startOf('day'), dayjs().endOf('day')], + + 最近7天: [ + dayjs().subtract(7, 'day').startOf('day'), + dayjs().endOf('day'), + ], + + 最近30天: [ + dayjs().subtract(30, 'day').startOf('day'), + dayjs().endOf('day'), + ], + + 昨天: [ + dayjs().subtract(1, 'day').startOf('day'), + dayjs().subtract(1, 'day').endOf('day'), + ], + + 本周: [dayjs().startOf('week'), dayjs().endOf('day')], + + 本月: [dayjs().startOf('month'), dayjs().endOf('day')], + }, + showTime: { + defaultValue: [ + dayjs('00:00:00', 'HH:mm:ss'), + dayjs('23:59:59', 'HH:mm:ss'), + ], + format: 'HH:mm:ss', + }, + transformDateFunc: (dates: any) => { + if (dates && dates.length === 2) { + return [dates.createTime[0], dates.createTime[1]].join(','); // 格式化为后台支持的时间格式 + } + return {}; + }, + // 如果需要10位时间戳(秒级)可以使用 valueFormat: 'X' + valueFormat: 'YYYY-MM-DD HH:mm:ss', + }; +}