From 5f4aa0f22707136c7e61ffd6afebbfa2c5fa0aaa Mon Sep 17 00:00:00 2001
From: wenyann <wenyan.yang@fit2cloud.com>
Date: Mon, 10 May 2021 15:10:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E5=9C=BA=E6=99=AF=E6=9B=B4=E6=96=B0=E6=97=B6=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=B8=8D=E5=8F=98=EF=BC=8C=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E8=80=8C=E9=9D=9E=E5=88=9B=E5=BB=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V82__v1.9.2_release.sql      | 21 ++++++++++++++-----
 .../automation/scenario/ApiScenarioList.vue   | 12 +++++++++--
 .../components/common/model/JsonData.js       |  1 +
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V82__v1.9.2_release.sql b/backend/src/main/resources/db/migration/V82__v1.9.2_release.sql
index 3218ff61bc..5d8b5b5732 100644
--- a/backend/src/main/resources/db/migration/V82__v1.9.2_release.sql
+++ b/backend/src/main/resources/db/migration/V82__v1.9.2_release.sql
@@ -1,9 +1,20 @@
 -- 缺陷添加创建人字段
-ALTER TABLE issues ADD creator varchar(50) NULL COMMENT 'Creator';
+ALTER TABLE issues
+    ADD creator varchar(50) NULL COMMENT 'Creator';
 
 -- 删除创建人的自定义字段
-delete cft,cf from custom_field_template cft,custom_field cf
-    where cft.field_id = cf.id and cf.name = '创建人' and cf.scene = 'ISSUE';
+delete cft,cf
+from custom_field_template cft,
+     custom_field cf
+where cft.field_id = cf.id
+  and cf.name = '创建人'
+  and cf.scene = 'ISSUE';
 
-alter table project add scenario_custom_num tinyint(1) default 0 null comment '是否开启场景自定义ID(默认关闭)';
-alter table api_scenario add custom_num varchar(64) null comment 'custom num';
\ No newline at end of file
+alter table project
+    add scenario_custom_num tinyint(1) default 0 null comment '是否开启场景自定义ID(默认关闭)';
+alter table api_scenario
+    add custom_num varchar(64) null comment 'custom num';
+-- 场景表头修改
+update system_header
+set props='[{"id":"num","label":"ID"},{"id":"name","label":"场景名称"},{"id":"level","label":"用例等级"},{"id":"status","label":"当前状态"},{"id":"tags","label":"标签"},{"id":"principal","label":"负责人"},{"id":"updateTime","label":"最后更新时间"},{"id":"stepTotal","label":"步骤数"},{"id":"lastResult","label":"最后结果"},{"id":"passRate","label":"通过率"}]'
+where type = 'api_scenario_list';
\ No newline at end of file
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index d5a0db6407..5e6390db99 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -81,14 +81,22 @@
           <el-table-column v-if="item.id == 'tags'" prop="tags" min-width="120px"
                            :label="$t('api_test.automation.tag')" :key="index">
             <template v-slot:default="scope">
-              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain" :content="itemName" :show-tooltip="true"
+              <ms-tag v-for="(itemName,index)  in scope.row.tags" :key="index" type="success" effect="plain"
+                      :content="itemName" :show-tooltip="true"
                       tooltip style="margin-left: 0px; margin-right: 2px"/>
             </template>
           </el-table-column>
+          <el-table-column v-if="item.id == 'principal'" prop="principal" min-width="120px"
+                           :label="$t('api_test.definition.api_principal')"
+                           :filters="userFilters"
+                           column-key="principal"
+                           sortable="custom"
+                           show-overflow-tooltip
+                           :key="index"/>
           <el-table-column v-if="item.id == 'userId'" prop="userId" min-width="120px"
                            :label="$t('api_test.automation.creator')"
                            :filters="userFilters"
-                           column-key="user_id"
+                           column-key="userId"
                            sortable="custom"
                            show-overflow-tooltip
                            :key="index"/>
diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js
index d08e82360e..39b693a03b 100644
--- a/frontend/src/business/components/common/model/JsonData.js
+++ b/frontend/src/business/components/common/model/JsonData.js
@@ -69,6 +69,7 @@ export const Api_Scenario_List = [
   {id: 'status', label: i18n.t('test_track.plan.plan_status')},
   {id: 'tags', label: i18n.t('commons.tag')},
   {id: 'userId', label: i18n.t('api_test.automation.creator')},
+  {id: 'principal', label: i18n.t('api_test.definition.api_principal')},
   {id: 'updateTime', label: i18n.t('api_test.definition.api_last_time')},
   {id: 'stepTotal', label: i18n.t('api_test.automation.step')},
   {id: 'lastResult', label: i18n.t('api_test.automation.last_result')},