From 7136beb5a4c1eba27547e3e70405e4f5c99fd83c Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Fri, 10 Jun 2022 10:56:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8AError=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81tip=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013917 --user=刘瑶 【UI测试】前端问题汇总 https://www.tapd.cn/55049933/s/1178549
---
 backend/src/main/java/io/metersphere/xpack                   | 2 +-
 .../src/business/components/api/report/ApiReportStatus.vue   | 5 ++++-
 frontend/src/business/components/xpack                       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index a1261a0f08..51e8263ea1 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit a1261a0f08e592a4a7aeeb95978ca9d5995daf32
+Subproject commit 51e8263ea1cc8427322a2143775710370114fe70
diff --git a/frontend/src/business/components/api/report/ApiReportStatus.vue b/frontend/src/business/components/api/report/ApiReportStatus.vue
index 06e2464a07..b84c4ffa09 100644
--- a/frontend/src/business/components/api/report/ApiReportStatus.vue
+++ b/frontend/src/business/components/api/report/ApiReportStatus.vue
@@ -12,7 +12,7 @@
     <el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
       {{ row.status }}
     </el-tag>
-    <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
+    <el-tooltip placement="top" v-else-if="row.status === 'Error' && row.description" effect="light">
       <template v-slot:content>
         <div>{{row.description}}</div>
       </template>
@@ -20,6 +20,9 @@
         {{ row.status }}
       </el-tag>
     </el-tooltip>
+    <el-tag v-else-if="row.status === 'Error' && !row.description" size="mini" type="danger">
+      {{ row.status }}
+    </el-tag>
     <el-tag v-else size="mini" type="info">
       {{ row.status }}
     </el-tag>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 52a191d0d2..715a3f3e28 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 52a191d0d22204a47ce6142af036b51198f89652
+Subproject commit 715a3f3e2828d496c2f04df949a545fc1f09bfb3