From dd3dbf927c585dd302e0e4cd972088ddd7516074 Mon Sep 17 00:00:00 2001
From: songjianet <1778651752@qq.com>
Date: Tue, 19 Apr 2022 18:57:16 +0800
Subject: [PATCH] [Fix][UI Next][V1.0.0-Beta] The version information creation
 time in the workflow definition is changed to the operateTime field. (#9590)

---
 .../src/components/log-modal/index.tsx        | 37 ++++++++++++++++---
 .../task/components/node/detail-modal.tsx     |  3 +-
 .../views/projects/task/instance/index.tsx    |  6 +--
 .../workflow/components/dag/index.tsx         |  9 ++---
 .../definition/components/use-table.ts        |  2 +-
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/dolphinscheduler-ui-next/src/components/log-modal/index.tsx b/dolphinscheduler-ui-next/src/components/log-modal/index.tsx
index 003ef6ce7f..d46702ea16 100644
--- a/dolphinscheduler-ui-next/src/components/log-modal/index.tsx
+++ b/dolphinscheduler-ui-next/src/components/log-modal/index.tsx
@@ -28,7 +28,12 @@ import {
 import { useI18n } from 'vue-i18n'
 import { NIcon, NLog } from 'naive-ui'
 import Modal from '../modal'
-import { DownloadOutlined, FullscreenExitOutlined, FullscreenOutlined, SyncOutlined } from '@vicons/antd'
+import {
+  DownloadOutlined,
+  FullscreenExitOutlined,
+  FullscreenOutlined,
+  SyncOutlined
+} from '@vicons/antd'
 import screenfull from 'screenfull'
 
 const props = {
@@ -51,7 +56,7 @@ const props = {
   showDownloadLog: {
     type: Boolean as PropType<boolean>,
     default: false
-  },
+  }
 }
 
 export default defineComponent({
@@ -98,10 +103,26 @@ export default defineComponent({
       screenfull.on('change', change)
     })
 
-    return { t, renderIcon, confirmModal, refreshLogs, downloadLogs, handleFullScreen, ...toRefs(variables) }
+    return {
+      t,
+      renderIcon,
+      confirmModal,
+      refreshLogs,
+      downloadLogs,
+      handleFullScreen,
+      ...toRefs(variables)
+    }
   },
   render() {
-    const { t, renderIcon, refreshLogs, downloadLogs, isFullscreen, handleFullScreen, showDownloadLog } = this
+    const {
+      t,
+      renderIcon,
+      refreshLogs,
+      downloadLogs,
+      isFullscreen,
+      handleFullScreen,
+      showDownloadLog
+    } = this
     return (
       <Modal
         class='logModalRef'
@@ -124,10 +145,14 @@ export default defineComponent({
             icon: renderIcon(SyncOutlined)
           },
           {
-            text: isFullscreen ? t('project.task.cancel_full_screen') : t('project.task.enter_full_screen'),
+            text: isFullscreen
+              ? t('project.task.cancel_full_screen')
+              : t('project.task.enter_full_screen'),
             show: true,
             action: handleFullScreen,
-            icon: isFullscreen ? renderIcon(FullscreenExitOutlined) : renderIcon(FullscreenOutlined)
+            icon: isFullscreen
+              ? renderIcon(FullscreenExitOutlined)
+              : renderIcon(FullscreenOutlined)
           }
         ])}
       >
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
index 875f85e467..c1bb821f3c 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
@@ -117,8 +117,7 @@ const NodeDetailModal = defineComponent({
       headerLinks.value = [
         {
           text: t('project.node.instructions'),
-          show:
-            !!(taskType && !TASK_TYPES_MAP[taskType]?.helperLinkDisable),
+          show: !!(taskType && !TASK_TYPES_MAP[taskType]?.helperLinkDisable),
           action: () => {
             const helpUrl =
               'https://dolphinscheduler.apache.org/' +
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
index 43ca17afbd..e1d1e27e04 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
@@ -70,7 +70,7 @@ const TaskInstance = defineComponent({
       variables.showModalRef = false
     }
 
-    const getLogs = (row:any) => {
+    const getLogs = (row: any) => {
       const { state } = useAsyncState(
         queryLog({
           taskInstanceId: Number(row.id),
@@ -88,11 +88,11 @@ const TaskInstance = defineComponent({
         }),
         {}
       )
-  
+
       return state
     }
 
-    const refreshLogs = (row:any) => {
+    const refreshLogs = (row: any) => {
       variables.logRef = ''
       variables.limit = 1000
       variables.skipLineNum = 0
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx
index daa8d170df..edcea0fe38 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx
@@ -114,10 +114,9 @@ export default defineComponent({
     } = useTaskEdit({ graph, definition: toRef(props, 'definition') })
 
     // Right click cell
-    const { nodeVariables, menuHide, menuStart, viewLog } =
-      useNodeMenu({
-        graph
-      })
+    const { nodeVariables, menuHide, menuStart, viewLog } = useNodeMenu({
+      graph
+    })
 
     // start button in the dag node menu
     const startReadonly = computed(() => {
@@ -254,7 +253,7 @@ export default defineComponent({
         }),
         {}
       )
-  
+
       return state
     }
 
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts
index c543ce426c..c56854dcf8 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts
@@ -66,7 +66,7 @@ export function useTable(
     },
     {
       title: t('project.workflow.create_time'),
-      key: 'createTime'
+      key: 'operateTime'
     },
     {
       title: t('project.workflow.operation'),