From 990076e74f542f6ca47abd9fc8c8a786ed544333 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 9 Jun 2020 14:59:15 +0800
Subject: [PATCH] =?UTF-8?q?Safari=E4=B8=8B=E5=AD=97=E6=AE=B5=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/home/ApiReportRecentList.vue        |  8 ++++----
 .../business/components/api/home/ApiTestRecentList.vue | 10 +++++-----
 .../performance/home/PerformanceReportRecentList.vue   |  6 +++---
 .../performance/home/PerformanceTestRecentList.vue     |  6 +++---
 frontend/src/business/components/project/MsProject.vue |  4 ++--
 frontend/src/common/css/main.css                       |  7 +++++++
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/frontend/src/business/components/api/home/ApiReportRecentList.vue b/frontend/src/business/components/api/home/ApiReportRecentList.vue
index 0a6d821c03..4a28f29727 100644
--- a/frontend/src/business/components/api/home/ApiReportRecentList.vue
+++ b/frontend/src/business/components/api/home/ApiReportRecentList.vue
@@ -3,14 +3,14 @@
     <template v-slot:header>
       <span class="title">{{$t('api_report.title')}}</span>
     </template>
-    <el-table :data="tableData" class="table-content" @row-click="link">
-      <el-table-column prop="name"  :label="$t('commons.name')" width="150" show-overflow-tooltip/>
-      <el-table-column width="250" :label="$t('commons.create_time')">
+    <el-table :data="tableData" class="table-content ms-cell-tooltip" @row-click="link">
+      <el-table-column prop="name"  :label="$t('commons.name')" show-overflow-tooltip/>
+      <el-table-column width="200" :label="$t('commons.create_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="250" :label="$t('commons.update_time')">
+      <el-table-column width="200" :label="$t('commons.update_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
         </template>
diff --git a/frontend/src/business/components/api/home/ApiTestRecentList.vue b/frontend/src/business/components/api/home/ApiTestRecentList.vue
index beb8d52ff7..2bb3aae717 100644
--- a/frontend/src/business/components/api/home/ApiTestRecentList.vue
+++ b/frontend/src/business/components/api/home/ApiTestRecentList.vue
@@ -3,15 +3,15 @@
     <template v-slot:header>
       <span class="title">{{$t('commons.test')}}</span>
     </template>
-    <el-table :data="tableData" class="table-content" @row-click="link">
-      <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
-      <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
-      <el-table-column width="250" :label="$t('commons.create_time')">
+    <el-table :data="tableData" class="table-content ms-cell-tooltip" @row-click="link">
+      <el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
+      <el-table-column prop="projectName" :label="$t('load_test.project_name')" show-overflow-tooltip/>
+      <el-table-column width="200" :label="$t('commons.create_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="250" :label="$t('commons.update_time')">
+      <el-table-column width="200" :label="$t('commons.update_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
         </template>
diff --git a/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue b/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
index c89fc07c65..e41d5aa434 100644
--- a/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
+++ b/frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
@@ -3,9 +3,9 @@
     <template v-slot:header>
       <span class="title">{{$t('api_report.title')}}</span>
     </template>
-    <el-table :data="tableData" class="table-content" @row-click="link">
-      <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
-      <el-table-column width="250" :label="$t('commons.create_time')">
+    <el-table :data="tableData" class="table-content ms-cell-tooltip" @row-click="link">
+      <el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
+      <el-table-column :label="$t('commons.create_time')" show-overflow-tooltip>
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
diff --git a/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue b/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
index 24fe757a6f..36bc3e1c32 100644
--- a/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
+++ b/frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
@@ -3,9 +3,9 @@
     <template v-slot:header>
       <span class="title">{{$t('commons.test')}}</span>
     </template>
-    <el-table :data="tableData" class="table-content" @row-click="link">
-      <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
-      <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
+    <el-table :data="tableData" class="table-content ms-cell-tooltip" @row-click="link">
+      <el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
+      <el-table-column prop="projectName" :label="$t('load_test.project_name')" show-overflow-tooltip/>
       <el-table-column width="250" :label="$t('commons.create_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 74b55841fc..d33b8dc21c 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -6,8 +6,8 @@
           <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                            :create-tip="btnTips" :title="title"/>
         </template>
-        <el-table @row-click="link" :data="items" style="width: 100%" @sort-change="sort">
-          <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip/>
+        <el-table @row-click="link" :data="items" style="width: 100%" @sort-change="sort" class="ms-cell-tooltip">
+          <el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
           <el-table-column prop="description" :label="$t('commons.description')" show-overflow-tooltip/>
           <!--<el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>-->
           <el-table-column
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 2e459aba95..2870ea335f 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -41,3 +41,10 @@ body {
 .table-card > .el-card__body {
   padding-top: 0;
 }
+
+/*处理 show-overflow-tooltip 在 Safari 无效
+  el-table-column 设置 width 后，此 css 无效
+  https://github.com/ElemeFE/element/issues/10308 */
+.ms-cell-tooltip .cell.el-tooltip {
+  max-width: 90%;
+}