Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix workflow timing timezone display bug (#9202)

3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
f9e1ca50e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts

13
dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts

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

Loading…
Cancel
Save