Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8

frontend/src/business/components/common/head/HeaderCustom.vue

@@ -52,6 +52,10 @@ export default {
           this.defaultCheckedKeys.push(i.id)
         }
       )
+      if(this.type==='api_list'||this.type==='api_case_list'||this.type==='api_scenario_list'||this.type==='test_plan_function_test_case'
+        ||this.type==='test_plan_api_case'||this.type==='test_plan_load_case'||this.type==='test_plan_scenario_case'){
+        this.fieldSelected=items
+      }
     },
     saveHeader() {
       let param = {

frontend/src/business/components/common/model/JsonData.js

@@ -81,7 +81,6 @@ export const Test_Case_Review_Case_List = [
   {id: 'name', label: i18n.t('commons.name')},
   {id: 'priority', label: i18n.t('test_track.case.priority')},
   {id: 'type', label: i18n.t('test_track.case.type')},
-  {id: 'method', label: i18n.t('test_track.case.method')},
   {id: 'nodePath', label: i18n.t('test_track.case.module')},
   {id: 'projectName', label: i18n.t('test_track.review.review_project')},
   {id: 'reviewerName', label: i18n.t('test_track.review.reviewer')},
@@ -107,7 +106,7 @@ export const Test_Plan_Function_Test_Case = [
 //测试计划-api用例
 export const Test_Plan_Api_Case = [
   {id: 'num', label: i18n.t('commons.id')},
-  {id: 'name', label: i18n.t('commons.name')},
+  {id: 'name', label: i18n.t('api_test.definition.api_name')},
   {id: 'priority', label: i18n.t('test_track.case.priority')},
   {id: 'path', label: i18n.t('api_test.definition.api_path')},
   {id: 'createUser', label: '创建人'},
@@ -124,12 +123,12 @@ export const Test_Plan_Load_Case = [
   {id: 'createTime', label: i18n.t('commons.create_time')},
   {id: 'status', label: i18n.t('commons.status')},
   {id: 'caseStatus', label: i18n.t('test_track.plan.load_case.execution_status')},
-  {id: 'loadReportId', label: i18n.t('test_track.plan.load_case.view_report')},
+  {id: 'loadReportId', label: i18n.t('test_track.plan.load_case.report')},
 ]
 //测试计划-场景用例
 export const Test_Plan_Scenario_Case = [
   {id: 'num', label: i18n.t('commons.id')},
-  {id: 'name', label: i18n.t('commons.name')},
+  {id: 'name', label: i18n.t('api_test.automation.scenario_name')},
   {id: 'level', label: i18n.t('api_test.automation.case_level')},
   {id: 'tagNames', label: i18n.t('api_test.automation.tag')},
   {id: 'userId', label: i18n.t('api_test.automation.creator')},

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -406,6 +406,7 @@ export default {
     this.getSelectOptions();
     if (this.type === 'edit' || this.type === 'copy') {
       this.open(this.currentTestCaseInfo)
+      this.getComments(this.currentTestCaseInfo)
     }
     // Cascader 级联选择器: 点击文本就让它自动点击前面的input就可以触发选择。
     setInterval(function () {
@@ -431,6 +432,7 @@ export default {
   created() {
     this.loadOptions();
     this.addListener(); //  添加 ctrl s 监听
+
   },
   methods: {
     setModule(id,data) {

frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue

@@ -104,7 +104,7 @@
             </template>
           </el-table-column>
         </template>
-        <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" align="center">
+        <el-table-column  v-if="!isReadOnly" :label="$t('commons.operating')" >
           <template slot="header">
             <header-label-operate @exec="customHeader"/>
           </template>

frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue

@@ -100,7 +100,7 @@
             </template>
           </el-table-column>
         </template>
-        <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" align="center">
+        <el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" >
           <template slot="header">
             <header-label-operate @exec="customHeader"/>
           </template>