From 4ca26e1afcbf1f6d8ed208f0c841488e1d230b26 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 31 Mar 2025 17:39:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E9=97=B4=E4=B8=BA=E4=B8=80=E6=9C=88=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E9=A2=84=E8=A7=88=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/DynamicTime.vue  |  3 +-
 .../v-query/DynamicTimeForViewFilter.vue      |  3 +-
 .../v-query/DynamicTimeRange.vue              |  5 +-
 .../custom-component/v-query/time-format.ts   | 83 ++++---------------
 core/core-frontend/src/hooks/web/useFilter.ts | 10 +--
 5 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTime.vue b/core/core-frontend/src/custom-component/v-query/DynamicTime.vue
index 95f8e6456b..452a815c4f 100644
--- a/core/core-frontend/src/custom-component/v-query/DynamicTime.vue
+++ b/core/core-frontend/src/custom-component/v-query/DynamicTime.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type { ManipulateType } from 'dayjs'
 import { toRefs, PropType, ref, onBeforeMount, watch, computed } from 'vue'
 import { Calendar } from '@element-plus/icons-vue'
 import { type DatePickType } from 'element-plus-secondary'
@@ -22,7 +23,7 @@ interface SelectConfig {
   defaultValueCheck: boolean
   id: string
   timeNum: number
-  relativeToCurrentType: string
+  relativeToCurrentType: ManipulateType
   around: string
   arbitraryTime: Date
   timeGranularity: DatePickType
diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue b/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue
index 0f7d5c54e6..48c6728b77 100644
--- a/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue
+++ b/core/core-frontend/src/custom-component/v-query/DynamicTimeForViewFilter.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type { ManipulateType } from 'dayjs'
 import { toRefs, PropType, ref, onBeforeMount, watch, computed } from 'vue'
 import { type DatePickType } from 'element-plus-secondary'
 import {
@@ -15,7 +16,7 @@ import {
 interface SelectConfig {
   relativeToCurrent: string
   timeNum: number
-  relativeToCurrentType: string
+  relativeToCurrentType: ManipulateType
   around: string
   arbitraryTime: Date
   timeGranularity: DatePickType
diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue b/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
index aa36a05b45..495ae83847 100644
--- a/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
+++ b/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type { ManipulateType } from 'dayjs'
 import { toRefs, PropType, ref, onBeforeMount, watch, computed } from 'vue'
 import { Calendar } from '@element-plus/icons-vue'
 import { type DatePickType } from 'element-plus-secondary'
@@ -13,12 +14,12 @@ interface SelectConfig {
   id: string
   relativeToCurrentRange: string
   timeNum: number
-  relativeToCurrentType: string
+  relativeToCurrentType: ManipulateType
   around: string
   arbitraryTime: Date
   timeGranularity: DatePickType
   timeNumRange: number
-  relativeToCurrentTypeRange: string
+  relativeToCurrentTypeRange: ManipulateType
   aroundRange: string
   arbitraryTimeRange: Date
 }
diff --git a/core/core-frontend/src/custom-component/v-query/time-format.ts b/core/core-frontend/src/custom-component/v-query/time-format.ts
index fbfd43378f..e194056f2f 100644
--- a/core/core-frontend/src/custom-component/v-query/time-format.ts
+++ b/core/core-frontend/src/custom-component/v-query/time-format.ts
@@ -54,95 +54,46 @@ function getYearBeginning() {
   return new Date(`${date.getFullYear()}/1/1`)
 }
 
-function getYearMonthRange(result, flag, sort) {
+function getYearMonthRange(result, sort) {
   const [direction, scene] = (sort || '').split('-')
-  const [dateTimeType] = (flag || '').split('range')
   if (direction === 'start') {
-    return result
+    return new Date(result.startOf('day').format('YYYY/MM/DD HH:mm:ss'))
   } else if (direction === 'end') {
     if (scene === 'config') {
-      return result
+      return new Date(result.format('YYYY/MM/DD HH:mm:ss'))
     } else if (scene === 'panel') {
-      return new Date(
-        +getCustomTime(1, dateTimeType, dateTimeType, 'b', null, flag, 'start-config', result) -
-          1000
-      )
+      return new Date(dayjs(result).endOf('day').format('YYYY/MM/DD HH:mm:ss'))
     }
   }
 }
 
 function getCustomTime(
   timeNum: number,
-  timeType: string,
+  timeType: ManipulateType | 'date',
   timeGranularity: string,
   around: string,
   arbitraryTime?: Date,
   timeGranularityMultiple?: string,
-  sort?: string,
-  withDate?: Date
+  sort?: string
 ) {
-  const date = withDate ? new Date(withDate) : new Date()
-  const num = around === 'f' ? -timeNum : timeNum
-  const year = date.getFullYear()
-  const month = date.getMonth() + 1
-  const day = date.getDate()
+  const type = around === 'f' ? 'subtract' : 'add'
 
-  let resultYear = timeType === 'year' ? year + num : year
-  let resultMonth = timeType === 'month' ? month + num : month
-  if (resultMonth > 12) {
-    resultYear += parseInt(`${resultMonth / 12}`)
-    resultMonth = resultMonth % 12
-  } else if (resultMonth < 0) {
-    resultYear += parseInt(`${resultMonth / 12}`) - 1
-    resultMonth = (resultMonth % 12) + 12
-  } else if (resultMonth === 0) {
-    resultYear += parseInt(`${resultMonth / 12}`) - 1
-    resultMonth = 12
-  }
-  const resultDate =
-    timeType === 'date' ? new Date(date.getTime() + 24 * 60 * 60 * 1000 * num).getDate() : day
-  if (timeType === 'date') {
-    resultMonth = new Date(date.getTime() + 24 * 60 * 60 * 1000 * num).getMonth() + 1
-    resultYear = new Date(date.getTime() + 24 * 60 * 60 * 1000 * num).getFullYear()
-  }
+  const result = dayjs()[type](timeNum, timeType === 'date' ? 'day' : timeType)
 
-  switch (timeGranularityMultiple) {
-    case 'monthrange':
-      return getYearMonthRange(new Date(`${resultYear}/${resultMonth}/1`), 'monthrange', sort)
-    case 'yearrange':
-      return getYearMonthRange(new Date(`${resultYear}/1`), 'yearrange', sort)
-    case 'daterange':
-      return getYearMonthRange(
-        new Date(`${resultYear}/${resultMonth}/${resultDate}`),
-        'daterange',
-        sort
-      )
-    default:
-      break
+  if (['monthrange', 'yearrange', 'daterange'].includes(timeGranularityMultiple)) {
+    return getYearMonthRange(result, sort)
   }
 
   if (!!arbitraryTime) {
-    const time = new Date(arbitraryTime)
-    time.setFullYear(resultYear)
-    time.setMonth(resultMonth - 1)
-    time.setDate(resultDate)
-    return time
+    const time = dayjs(arbitraryTime).format('YYYY/MM/DD HH:mm:ss')
+    const [_, q] = time.split(' ')
+    const [s] = result.format('YYYY/MM/DD HH:mm:ss').split(' ')
+
+    return new Date(`${s} ${q}`)
   }
 
-  switch (timeGranularity) {
-    case 'year':
-      return new Date(`${resultYear}/1`)
-    case 'month':
-      return new Date(`${resultYear}/${resultMonth}/1`)
-    case 'date':
-      return new Date(`${resultYear}/${resultMonth}/${resultDate}`)
-    case 'monthrange':
-      return new Date(`${resultYear}/${resultMonth}/1`)
-    case 'yearrange':
-      return new Date(`${resultYear}/1`)
-    default:
-      break
-  }
+  const [k] = timeGranularity.split('range')
+  return new Date(result.startOf(k as ManipulateType).format('YYYY/MM/DD HH:mm:ss'))
 }
 
 function getDynamicRange({
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index 16143622ad..3299b93c8f 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -1,4 +1,5 @@
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import type { ManipulateType } from 'dayjs'
 import { storeToRefs } from 'pinia'
 import dayjs from 'dayjs'
 import { getDynamicRange, getCustomTime } from '@/custom-component/v-query/time-format'
@@ -9,23 +10,22 @@ const { componentData, canvasStyleData } = storeToRefs(dvMainStore)
 const getDynamicRangeTime = (type: number, selectValue: any, timeGranularityMultiple: string) => {
   const timeType = (timeGranularityMultiple || '').split('range')[0]
 
-  if (['datetimerange', 'yearrange'].includes(timeGranularityMultiple) || type === 1 || !timeType) {
+  if (timeGranularityMultiple.includes('range') || type === 1 || !timeType) {
     return selectValue.map(ele => +new Date(ele))
   }
 
-  const [start, end] = selectValue
+  const [start] = selectValue
 
   return [
     +new Date(start),
     +getCustomTime(
       1,
-      timeType,
+      timeType as ManipulateType,
       timeType,
       'b',
       null,
       timeGranularityMultiple,
-      'start-config',
-      new Date(end)
+      'start-config'
     ) - 1000
   ]
 }