From 612de7a61536ef66c2098d8e397604ae7b0905c1 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Mon, 24 Jan 2022 00:34:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E3=80=90=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E3=80=91-=E5=85=B3=E8=81=94=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=94=A8=E4=BE=8B=E6=97=B6=E4=B8=8D=E8=83=BD=E9=80=89?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=89=88=E6=9C=AC=E3=80=91=20=20=20=20=20=20?=
 =?UTF-8?q?https://www.tapd.cn/55049933/bugtrace/bugs/view/115504993300100?=
 =?UTF-8?q?9870?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comonents/api/RelevanceScenarioList.vue   | 53 +++++++++++++++++--
 .../api/TestCaseScenarioRelevance.vue         |  5 ++
 .../plan/view/comonents/api/TestPlanApi.vue   |  1 +
 .../ReviewRelevanceScenarioList.vue           | 26 ++++++++-
 .../review/view/components/TestReviewApi.vue  |  3 ++
 .../TestReviewRelevanceScenario.vue           |  5 ++
 6 files changed, 87 insertions(+), 6 deletions(-)

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 d9f02d01c1..3a2337ba3f 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
@@ -11,13 +11,18 @@
                    :show-config-button-with-out-permission="showConfigButtonWithOutPermission"
                    :project-list="projectList"
                    ref="envPopover" class="env-popover"/>
+
+
+
       <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="search"
                 @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
       <ms-table-adv-search-bar :condition.sync="condition" class="adv-search-bar"
                                v-if="condition.components !== undefined && condition.components.length > 0"
                                @search="search"/>
+      <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"  margin-right="20"
+                      class="search-input"/>
 
-      <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll" @select="handleSelect">
+      <el-table ref="scenarioTable" border :data="tableData" class="adjust-table" @select-all="handleSelectAll" @select="handleSelect"  @filter-change="filter">
         <el-table-column type="selection"/>
         <el-table-column v-if="!customNum" prop="num" label="ID"
                          show-overflow-tooltip>
@@ -27,6 +32,17 @@
         </el-table-column>
         <el-table-column prop="name" :label="$t('api_test.automation.scenario_name')"
                          show-overflow-tooltip/>
+        <el-table-column
+          v-if="versionEnable"
+          column-key="version_id"
+          :filters="versionFilters"
+          :label="$t('commons.version')"
+          min-width="120px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column prop="level" :label="$t('api_test.automation.case_level')"
                          show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -77,6 +93,9 @@
   import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
   import {TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components";
   import {ENV_TYPE} from "@/common/js/constants";
+  const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+  const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
+  import {hasLicense, getCurrentProjectID} from "@/common/js/utils";
 
   export default {
     name: "RelevanceScenarioList",
@@ -91,7 +110,8 @@
       MsTag,
       MsApiReportDetail,
       MsTestPlanList,
-      MsTableAdvSearchBar
+      MsTableAdvSearchBar,
+      'VersionSelect': VersionSelect.default,
     },
     props: {
       referenced: {
@@ -101,6 +121,7 @@
       selectNodeIds: Array,
       projectId: String,
       planId: String,
+      versionEnable: Boolean,
     },
     data() {
       return {
@@ -125,7 +146,8 @@
         map: new Map(),
         customNum: false,
         environmentType: ENV_TYPE.JSON,
-        envGroupId: ""
+        envGroupId: "",
+        versionFilters: [],
       }
     },
     computed: {
@@ -143,6 +165,7 @@
     },
     created() {
       this.getWsProjects();
+      this.getVersionOptions();
     },
     methods: {
       search() {
@@ -154,8 +177,11 @@
         this.getProject(this.projectId);
         this.selectRows = new Set();
         this.loading = true;
-
-        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+        if (this.condition.filters) {
+          this.condition.filters.status = ["Prepare", "Underway", "Completed"];
+        } else {
+          this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+        }
 
         this.condition.moduleIds = this.selectNodeIds;
 
@@ -225,6 +251,23 @@
       },
       checkEnv() {
         return this.$refs.envPopover.checkEnv();
+      },
+      changeVersion(currentVersion) {
+        this.condition.versionId = currentVersion || null;
+        this.search();
+      },
+      getVersionOptions() {
+        if (hasLicense()) {
+          this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+            this.versionFilters = response.data.map(u => {
+              return {text: u.name, value: u.id};
+            });
+          });
+        }
+      },
+      filter(field) {
+        this.condition.filters = field || null;
+        this.search();
       }
     }
   }
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
index 0beda76780..127ffb7791 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseScenarioRelevance.vue
@@ -19,6 +19,7 @@
     <relevance-scenario-list
       :select-node-ids="selectNodeIds"
       :trash-enable="trashEnable"
+      :version-enable="versionEnable"
       :plan-id="planId"
       :project-id="projectId"
       ref="apiScenarioList"/>
@@ -65,6 +66,10 @@
       planId: {
         type: String
       },
+      versionEnable: {
+        type: Boolean,
+        default: false
+      }
     },
     watch: {
       planId() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
index b643e144a9..60a45f149a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApi.vue
@@ -79,6 +79,7 @@
       @refresh="refresh"
       :plan-id="planId"
       :model="model"
+      :version-enable="versionEnable"
       ref="scenarioCaseRelevance"/>
 
   </ms-test-plan-common-component>
diff --git a/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue b/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
index 6225163f7a..f5f7e14b10 100644
--- a/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
+++ b/frontend/src/business/components/track/review/view/components/ReviewRelevanceScenarioList.vue
@@ -10,6 +10,17 @@
 
         <el-table-column prop="name" :label="$t('api_test.automation.scenario_name')"
                          show-overflow-tooltip/>
+        <el-table-column
+          v-if="versionEnable"
+          prop="versionId"
+          :filters="versionFilters"
+          :label="$t('commons.version')"
+          min-width="120px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column prop="level" :label="$t('api_test.automation.case_level')"
                          show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -56,6 +67,7 @@ import MsTag from "@/business/components/common/components/MsTag";
 import EnvPopover from "@/business/components/track/common/EnvPopover";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import PriorityTableItem from "@/business/components/track/common/tableItems/planview/PriorityTableItem";
+import {hasLicense, getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "ReviewRelevanceScenarioList",
@@ -68,6 +80,7 @@ export default {
     selectNodeIds: Array,
     projectId: String,
     reviewId: String,
+    versionEnable: Boolean,
   },
   data() {
     return {
@@ -86,6 +99,7 @@ export default {
       projectEnvMap: new Map(),
       projectList: [],
       projectIds: new Set(),
+      versionFilters: []
     }
   },
   watch: {
@@ -98,6 +112,7 @@ export default {
   },
   created() {
     this.getWsProjects();
+    this.getVersionOptions();
   },
   methods: {
     search() {
@@ -159,7 +174,16 @@ export default {
     },
     checkEnv() {
       return this.$refs.envPopover.checkEnv();
-    }
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
+      }
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewApi.vue b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
index 5c031ba0c9..8d3b772afe 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewApi.vue
@@ -57,6 +57,7 @@
         v-if="model === 'scenario'"
         :select-node-ids="selectNodeIds"
         :trash-enable="trashEnable"
+        :version-enable="versionEnable"
         :review-id="reviewId"
         :clickType="clickType"
         @refresh="refreshTree"
@@ -66,12 +67,14 @@
     <test-review-relevance-api
       @refresh="refresh"
       :review-id="reviewId"
+      :version-enable="versionEnable"
       :model="model"
       ref="apiCaseRelevance"
     />
     <test-review-relevance-scenario
       @refresh="refresh"
       :review-id="reviewId"
+      :version-enable="versionEnable"
       :model="model"
       ref="scenarioCaseRelevance"
     />
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue
index 1ffb7c16aa..1ed020675a 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevanceScenario.vue
@@ -17,6 +17,7 @@
       :select-node-ids="selectNodeIds"
       :trash-enable="trashEnable"
       :review-id="reviewId"
+      :version-enable="versionEnable"
       :project-id="projectId"
       ref="apiScenarioList"/>
   </test-case-relevance-base>
@@ -48,6 +49,10 @@ export default {
     reviewId: {
       type: String
     },
+    versionEnable: {
+      type: Boolean,
+      default: false
+    }
   },
   watch: {
     reviewId() {