mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-05 13:48:10 +08:00
[Fix][UI] Set task group name empty of default value (#10243)
(cherry picked from commit b337eef2e6
)
This commit is contained in:
parent
69db18ebd7
commit
f5277570f0
@ -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({
|
||||
<NSelect
|
||||
size='small'
|
||||
options={taskGroupOptions}
|
||||
clearable
|
||||
style={{ width: '180px' }}
|
||||
v-model:value={this.searchParamRef.groupId}
|
||||
placeholder={t('resource.task_group_queue.task_group_name')}
|
||||
/>
|
||||
|
@ -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 }
|
||||
|
Loading…
Reference in New Issue
Block a user