From 52143b18948bbcd0e34338343c2c3f924b01a562 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 13 May 2021 12:16:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=87=AA=E5=AE=9A=E4=B9=89ID?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/api/ScenarioRelevance.vue        | 16 +++++++++++---
 .../comonents/api/RelevanceScenarioList.vue   | 21 +++++++++++++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
index b1f5f2da0a..e51aaf5c03 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -20,6 +20,7 @@
       :referenced="true"
       :trash-enable="false"
       @selection="setData"
+      :custom-num="customNum"
       ref="apiScenarioList"/>
 
     <template v-slot:footer>
@@ -57,13 +58,22 @@
         isApiListEnable: true,
         currentScenario: [],
         currentScenarioIds: [],
-        projectId: ''
+        projectId: '',
+        customNum: false
       }
     },
     watch: {
-      projectId() {
-        this.$refs.apiScenarioList.search(this.projectId);
+      projectId(val) {
         this.$refs.nodeTree.list(this.projectId);
+        if (val) {
+          this.$get("/project/get/" + val, result => {
+            let data = result.data;
+            if (data) {
+              this.customNum = data.scenarioCustomNum;
+            }
+          });
+        }
+        this.$refs.apiScenarioList.search(this.projectId);
       }
     },
     methods: {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
index 8f21b688e6..f54747f5cb 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -16,7 +16,12 @@
 
       <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll" @select="handleSelect">
         <el-table-column type="selection"/>
-
+        <el-table-column v-if="!customNum" prop="num" label="ID"
+                         show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column v-if="customNum" prop="customNum" label="ID"
+                         show-overflow-tooltip>
+        </el-table-column>
         <el-table-column prop="name" :label="$t('api_test.automation.scenario_name')"
                          show-overflow-tooltip/>
         <el-table-column prop="level" :label="$t('api_test.automation.case_level')"
@@ -102,7 +107,8 @@
         projectEnvMap: new Map(),
         projectList: [],
         projectIds: new Set(),
-        map: new Map()
+        map: new Map(),
+        customNum: false
       }
     },
     watch: {
@@ -123,6 +129,7 @@
         if (!this.projectId) {
           return;
         }
+        this.getProject(this.projectId);
         this.selectRows = new Set();
         this.loading = true;
 
@@ -166,6 +173,16 @@
           this.projectList = res.data;
         })
       },
+      getProject(projectId) {
+        if (projectId) {
+          this.$get("/project/get/" + projectId, result => {
+            let data = result.data;
+            if (data) {
+              this.customNum = data.scenarioCustomNum;
+            }
+          });
+        }
+      },
       initProjectIds() {
         this.projectIds.clear();
         this.map.clear();