From dd9cdf1aed4a6b5551d124d8fbd56573914117c7 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Tue, 4 Jun 2024 19:40:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E7=9C=8B=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E9=87=8F=E6=97=A5=E5=BF=97=E6=97=B6?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=20api=20=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20#3009=20#=20Reviewed,=20transaction=20id:=209275?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/executive-history/local.js | 1 + .../components/file-log/log-item.vue | 50 ++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/views/executive-history/local.js b/src/frontend/src/views/executive-history/local.js index 2f7b787154..677d765ba9 100644 --- a/src/frontend/src/views/executive-history/local.js +++ b/src/frontend/src/views/executive-history/local.js @@ -232,5 +232,6 @@ export default { '容器 ID': 'Container ID', '所属 Pod 名称': 'Pod name', 没有可复制的容器名称: 'Container name not found', + 文件源: 'File source', }, }; diff --git a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/file-log/log-item.vue b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/file-log/log-item.vue index cf12f865e2..89b16bc95c 100644 --- a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/file-log/log-item.vue +++ b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/file-log/log-item.vue @@ -51,8 +51,48 @@ [statusMap[data.status]]: true, toggle: isContentOpen, }; + + let bkTooltips = null; + + if (data.srcExecuteObject.container) { + const { + id, + name, + nodeHostId, + podName, + uid, + } = data.srcExecuteObject.container || {}; + + bkTooltips = { + theme: 'light', + content: ` + + + + + + + + + + + + + + + + + + + + +
id: ${id}
Container name: ${name}
Host id: ${nodeHostId}
Pod name: ${podName}
uid: ${uid}
`, + allowHTML: true, + }; + } // 异步获取日志的loading状态 const logContent = renderContentMap[data.taskId] || data.logContent; + if (isContentLoading && !logContent) { classes['content-loading'] = true; } @@ -83,7 +123,15 @@ { parent.$t('history.文件名') }:{ data.fileName } { parent.$t('history.文件大小') }:{ data.fileSize } { parent.$t('history.状态.log') }:{ data.statusDesc } - { parent.$t('history.源服务器 IP') }:{ renderServer() } + { parent.$t('history.文件源') }: + + { renderServer() } + + { parent.$t('history.速率') }:{ data.speed } { parent.$t('history.进度') }:{ data.progress }