Merge remote-tracking branch 'origin/dev' into dev

README.md

@@ -98,8 +98,8 @@ curl -sSL https://github.com/metersphere/metersphere/releases/latest/download/qu
             <td>测试报告导出</td>
         </tr>
         <tr>
-            <td rowspan="10">性能测试</td>
-            <td rowspan="6">测试脚本</td>
+            <td rowspan="9">性能测试</td>
+            <td rowspan="5">测试脚本</td>
             <td>完全兼容&nbsp;JMeter&nbsp;脚本</td>
         </tr>
         <tr>

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 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')">
+    <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')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" :label="$t('commons.update_time')">
+      <el-table-column width="250" :label="$t('commons.update_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
         </template>
@@ -55,6 +55,9 @@
 
     created() {
       this.search();
+    },
+    activated() {
+      this.search();
     }
   }
 </script>

frontend/src/business/components/api/home/ApiTestHome.vue

@@ -37,11 +37,19 @@
         result: {},
       }
     },
+    activated() {
+      this.getValues();
+    },
     mounted() {
-      this.result = this.$get('/api/report/dashboard/tests', response => {
-        this.values = response.data;
-      });
+      this.getValues();
     },
+    methods: {
+      getValues() {
+        this.result = this.$get('/api/report/dashboard/tests', response => {
+          this.values = response.data;
+        });
+      }
+    }
   }
 </script>
 

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 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')">
+    <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')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" :label="$t('commons.update_time')">
+      <el-table-column width="250" :label="$t('commons.update_time')">
         <template v-slot:default="scope">
           <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
         </template>
@@ -56,6 +56,9 @@
 
     created() {
       this.search();
+    },
+    activated() {
+      this.search();
     }
   }
 </script>

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 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>
+    <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')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
         </template>
@@ -53,6 +53,9 @@
 
     created() {
       this.search();
+    },
+    activated() {
+      this.search();
     }
   }
 </script>

frontend/src/business/components/performance/home/PerformanceTestHome.vue

@@ -42,10 +42,18 @@
       }
     },
     mounted() {
-      this.result = this.$get('/performance/dashboard/tests', response => {
-        this.values = response.data;
-      });
+      this.getValues();
     },
+    activated() {
+      this.getValues();
+    },
+    methods: {
+      getValues() {
+        this.result = this.$get('/performance/dashboard/tests', response => {
+          this.values = response.data;
+        });
+      }
+    }
   }
 </script>
 

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 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 :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')">
         <template v-slot:default="scope">
           <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -54,6 +54,9 @@
 
     created() {
       this.search();
+    },
+    activated() {
+      this.search();
     }
   }
 </script>

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" class="ms-cell-tooltip">
-          <el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
+        <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-column prop="description" :label="$t('commons.description')" show-overflow-tooltip/>
           <!--<el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>-->
           <el-table-column
@@ -122,6 +122,9 @@
       }
       this.list();
     },
+    activated() {
+      this.list();
+    },
     watch: {
       '$route'(to) {
         if (this.$route.path.split('/')[2] === 'project' &&

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -13,6 +13,8 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-unlock" :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>
             <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline" :content="$t('test_track.plan_view.change_execution_results')" @click="handleBatch('status')"/>
             <ms-table-button :is-tester-permission="true" icon="el-icon-user" :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
+            <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
+            <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.view_report')" @click="openReport"/>
           </template>
         </ms-table-header>
       </template>
@@ -138,6 +140,9 @@
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
 
+      <test-report-template-list @openReport="openReport" ref="testReporTtemplateList"/>
+      <test-case-report-view @refresh="initTableData" ref="testCaseReportView"/>
+
     </el-card>
   </div>
 </template>
@@ -173,6 +178,8 @@
   export default {
       name: "TestPlanTestCaseList",
       components: {
+        TestCaseReportView,
+        TestReportTemplateList,
         MsTableOperatorButton,
         MsTableOperator,
         MethodTableItem,
@@ -356,6 +363,9 @@
           }
           this.initTableData();
         },
+        openTestReport() {
+          this.$refs.testReporTtemplateList.open(this.planId);
+        },
         statusChange(param) {
           this.$post('/test/plan/case/edit' , param, () => {
             for (let i = 0; i < this.tableData.length; i++) {
@@ -374,6 +384,16 @@
             });
           }
         },
+        openReport(planId, id) {
+          this.getTestPlanById();
+          if (!id) {
+            id = this.testPlan.reportId;
+          }
+          if (!planId) {
+            planId = this.planId;
+          }
+          this.$refs.testCaseReportView.open(planId, id);
+        },
         filter(filters) {
           _filter(filters, this.condition);
           this.initTableData();

frontend/src/common/css/main.css

@@ -42,9 +42,8 @@ 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%;
+/* Safari 表格不错位 */
+.el-table__body {
+  width: 100%;
+  table-layout: fixed !important;
 }