From 08af2a28228769ae2061464a8450d78ff4f95e0a Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 30 Aug 2021 14:55:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96):=20#1005266=20=20#1006273?=
 =?UTF-8?q?=20=20=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=EF=BC=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=EF=BC=9B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A8=A1=E5=9D=97=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8=E9=80=89=E6=8B=A9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【测试用例】用例列表，名称显示...】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001005266;
【【github#5711】选择模块后，在右侧列表选择所有数据，数据条数不正确，且为上一次选择模块下的条数】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006273
---
 .../api/service/ApiDefinitionExecResultService.java  | 12 ++++++++++--
 .../components/common/components/table/MsTable.vue   |  1 +
 .../common/components/table/MsTableColumn.vue        |  2 +-
 .../components/table/MsTableHeaderSelectPopover.vue  | 10 ++++++++++
 frontend/src/common/css/main.css                     |  3 +++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index a6090ce902..6e53b75df6 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -289,12 +289,20 @@ public class ApiDefinitionExecResultService {
                             testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
                         } else if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
                             TestPlanApiCase apiCase = testPlanApiCaseService.getById(item.getName());
-                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+//                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+                            userID = SessionUtils.getUserId();
+                            if(userID == null){
+                                userID = "";
+                            }
                             apiCase.setStatus(status);
                             apiCase.setUpdateTime(System.currentTimeMillis());
                             testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
                         } else {
-                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+                            userID = SessionUtils.getUserId();
+                            if(userID == null){
+                                userID = "";
+                            }
+//                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
                             testPlanApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
                             testCaseReviewApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
                         }
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index 31a8f82ea1..f80eaeb89a 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -22,6 +22,7 @@
                                       :page-size="pageSize > total ? total : pageSize"
                                       :table-data-count-in-page="data.length"
                                       :total="total"
+                                      :select-type="condition.selectAll"
                                       @selectPageAll="isSelectDataAll(false)"
                                       @selectAll="isSelectDataAll(true)"/>
 
diff --git a/frontend/src/business/components/common/components/table/MsTableColumn.vue b/frontend/src/business/components/common/components/table/MsTableColumn.vue
index e159c19b7c..76d0cdc9a0 100644
--- a/frontend/src/business/components/common/components/table/MsTableColumn.vue
+++ b/frontend/src/business/components/common/components/table/MsTableColumn.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-table-column
+  <el-table-column class-name="msTableColumn"
       v-if="!field || field.id === prop"
       :min-width="minWidth"
       :width="fieldsWidth ? fieldsWidth[prop] : width"
diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
index 9ffdeabf5b..4e264bf812 100644
--- a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -41,6 +41,7 @@
             return 10;
           }
         },
+        selectType: String,
         tableDataCountInPage: {
           type: Number,
           default() {
@@ -54,6 +55,11 @@
           }
         },
       },
+      watch:{
+        total(){
+          this.reload();
+        }
+      },
       created() {
         if(this.keyIndex === 0){
           this.keyIndex++;
@@ -93,6 +99,10 @@
           this.$emit(even);
         },
         reload() {
+            if(!this.selectType){
+              this.selectAllFontColor.color = "gray";
+              this.selectPageFontColor.color = "gray";
+            }
             this.isShow = false;
             this.$nextTick(() => {
               this.isShow = true;
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 250987f80f..bf2f9d3a22 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -143,6 +143,9 @@ textarea {
   border-right: 0 !important;
 }
 
+.msTableColumn .el-tooltip {
+  width: auto !important;
+}
 /* 表格拖拽表头调整宽度 --> */
 
 /* <-- 表格 input 编辑效果 */