From 77dec53fedc1688172603649f87a69930752e016 Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Fri, 13 Mar 2026 11:40:27 +0800 Subject: [PATCH] =?UTF-8?q?#AI=20commit#=20=E5=BC=80=E5=8F=91=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=AE=A1=E7=90=86=E5=8F=B0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=95=E6=93=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../module/globalHistoryManagement/index.vue | 43 ++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9531efb846d..c6b8fae5b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -37,5 +37,6 @@ nohup.out #claude .claude +tools nul diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue index de1bdce01d2..7455d11e9f4 100644 --- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue +++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue @@ -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, @@ -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, @@ -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, }) }) }, @@ -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',