From b020bc763a51bdd2ff10be254e3f1eddddea8b29 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Mon, 3 Jun 2024 16:51:37 +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:=209160?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/file-log/log-item.vue | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) 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 6f9d9869fe..cf12f865e2 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 @@ -61,29 +61,41 @@ const process = parseInt(data.progress, 10) / 100; return wholeProgress.slice(0, Math.floor(process * wholeProgress.length) || 1); }; + + const renderServer = () => { + if (data.srcExecuteObject.host) { + return data.srcExecuteObject.host.ip || data.srcExecuteObject.host.ipv6; + } + if (data.srcExecuteObject.container) { + return data.srcExecuteObject.container.name || '--'; + } + return '--'; + }; + const handleToggle = () => { listeners['on-toggle'](data.taskId, !isContentOpen); }; + return ( -
-
- - { parent.$t('history.文件名') }:{ data.fileName } - { parent.$t('history.文件大小') }:{ data.fileSize } - { parent.$t('history.状态.log') }:{ data.statusDesc } - { parent.$t('history.源服务器 IP') }:{ data.srcIp || data.srcIpv6 } - { parent.$t('history.速率') }:{ data.speed } - { parent.$t('history.进度') }:{ data.progress } -
- { - isContentOpen && ( -
-
{ logContent }
-
{ renderProgress() }
-
- ) - } +
+
+ + { parent.$t('history.文件名') }:{ data.fileName } + { parent.$t('history.文件大小') }:{ data.fileSize } + { parent.$t('history.状态.log') }:{ data.statusDesc } + { parent.$t('history.源服务器 IP') }:{ renderServer() } + { parent.$t('history.速率') }:{ data.speed } + { parent.$t('history.进度') }:{ data.progress }
+ { + isContentOpen && ( +
+
{ logContent }
+
{ renderProgress() }
+
+ ) + } +
); }, };