natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix][UI Next] Fix a few errors in the task group. (#8322)

This commit is contained in:
calvin 2022-02-09 20:02:16 +08:00 committed by GitHub
parent b75f67a56a
commit 222506ae35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts
View File

@ -97,9 +97,15 @@ export function useTable(
variables.totalPage = values[0].totalPage
variables.tableData = values[0].totalList.map(
(item: any, index: number) => {
item.projectName = _.find(values[1], {
code: item.projectCode
}).name
let projectName = ''
if (values[1]) {
let project = _.find(values[1], { code: item.projectCode })
if (project) {
projectName = project.name
}
}
item.projectName = projectName
item.createTime = format(
new Date(item.createTime),
'yyyy-MM-dd HH:mm:ss'

2
dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
View File

@ -193,7 +193,7 @@ const taskGroupQueue = defineComponent({
</NCard>
<Card
class={styles['table-card']}
title={t('resource.task_group_option.option')}
title={t('resource.task_group_queue.queue')}
>
<div>
<NDataTable

12
dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts
View File

@ -98,9 +98,15 @@ export function useTable(
variables.totalPage = values[0].totalPage
variables.tableData = values[0].totalList.map(
(item: any, index: number) => {
item.taskGroupName = _.find(taskGroupList, {
id: item.groupId
}).name
let taskGroupName = ''
if (taskGroupList) {
let taskGroup = _.find(taskGroupList, { id: item.groupId })
if (taskGroup) {
taskGroupName = taskGroup.name
}
}
item.taskGroupName = taskGroupName
item.createTime = format(
new Date(item.createTime),
'yyyy-MM-dd HH:mm:ss'