From 2df37298dfd5b299a4c051cb544794b5241cc3a5 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 06 Dec 2025 11:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v9.0/9.0.1' into feature/v9.0/9.0.1
---
src/utils/date.js | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/utils/date.js b/src/utils/date.js
index 35d9eb7..0e22793 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -1,3 +1,11 @@
+import dayjs from 'dayjs'
+import 'dayjs/locale/zh-cn'
+import weekday from 'dayjs/plugin/weekday'
+
+// 配置 dayjs
+dayjs.locale('zh-cn')
+dayjs.extend(weekday)
+
export const calcDate = (date1, date2) => {
let date3 = date2 - date1;
@@ -56,3 +64,22 @@
export function dateNow() {
return dateFormat(new Date(), 'yyyyMMddhhmmss');
}
+
+export const getDateRange = (unit, formatStr = 'YYYY-MM-DD HH:mm:ss') => {
+ const todayDate = dayjs()
+ let returnArr = [dayjs(), todayDate]
+ if (unit === 'today') {
+ returnArr = [dayjs(), todayDate]
+ }
+ if (unit === 'week') {
+ returnArr = [dayjs().weekday(0), todayDate]
+ }
+ if (unit === 'month') {
+ returnArr = [dayjs().startOf('month'), todayDate]
+ }
+ if (unit === 'year') {
+ returnArr = [dayjs().startOf('year'), todayDate]
+ }
+ returnArr = [returnArr[0].startOf('day').format(formatStr), returnArr[1].endOf('day').format(formatStr)]
+ return returnArr
+}
--
Gitblit v1.9.3