Browse Source

[Fix][UI Next][V1.0.0-Beta] The version information creation time in the workflow definition is changed to the operateTime field. (#9590)

3.0.0/version-upgrade
songjianet 3 years ago committed by GitHub
parent
commit
dd3dbf927c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 37
      dolphinscheduler-ui-next/src/components/log-modal/index.tsx
  2. 3
      dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
  3. 6
      dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx
  4. 9
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx
  5. 2
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts

37
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)
}
])}
>

3
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/' +

6
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

9
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
}

2
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'),

Loading…
Cancel
Save