From a4f7b7c057febc0ef6d90a3114dbd1e6146f0d27 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Thu, 24 Oct 2024 17:18:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0DatetimeRange?=
 =?UTF-8?q?=E7=9A=84=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/datetime-range.vue |  5 ++++-
 src/locales/langs/en-us.ts               |  2 ++
 src/locales/langs/zh-cn.ts               |  2 ++
 src/typings/app.d.ts                     |  2 ++
 src/utils/common.ts                      | 19 ++++++++++++++++++-
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
index c780241..63d5a01 100644
--- a/src/components/common/datetime-range.vue
+++ b/src/components/common/datetime-range.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
-import { monthRange } from '@/utils/common';
+import { dayRange, monthRange } from '@/utils/common';
 
 defineOptions({
   name: 'DatetimeRange'
@@ -13,6 +13,9 @@ const modelValue = defineModel<[string, string] | null>('value');
 
 const createShortcuts = () => {
   const shortcuts: any = {};
+  shortcuts[$t('common.today')] = dayRange(1);
+  shortcuts[$t('common.lastWeek')] = dayRange(7);
+  shortcuts[$t('common.lastMonth')] = monthRange(1, 'month');
   shortcuts[$t('common.currentMonth')] = monthRange(0, 'month');
   shortcuts[$t('common.lastMonth')] = monthRange(1, 'month');
   shortcuts[$t('common.lastTwoMonth')] = monthRange(2, 'month');
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index ebe9d4c..cfb3369 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -210,6 +210,8 @@ const local: App.I18n.Schema = {
     },
     updateDt: 'Updated Time',
     createDt: 'Created Time',
+    today: 'Today',
+    lastWeek: 'Last Week',
     currentMonth: 'Current Month',
     lastMonth: 'Last Month',
     lastTwoMonth: 'Last 2 Month'
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 106d03f..396de01 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -210,6 +210,8 @@ const local: App.I18n.Schema = {
     },
     updateDt: '更新时间',
     createDt: '创建时间',
+    today: '今天',
+    lastWeek: '最近一周',
     currentMonth: '当月',
     lastMonth: '最近一月',
     lastTwoMonth: '最近两月'
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index f9b9367..06f551d 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -491,6 +491,8 @@ declare namespace App {
         };
         updateDt: string;
         createDt: string;
+        today: string;
+        lastWeek: string;
         currentMonth: string;
         lastMonth: string;
         lastTwoMonth: string;
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 637171e..a7e633a 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -120,7 +120,7 @@ export function toggleHtmlClass(className: string) {
 }
 
 /**
- * 创建 `最近n个自然月` timestamp时间区间
+ * 创建 `最近n个自然月` timestamp 时间区间
  *
  * @param months 月数
  * @param startOf 时间的开始类型
@@ -133,6 +133,23 @@ export function monthRange(months: number = 1, startOf: dayjs.OpUnitType = 'day'
   ];
 }
 
+/**
+ * 创建 `最近n个自然月` timestamp 时间区间
+ *
+ * @param days 日数
+ * @param startOf 时间的开始类型
+ * @returns timestamp时间区间
+ */
+export function dayRange(days: number = 1) {
+  return [
+    dayjs()
+      .subtract(days - 1, 'day')
+      .startOf('day')
+      .valueOf(),
+    dayjs().endOf('day').valueOf()
+  ] as [number, number];
+}
+
 /**
  * 创建 `最近n个自然月` 字符串时间区间
  *