|
@@ -38,15 +38,12 @@ import {
|
|
|
} from '@/utils/column-width-config'
|
|
|
import { format } from 'date-fns-tz'
|
|
|
import { ISearchParam } from './types'
|
|
|
-import { useTimezoneStore } from '@/store/timezone/timezone'
|
|
|
import styles from '../index.module.scss'
|
|
|
import type { Router } from 'vue-router'
|
|
|
|
|
|
export function useTable() {
|
|
|
const { t } = useI18n()
|
|
|
const router: Router = useRouter()
|
|
|
- const timezoneStore = useTimezoneStore()
|
|
|
- const timeZone = timezoneStore.getTimezone
|
|
|
|
|
|
const variables = reactive({
|
|
|
columns: [],
|
|
@@ -61,7 +58,11 @@ export function useTable() {
|
|
|
showRef: ref(false)
|
|
|
})
|
|
|
|
|
|
- const renderTime = (time: string) => {
|
|
|
+ const renderTime = (time: string, timeZone: string) => {
|
|
|
+ if (!timeZone) {
|
|
|
+ return time
|
|
|
+ }
|
|
|
+
|
|
|
const utc = format(new Date(time), 'zzz', {
|
|
|
timeZone
|
|
|
}).replace('GMT', 'UTC')
|
|
@@ -96,13 +97,13 @@ export function useTable() {
|
|
|
title: t('project.workflow.start_time'),
|
|
|
key: 'startTime',
|
|
|
...COLUMN_WIDTH_CONFIG['time'],
|
|
|
- render: (row: any) => renderTime(row.startTime)
|
|
|
+ render: (row: any) => renderTime(row.startTime, row.timezoneId)
|
|
|
},
|
|
|
{
|
|
|
title: t('project.workflow.end_time'),
|
|
|
key: 'endTime',
|
|
|
...COLUMN_WIDTH_CONFIG['time'],
|
|
|
- render: (row: any) => renderTime(row.endTime)
|
|
|
+ render: (row: any) => renderTime(row.endTime, row.timezoneId)
|
|
|
},
|
|
|
{
|
|
|
title: t('project.workflow.crontab'),
|