public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 12:22:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(仪表板): 时间范围快捷方式下周存在问题

Browse Source
This commit is contained in:
dataeaseShu
2026-04-16 09:57:19 +08:00
committed by dataeaseShu
parent 215d69e9ed
commit 848fb38424
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-frontend/src/custom-component/v-query/shortcuts.ts
View File

@@ -1,10 +1,12 @@
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import 'dayjs/locale/zh-cn'
import type { ManipulateType, QUnitType } from 'dayjs' import type { ManipulateType, QUnitType } from 'dayjs'
import quarterOfYear from 'dayjs/plugin/quarterOfYear' import quarterOfYear from 'dayjs/plugin/quarterOfYear'
type ManipulateTypeWithQuarter = ManipulateType | 'quarter' type ManipulateTypeWithQuarter = ManipulateType | 'quarter'
const { t } = useI18n() const { t } = useI18n()
dayjs.extend(quarterOfYear) dayjs.extend(quarterOfYear)
dayjs.locale('zh-cn')
function getThisStart(val = 'month' as ManipulateTypeWithQuarter) { function getThisStart(val = 'month' as ManipulateTypeWithQuarter) {
return new Date(dayjs().startOf(val).format('YYYY/MM/DD HH:mm:ss')) return new Date(dayjs().startOf(val).format('YYYY/MM/DD HH:mm:ss'))
@@ -56,8 +58,8 @@ const shortcuts = [
{ {
text: 'dynamic_time.cweek', text: 'dynamic_time.cweek',
onClick: ({ emit }) => { onClick: ({ emit }) => {
const startTime = new Date(+new Date(getThisStart('week')) + 24 * 1000 * 3600) const startTime = getThisStart('week')
const endTime = new Date(+new Date(getThisEnd('week')) + 24 * 1000 * 3600) const endTime = getThisEnd('week')
if (callback([startTime, endTime])) return if (callback([startTime, endTime])) return
emit('pick', [dayjs(startTime), dayjs(endTime)]) emit('pick', [dayjs(startTime), dayjs(endTime)])
} }
@@ -93,8 +95,8 @@ const shortcuts = [
{ {
text: 'dynamic_time.lweek', text: 'dynamic_time.lweek',
onClick: ({ emit }) => { onClick: ({ emit }) => {
const startTime = new Date(+new Date(getLastStart('week')) + 24 * 1000 * 3600) const startTime = getLastStart('week')
const endTime = new Date(+new Date(getLastEnd('week')) + 24 * 1000 * 3600) const endTime = getLastEnd('week')
if (callback([startTime, endTime])) return if (callback([startTime, endTime])) return
emit('pick', [dayjs(startTime), dayjs(endTime)]) emit('pick', [dayjs(startTime), dayjs(endTime)])
} }