Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ nohup.out

#claude
.claude
tools

nul
43 changes: 33 additions & 10 deletions linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,26 @@ export default {
? item.errCode + item.errDesc
: item.errCode || item.errDesc || ''
}
// 从labels数组中提取引擎版本
const getEngineVersion = (item) => {
if (item.labels && Array.isArray(item.labels)) {
const engineTypeLabel = item.labels.find(label => label && label.startsWith('engineType:'))
if (engineTypeLabel) {
const version = engineTypeLabel.split(':')[1]
// 如果包含版本号(如 spark-3.4.4),则返回完整字符串
if (version && version.includes('-')) {
return version
}
}
}
return ''
}
if (!this.isAdminModel) {
return list.map(item => {
const engineVersion = getEngineVersion(item)
const executeApplicationNameWithVersion = engineVersion
? engineVersion
: item.executeApplicationName
return {
disabled: ['Submitted', 'Inited', 'Scheduled', 'Running'].indexOf(item.status) === -1,
taskID: item.taskID,
Expand All @@ -695,17 +713,17 @@ export default {
status: item.status,
costTime: item.costTime,
requestApplicationName: item.requestApplicationName,
executeApplicationName: item.executeApplicationName,
executeApplicationName: executeApplicationNameWithVersion,
createdTime: item.createdTime,
progress: item.progress,
failedReason: getFailedReason(item),
runType: item.runType,
instance: item.instance,
engineInstance: item.engineInstance,
isReuse: item.isReuse === null
? ''
: item.isReuse
? this.$t('message.linkis.yes')
isReuse: item.isReuse === null
? ''
: item.isReuse
? this.$t('message.linkis.yes')
: this.$t('message.linkis.no'),
requestSpendTime: item.requestSpendTime,
requestStartTime: item.requestStartTime,
Expand All @@ -715,16 +733,21 @@ export default {
})
}
return list.map(item => {
const engineVersion = getEngineVersion(item)
const executeApplicationNameWithVersion = engineVersion
? engineVersion
: item.executeApplicationName
return Object.assign(item, {
disabled:
['Submitted', 'Inited', 'Scheduled', 'Running'].indexOf(item.status) === -1,
failedReason: getFailedReason(item),
source: item.sourceTailor,
isReuse: item.isReuse === null
? ''
: item.isReuse
? this.$t('message.linkis.yes')
isReuse: item.isReuse === null
? ''
: item.isReuse
? this.$t('message.linkis.yes')
: this.$t('message.linkis.no'),
executeApplicationName: executeApplicationNameWithVersion,
})
})
},
Expand Down Expand Up @@ -857,7 +880,7 @@ export default {
title: this.$t('message.linkis.tableColumns.requestApplicationName') + ' / ' + this.$t('message.linkis.tableColumns.runType') + ' / ' + this.$t('message.linkis.tableColumns.executeApplicationName'),
key: 'requestApplicationName',
align: 'center',
width: 130,
width: 180,
renderType: 'multiConcat',
renderParams: {
concatKey1: 'runType',
Expand Down
Loading