Merge branch 'master' of github.com:metersphere/metersphere

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml

@@ -137,7 +137,7 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags,
+        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer,
         test_case.node_path, test_case.method, test_case.num, test_plan_test_case.executor, test_plan_test_case.status,
         test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName,
         test_plan_test_case.plan_id as planId
@@ -200,6 +200,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='maintainer'">
+                                and test_case.maintainer in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <when test="key=='executor'">
                                 and test_plan_test_case.executor in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">

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

@@ -109,6 +109,7 @@ export const Test_Plan_Function_Test_Case = [
   {id: 'executorName', label: i18n.t('test_track.plan_view.executor')},
   {id: 'status', label: i18n.t('test_track.plan_view.execute_result')},
   {id: 'updateTime', label: i18n.t('commons.update_time')},
+  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')}
 ]
 //测试计划-api用例
 export const Test_Plan_Api_Case = [

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

@@ -83,7 +83,6 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-
             </el-col>
           </el-row>
           <el-row>

frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue

@@ -4,9 +4,12 @@
 <!--      <template v-slot:header>-->
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_id_name_tag')">
+
+          <!-- 不显示 “全部用例” 标题,使标题为空 -->
           <template v-slot:title>
-            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="breadcrumbRefresh"/>
+            <span></span>
           </template>
+
           <template v-slot:button>
             <ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom"
                              :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
@@ -15,8 +18,11 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"
+
-                             :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>
+<!--            删除 “取消全部关联” 按钮-->
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"-->
+<!--                             :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>-->
+
           </template>
         </ms-table-header>
 <!--      </template>-->
@@ -173,6 +179,16 @@
             column-key="executor"
             :label="$t('test_track.plan_view.executor')">
           </el-table-column>
+          <!-- 责任人(创建该用例时所关联的责任人) -->
+          <el-table-column
+            v-if="item.id == 'maintainer'"
+            prop="maintainer"
+            :filters="maintainerFilters"
+            min-width="100px"
+            :key="index"
+            column-key="maintainer"
+            :label="$t('api_test.definition.request.responsible')">
+          </el-table-column>
 
           <el-table-column
             v-if="item.id == 'status'"
@@ -352,6 +368,7 @@ export default {
         {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
       ],
       executorFilters: [],
+      maintainerFilters: [],
       showMore: false,
       buttons: [
         {
@@ -665,6 +682,9 @@ export default {
         this.executorFilters = response.data.map(u => {
           return {text: u.name, value: u.id}
         });
+        this.maintainerFilters = response.data.map(u => {
+          return {text: u.id + '(' + u.name + ')', value: u.id};
+        });
       });
     }
   }

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit f63ebb68ebad78de42fd711f17e2671e34577a86
+Subproject commit 3571feccf7c2bc68e4b619f6c367ac47d37c6723

frontend/src/common/css/main.css

@@ -65,10 +65,14 @@ html,body {
   border-right: 0 !important;
 }
 
-.adjust-table th:not([class*="el-table-column--selection"]) {
+.adjust-table th {
   border-right-color: white !important;
 }
 
+.adjust-table.ms-select-all-fixed th:first-child.el-table-column--selection {
+  border-right-color: #DCDFE6 !important;
+}
+
 .adjust-table {
   border-color: white !important;
 }