From 67a27524390fe723fde72faaab3d9324e0cd44c6 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 2 Feb 2021 13:57:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=97=E6=8B=96=E5=AE=BD=E6=97=B6?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决列拖宽时字符显示不完整的问题
---
 .../automation/scenario/ApiScenarioList.vue   | 23 +++++++++---------
 .../components/list/ApiCaseSimpleList.vue     | 16 ++++++-------
 .../definition/components/list/ApiList.vue    | 22 ++++++++---------
 .../functional/FunctionalTestCaseList.vue     | 24 +++++++++----------
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 566225d774..f7fab91d8c 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -20,7 +20,7 @@
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
 
-        <el-table-column v-if="!referenced" width="30" min-width="30" :render-header="labelHead" :resizable="false" align="center">
+        <el-table-column v-if="!referenced" width="30" min-width="30"  :resizable="false" align="center">
           <template v-slot:default="scope">
             <show-more-btn :is-show="isSelect(scope.row)" :buttons="buttons" :size="selectDataCounts"/>
           </template>
@@ -28,7 +28,7 @@
 
         <el-table-column prop="num" label="ID"
                          sortable="custom"
-                         min-width="120px" :render-header="labelHead"
+                         min-width="120px"
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tooltip content="编辑">
@@ -40,14 +40,14 @@
                          sortable="custom"
                          :label="$t('api_test.automation.scenario_name')"
                          show-overflow-tooltip
-                         :render-header="labelHead"
+
                          min-width="120px"/>
         <el-table-column prop="level"
                          sortable="custom"
                          column-key="level"
                          :filters="levelFilters"
                          min-width="120px"
-                         :render-header="labelHead"
+
                          :label="$t('api_test.automation.case_level')"
                          show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -58,14 +58,14 @@
                          sortable="custom"
                          column-key="status"
                          :filters="statusFilters"
-                         :render-header="labelHead"
+
                          show-overflow-tooltip min-width="120px">
           <template v-slot:default="scope">
             <plan-status-table-item :value="scope.row.status"/>
           </template>
         </el-table-column>
         <el-table-column prop="tags" min-width="120px"
-                         :render-header="labelHead" :label="$t('api_test.automation.tag')">
+                          :label="$t('api_test.automation.tag')">
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
@@ -73,22 +73,22 @@
           </template>
         </el-table-column>
         <el-table-column prop="userId" min-width="120px"
-                         :render-header="labelHead" :label="$t('api_test.automation.creator')"
+                          :label="$t('api_test.automation.creator')"
                          :filters="userFilters"
                          column-key="user_id"
                          sortable="custom"
                          show-overflow-tooltip/>
         <el-table-column prop="updateTime" :label="$t('api_test.automation.update_time')" sortable="custom"  min-width="180px"
-                         :render-header="labelHead">
+                         >
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="stepTotal" :label="$t('api_test.automation.step')" min-width="80px"
-                         :render-header="labelHead" show-overflow-tooltip/>
+                          show-overflow-tooltip/>
         <el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')"
                          :filters="resultFilters"
-                         :render-header="labelHead"
+
                          sortable="custom" column-key="last_result" min-width="120px">
           <template v-slot:default="{row}">
             <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success'">
@@ -101,7 +101,7 @@
         </el-table-column>
         <el-table-column prop="passRate" :label="$t('api_test.automation.passing_rate')"
                          min-width="120px"
-                         :render-header="labelHead"
+
                          show-overflow-tooltip/>
         <el-table-column fixed="right" :label="$t('commons.operating')" width="190px" v-if="!referenced">
           <template v-slot:default="{row}">
@@ -610,6 +610,7 @@
         this.search();
       },
       labelHead(h,{column,index}){
+        // alert(column.minWidth+":"+column.realWidth+":"+column.width);
         if(column.minWidth>column.realWidth){
           column.realWidth = column.minWidth;
           column.width = column.minWidth;
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 4fbf1c6702..6f488a3d05 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -25,13 +25,13 @@
           @selectPageAll="isSelectDataAll(false)"
           @selectAll="isSelectDataAll(true)"/>
 
-        <el-table-column width="30" :resizable="false" min-width="30px" :render-header="labelHead" align="center">
+        <el-table-column width="30" :resizable="false" min-width="30px"  align="center">
           <template v-slot:default="scope">
             <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
           </template>
         </el-table-column>
 
-        <el-table-column prop="num" label="ID" min-width="120px" :render-header="labelHead" show-overflow-tooltip>
+        <el-table-column prop="num" label="ID" min-width="120px"  show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tooltip content="编辑">
               <a style="cursor:pointer" @click="handleTestCase(scope.row)"> {{ scope.row.num }} </a>
@@ -39,14 +39,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="name" min-width="160px" :render-header="labelHead" :label="$t('test_track.case.name')" show-overflow-tooltip/>
+        <el-table-column prop="name" min-width="160px"  :label="$t('test_track.case.name')" show-overflow-tooltip/>
 
         <el-table-column
           prop="priority"
           :filters="priorityFilters"
           column-key="priority"
           min-width="120px"
-          :render-header="labelHead"
+
           :label="$t('test_track.case.priority')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -59,10 +59,10 @@
           prop="path"
           min-width="180px"
           :label="$t('api_test.definition.api_path')"
-          :render-header="labelHead"
+
           show-overflow-tooltip/>
 
-        <el-table-column prop="tags" min-width="120px" :render-header="labelHead" :label="$t('commons.tag')">
+        <el-table-column prop="tags" min-width="120px"  :label="$t('commons.tag')">
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
@@ -73,14 +73,14 @@
         <el-table-column
           prop="createUser"
           :label="'创建人'"
-          :render-header="labelHead"
+
           show-overflow-tooltip/>
 
         <el-table-column
           sortable="custom"
           min-width="160"
           :label="$t('api_test.definition.api_last_time')"
-          :render-header="labelHead"
+
           prop="updateTime">
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index ab21442892..c1ce8c4882 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -34,7 +34,7 @@
 
         <el-table-column prop="num" label="ID" show-overflow-tooltip
                          min-width="80px"
-                         :render-header="labelHead"
+
                          sortable="custom">
           <template slot-scope="scope">
             <el-tooltip content="编辑">
@@ -44,14 +44,14 @@
         </el-table-column>
         <el-table-column prop="name" :label="$t('api_test.definition.api_name')"
                          show-overflow-tooltip
-                         :render-header="labelHead"
+
                          sortable="custom" min-width="120px"/>
         <el-table-column
           prop="status"
           column-key="status"
           sortable="custom"
           :filters="statusFilters"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_status')" min-width="120px">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
@@ -65,7 +65,7 @@
           sortable="custom"
           column-key="method"
           :filters="methodFilters"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_type')"
           show-overflow-tooltip min-width="120px">
           <template v-slot:default="scope" class="request-method">
@@ -82,19 +82,19 @@
           sortable="custom"
           :filters="userFilters"
           column-key="user_id"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_principal')"
           show-overflow-tooltip min-width="100px"/>
 
         <el-table-column
           prop="path"
           min-width="120px"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>
 
         <el-table-column prop="tags" :label="$t('commons.tag')" min-width="80px"
-                         :render-header="labelHead">
+                         >
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
@@ -107,7 +107,7 @@
           :label="$t('api_test.definition.api_last_time')"
           sortable="custom"
           min-width="160px"
-          :render-header="labelHead"
+
           prop="updateTime">
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -117,14 +117,14 @@
         <el-table-column
           prop="caseTotal"
           min-width="80px"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_case_number')"
           show-overflow-tooltip/>
 
         <el-table-column
           prop="caseStatus"
           min-width="80px"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_case_status')"
           show-overflow-tooltip/>
 
@@ -132,7 +132,7 @@
           prop="casePassingRate"
           :width="100"
           min-width="100px"
-          :render-header="labelHead"
+
           :label="$t('api_test.definition.api_case_passing_rate')"
           show-overflow-tooltip/>
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index f5faafcc32..297a1e611a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -49,14 +49,14 @@
           sortable="custom"
           :label="$t('commons.id')"
           min-width="120px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
         </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"
           min-width="120px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
         </el-table-column>
         <el-table-column
@@ -64,7 +64,7 @@
           :filters="priorityFilters"
           column-key="priority"
           min-width="100px"
-          :render-header="labelHead"
+
           :label="$t('test_track.case.priority')">
           <template v-slot:default="scope">
             <priority-table-item :value="scope.row.priority" ref="priority"/>
@@ -77,7 +77,7 @@
           column-key="type"
           :label="$t('test_track.case.type')"
           min-width="80px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <type-table-item :value="scope.row.type"/>
@@ -85,7 +85,7 @@
         </el-table-column>
 
         <el-table-column prop="tags" :label="$t('commons.tag')" min-width="120px"
-                         :render-header="labelHead">
+                         >
           <template v-slot:default="scope">
             <div v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index">
               <ms-tag type="success" effect="plain" :content="tag"/>
@@ -99,7 +99,7 @@
           column-key="method"
           :label="$t('test_track.case.method')"
           min-width="100px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <method-table-item :value="scope.row.method"/>
@@ -110,7 +110,7 @@
           prop="nodePath"
           :label="$t('test_track.case.module')"
           min-width="120px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
         </el-table-column>
 
@@ -118,14 +118,14 @@
           prop="projectName"
           :label="$t('test_track.plan.plan_project')"
           min-width="120px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
         </el-table-column>
 
         <el-table-column
           :label="$t('test_track.issue.issue')"
           min-width="80px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <el-popover
@@ -159,7 +159,7 @@
           prop="executorName"
           :filters="executorFilters"
           min-width="100px"
-          :render-header="labelHead"
+
           column-key="executor"
           :label="$t('test_track.plan_view.executor')">
         </el-table-column>
@@ -169,7 +169,7 @@
           :filters="statusFilters"
           column-key="status"
           min-width="100px"
-          :render-header="labelHead"
+
           :label="$t('test_track.plan_view.execute_result')">
           <template v-slot:default="scope">
             <span @click.stop="clickt = 'stop'">
@@ -203,7 +203,7 @@
           prop="updateTime"
           :label="$t('commons.update_time')"
           min-width="120px"
-          :render-header="labelHead"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>