From 75e9364c2e79bbf59586fa4e120e701cd65ab1fc Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 15 May 2024 18:36:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/log-drawer.vue                      | 5 ++---
 src/typings/api.d.ts                                      | 2 ++
 src/views/retry/log/modules/retry-log-detail-drawer.vue   | 3 ++-
 src/views/retry/task/modules/retry-task-detail-drawer.vue | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index 5686f99..5d6bd38 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -95,7 +95,7 @@ function timestampToDate(timestamp: string): string {
             <pre
               v-for="(message, index) in modelValue"
               :key="index"
-            ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
+            ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{ `[${message.host}:${message.port}]\t` }}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
           </code>
         </div>
       </div>
@@ -107,11 +107,10 @@ function timestampToDate(timestamp: string): string {
         <pre
           v-for="(message, index) in modelValue"
           :key="index"
-        ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
+        ><NDivider v-if="index !== 0" /><span class="log-hljs-time">{{timestampToDate(message.time_stamp)}}</span><span :class="`log-hljs-level-${message.level}`">{{`\t${message.level}\t`}}</span><span class="log-hljs-thread">{{ `[${message.host}:${message.port}]\t` }}</span><span class="log-hljs-thread">{{`[${message.thread}]\t`}}</span><span class="log-hljs-location">{{`${message.location}: \n`}}</span> -<span class="pl-6px">{{`${message.message}\n`}}</span><ThrowableComponent :throwable="message.throwable" /></pre>
       </code>
     </div>
   </div>
-  <NEmpty v-else class="h-full" />
 </template>
 
 <style scoped lang="scss">
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index fa8e6e3..1b95c2f 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1212,6 +1212,8 @@ declare namespace Api {
 
     type JobMessage = {
       level: JobLevel;
+      host: string;
+      port: string;
       location: string;
       message: string;
       thread: string;
diff --git a/src/views/retry/log/modules/retry-log-detail-drawer.vue b/src/views/retry/log/modules/retry-log-detail-drawer.vue
index a8df105..509d8d0 100644
--- a/src/views/retry/log/modules/retry-log-detail-drawer.vue
+++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue
@@ -102,7 +102,8 @@ onBeforeUnmount(() => {
         </NDescriptions>
       </NTabPane>
       <NTabPane :name="1" :tab="$t('page.log.title')" display-directive="if">
-        <LogDrawer v-model="logList" :drawer="false" />
+        <LogDrawer v-if="logList.length > 0" v-model="logList" :drawer="false" />
+        <NEmpty v-else class="h-full" />
       </NTabPane>
     </NTabs>
   </DetailDrawer>
diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue
index db1d097..a71ba0a 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -109,7 +109,8 @@ onBeforeUnmount(() => {
         </NDescriptions>
       </NTabPane>
       <NTabPane :name="1" :tab="$t('page.log.title')" display-directive="if">
-        <LogDrawer v-model="logList" :drawer="false" />
+        <LogDrawer v-if="logList.length > 0" v-model="logList" :drawer="false" />
+        <NEmpty v-else class="h-full" />
       </NTabPane>
     </NTabs>
   </OperateDrawer>