From f5277570f01843ca6b5c1e986b3a77d98f9eccd7 Mon Sep 17 00:00:00 2001 From: Devosend Date: Wed, 25 May 2022 19:22:07 +0800 Subject: [PATCH] [Fix][UI] Set task group name empty of default value (#10243) (cherry picked from commit b337eef2e6cc66ec850b77e9114dea8d8ace0871) --- .../views/resource/task-group/queue/index.tsx | 5 +- .../resource/task-group/queue/use-table.ts | 57 ++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx b/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx index e32fb52b7b..e191ed7212 100644 --- a/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx +++ b/dolphinscheduler-ui/src/views/resource/task-group/queue/index.tsx @@ -110,9 +110,6 @@ const taskGroupQueue = defineComponent({ queryTaskGroupListPaging(taskGroupOptionsParams).then( (res: TaskGroupRes) => { res.totalList.map((item) => { - if (!searchParamRef.groupId) { - searchParamRef.groupId = item.id - } const option: SelectMixedOption = { label: item.name, value: item.id @@ -165,6 +162,8 @@ const taskGroupQueue = defineComponent({ diff --git a/dolphinscheduler-ui/src/views/resource/task-group/queue/use-table.ts b/dolphinscheduler-ui/src/views/resource/task-group/queue/use-table.ts index 4aa7028806..15fc58fe0f 100644 --- a/dolphinscheduler-ui/src/views/resource/task-group/queue/use-table.ts +++ b/dolphinscheduler-ui/src/views/resource/task-group/queue/use-table.ts @@ -132,38 +132,43 @@ export function useTable( pageNo: 1, pageSize: 2147483647 } + Promise.all([ queryTaskListInTaskGroupQueueById(params), queryTaskGroupListPaging(taskGroupSearchParams) - ]).then((values: any[]) => { - const taskGroupList = values[1].totalList - variables.totalPage = values[0].totalPage - variables.tableData = values[0].totalList.map( - (item: any, unused: number) => { - let taskGroupName = '' - if (taskGroupList) { - const taskGroup = _.find(taskGroupList, { id: item.groupId }) - if (taskGroup) { - taskGroupName = taskGroup.name + ]).then( + (values: any[]) => { + const taskGroupList = values[1].totalList + variables.totalPage = values[0].totalPage + variables.tableData = values[0].totalList.map( + (item: any, unused: number) => { + let taskGroupName = '' + if (taskGroupList) { + const taskGroup = _.find(taskGroupList, { id: item.groupId }) + if (taskGroup) { + taskGroupName = taskGroup.name + } + } + + item.taskGroupName = taskGroupName + item.createTime = format( + parseTime(item.createTime), + 'yyyy-MM-dd HH:mm:ss' + ) + item.updateTime = format( + parseTime(item.updateTime), + 'yyyy-MM-dd HH:mm:ss' + ) + return { + ...item } } + ) + }, + () => {} + ) - item.taskGroupName = taskGroupName - item.createTime = format( - parseTime(item.createTime), - 'yyyy-MM-dd HH:mm:ss' - ) - item.updateTime = format( - parseTime(item.updateTime), - 'yyyy-MM-dd HH:mm:ss' - ) - return { - ...item - } - } - ) - variables.loadingRef = false - }) + variables.loadingRef = false } return { getTableData, variables, columns }