From f9e1ca50e406a106ce1ad5c6b6210fb0ffde02c4 Mon Sep 17 00:00:00 2001
From: Devosend <devosend@gmail.com>
Date: Sat, 26 Mar 2022 19:13:14 +0800
Subject: [PATCH] [Fix][UI Next][V1.0.0-Alpha] Fix workflow timing timezone
 display bug (#9202)

---
 .../workflow/definition/timing/use-table.ts         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
index c4a4f024b2..6ba3d7882b 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts
@@ -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'),