From 164a48c99fe79c4e76b4cc757659bdf12aa0f133 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:33:15 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA=20(#4803?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/system-upgrade/index.vue   |  4 ++--
 frontend/src/views/cronjob/record/index.vue   | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue
index 73d91777f..77e1ed565 100644
--- a/frontend/src/components/system-upgrade/index.vue
+++ b/frontend/src/components/system-upgrade/index.vue
@@ -16,9 +16,9 @@
         </span>
         <el-button type="primary" link @click="toHalo">
             {{ isProductPro ? $t('license.pro') : $t('license.community') }}
-            <span class="version">{{ version }}</span>
         </el-button>
-        <el-badge is-dot style="margin-left: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
+        <span class="version">{{ version }}</span>
+        <el-badge is-dot style="margin-top: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
             <el-button type="primary" link @click="onLoadUpgradeInfo">
                 <span>({{ $t('setting.hasNewVersion') }})</span>
             </el-button>
diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue
index de1ff4c36..66ebe1e0f 100644
--- a/frontend/src/views/cronjob/record/index.vue
+++ b/frontend/src/views/cronjob/record/index.vue
@@ -154,14 +154,9 @@
                                         <template #label>
                                             <span class="status-label">{{ $t('commons.table.status') }}</span>
                                         </template>
-                                        <el-tooltip v-if="currentRecord?.status === 'Failed'" placement="top">
-                                            <template #content>
-                                                <div style="width: 300px; word-break: break-all">
-                                                    {{ currentRecord?.message }}
-                                                </div>
-                                            </template>
-                                            <el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
-                                        </el-tooltip>
+                                        <el-tag type="danger" v-if="currentRecord?.status === 'Failed'">
+                                            {{ $t('commons.table.statusFailed') }}
+                                        </el-tag>
                                         <el-tag type="success" v-if="currentRecord?.status === 'Success'">
                                             {{ $t('commons.table.statusSuccess') }}
                                         </el-tag>
@@ -170,6 +165,14 @@
                                         </el-tag>
                                     </el-form-item>
                                 </el-row>
+                                <el-row v-if="currentRecord?.status === 'Failed'">
+                                    <el-form-item class="w-full">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('commons.table.message') }}</span>
+                                        </template>
+                                        {{ currentRecord?.message }}
+                                    </el-form-item>
+                                </el-row>
                                 <el-row v-if="currentRecord?.records">
                                     <span>{{ $t('commons.table.records') }}</span>
                                     <codemirror