From bf855e4f62fdd5120bcda0e5bc28be8910ac170c Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 10 Feb 2023 15:14:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E4=BB=A5=E5=8F=8A=E7=89=88=E6=9C=AC=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1022722 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001022722
--bug=1022720 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001022720
---
 api-test/frontend/src/api/xpack.js            |  4 ++
 .../components/reference/ShowReference.vue    | 63 ++++++++++++-------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/api-test/frontend/src/api/xpack.js b/api-test/frontend/src/api/xpack.js
index bb1af2a429..039665ab0a 100644
--- a/api-test/frontend/src/api/xpack.js
+++ b/api-test/frontend/src/api/xpack.js
@@ -24,6 +24,10 @@ export function getProjectVersions(projectId) {
   return get('/project/version/get-project-versions/' + projectId);
 }
 
+export function getVersionsByProjectIds(param) {
+  return post('/project/version/get-versions', param);
+}
+
 export function versionEnableByProjectId(projectId) {
   return get('/project/version/enable/' + projectId);
 }
diff --git a/api-test/frontend/src/business/definition/components/reference/ShowReference.vue b/api-test/frontend/src/business/definition/components/reference/ShowReference.vue
index 3048502294..76788dbca6 100644
--- a/api-test/frontend/src/business/definition/components/reference/ShowReference.vue
+++ b/api-test/frontend/src/business/definition/components/reference/ShowReference.vue
@@ -167,15 +167,21 @@
 </template>
 <script>
 import MsTablePagination from 'metersphere-frontend/src/components/pagination/TablePagination';
-import { apiProjectRelated, getOwnerProjectIds, getProject, getUserWorkspace, projectRelated } from '@/api/project';
-import { getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId } from 'metersphere-frontend/src/utils/token';
+import {
+  getOwnerProjectIds,
+  getOwnerProjects,
+  getProject,
+  getUserWorkspace,
+  projectRelated
+} from '@/api/project';
+import {getCurrentProjectID, getCurrentUserId, getCurrentWorkspaceId} from 'metersphere-frontend/src/utils/token';
 import {getUUID} from 'metersphere-frontend/src/utils';
 import {hasLicense} from 'metersphere-frontend/src/utils/permission';
 import {getDefinitionReference, getPlanReference} from '@/api/definition';
 import MsTable from 'metersphere-frontend/src/components/table/MsTable';
 import MsTableColumn from 'metersphere-frontend/src/components/table/MsTableColumn';
 import MsTabButton from '@/business/commons/MsTabs';
-import {getProjectVersions} from "@/api/xpack";
+import {getVersionsByProjectIds} from "@/api/xpack";
 
 export default {
   name: 'ShowReference',
@@ -247,23 +253,34 @@ export default {
         this.projectList = res.data ? res.data : [];
       });
     },
-    getVersionOptions(currentVersion) {
+    getVersionOptions(projectIds, data) {
+      if (!projectIds || projectIds.length === 0) {
+        projectIds = [];
+      }
       if (hasLicense()) {
-        getProjectVersions(getCurrentProjectID()).then((response) => {
-          if (currentVersion) {
-            this.versionFilters = response.data
-              .filter((u) => u.id === currentVersion)
-              .map((u) => {
-                return {text: u.name, value: u.id};
-              });
+        getVersionsByProjectIds(projectIds).then((response) => {
+          if (this.projectFilters.length === 0 || !this.projectFilters.length) {
+            this.versionFilters = [];
           } else {
-            this.versionFilters = response.data.map((u) => {
-              return {text: u.name, value: u.id};
+            this.versionFilters = response.data.filter((version) => {
+              return data.listObject.find((i) => i.versionId === version.id);
+            }).map((u) => {
+              return {text: u.name + "-" + this.getProjectName(u.projectId), value: u.id};
             });
           }
         });
       }
     },
+    getProjectName(id) {
+      let name
+      for (let item of this.projectFilters) {
+        if (item.value === id) {
+          name = item.text;
+          break;
+        }
+      }
+      return name;
+    },
     /**
      * 操作方法
      */
@@ -281,7 +298,6 @@ export default {
       this.init();
       this.getUserProjectList();
       this.getWorkSpaceList();
-      this.getVersionOptions();
       this.isVisible = true;
       this.scenarioId = row.id;
       this.type = type;
@@ -318,17 +334,16 @@ export default {
               workspaceIds.push(item.value);
             });
           }
-          apiProjectRelated({
-            userId: getCurrentUserId(),
-            workspaceIds: workspaceIds,
-          }).then((res) => {
+          getOwnerProjects().then((res) => {
             this.projectFilters = res.data
-              .filter((project) => {
-                return data.listObject.find((i) => i.projectId === project.id);
-              })
-              .map((e) => {
-                return {text: e.name, value: e.id};
-              });
+                .filter((project) => {
+                  return data.listObject.find((i) => i.projectId === project.id);
+                })
+                .map((e) => {
+                  return {text: e.name, value: e.id};
+                });
+            let map = res.data.map(item => item.id);
+            this.getVersionOptions(map, data);
           });
         }
         this.scenarioData = data.listObject || [];