From 532007f25d23f04532e0ee9b3f854c72199ba6a3 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Feb 2021 18:24:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E8=B7=A8?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ApiDefinitionService.java     |   8 +-
 .../automation/scenario/ApiScenarioModule.vue |   4 +-
 .../automation/scenario/api/ApiRelevance.vue  | 149 ++++++++++--------
 .../scenario/api/RelevanceApiList.vue         |   9 +-
 .../scenario/api/RelevanceCaseList.vue        |   9 +-
 .../scenario/api/ScenarioRelevance.vue        |   6 +-
 .../scenario/component/ApiComponent.vue       |   5 +-
 .../api/definition/components/Run.vue         |   2 +-
 .../components/module/ApiModule.vue           |   4 +-
 .../comonents/base/TestCaseRelevanceBase.vue  |   8 +-
 10 files changed, 116 insertions(+), 88 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 7ee46aa7a1..cc58b14e73 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -437,11 +437,9 @@ public class ApiDefinitionService {
         Map<String, EnvironmentConfig> envConfig = new HashMap<>();
         Map<String, String> map = request.getEnvironmentMap();
         if (map != null && map.size() > 0) {
-            map.keySet().forEach(id -> {
-                ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(id));
-                EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-                envConfig.put(id, env);
-            });
+            ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(request.getProjectId()));
+            EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+            envConfig.put(request.getProjectId(), env);
             config.setConfig(envConfig);
         }
 
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 3e53c9b4a5..de524efdf7 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -150,14 +150,14 @@
             break;
         }
       },
-      list() {
+      list(projectId) {
         let url = undefined;
         if (this.isPlanModel) {
           url = '/api/automation/module/list/plan/' + this.planId;
         } else if (this.isRelevanceModel) {
           url = "/api/automation/module/list/" + this.relevanceProjectId;
         } else {
-          url = "/api/automation/module/list/" + this.projectId;
+          url = "/api/automation/module/list/" + (projectId ? projectId : this.projectId);
           if (!this.projectId) {
             return;
           }
diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
index f93ba6fda0..d6dbdccc9d 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
@@ -1,8 +1,11 @@
 <template>
-  <relevance-dialog :title="$t('api_test.definition.api_import')" ref="relevanceDialog">
-
+  <test-case-relevance-base
+    @setProject="setProject"
+    :dialog-title="$t('api_test.definition.api_import')"
+    ref="baseRelevance">
     <template v-slot:aside>
       <ms-api-module
+        style="margin-top: 5px;"
         @nodeSelectEvent="nodeChange"
         @protocolChange="handleProtocolChange"
         @refreshTable="refresh"
@@ -13,6 +16,7 @@
 
     <scenario-relevance-api-list
       v-if="isApiListEnable"
+      :project-id="projectId"
       :current-protocol="currentProtocol"
       :select-node-ids="selectNodeIds"
       :is-api-list-enable="isApiListEnable"
@@ -21,6 +25,7 @@
 
     <scenario-relevance-case-list
       v-if="!isApiListEnable"
+      :project-id="projectId"
       :current-protocol="currentProtocol"
       :select-node-ids="selectNodeIds"
       :is-api-list-enable="isApiListEnable"
@@ -33,8 +38,7 @@
         {{ $t('api_test.scenario.reference') }}
       </el-button>
     </template>
-
-  </relevance-dialog>
+  </test-case-relevance-base>
 </template>
 
 <script>
@@ -45,10 +49,12 @@ import MsAsideContainer from "../../../../common/components/MsAsideContainer";
 import MsMainContainer from "../../../../common/components/MsMainContainer";
 import ScenarioRelevanceApiList from "./RelevanceApiList";
 import RelevanceDialog from "../../../../track/plan/view/comonents/base/RelevanceDialog";
+import TestCaseRelevanceBase from "@/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase";
 
 export default {
   name: "ApiRelevance",
   components: {
+    TestCaseRelevanceBase,
     RelevanceDialog,
     ScenarioRelevanceApiList,
     MsMainContainer, MsAsideContainer, MsContainer, MsApiModule, ScenarioRelevanceCaseList
@@ -58,67 +64,82 @@ export default {
       result: {},
       currentProtocol: null,
       selectNodeIds: [],
-            moduleOptions: {},
-            isApiListEnable: true,
-          }
-      },
-      methods: {
-        reference() {
-          this.save('REF');
-        },
-        copy() {
-          this.save('Copy');
-        },
-        save(reference) {
-          if (this.isApiListEnable) {
-            this.$emit('save', this.$refs.apiList.selectRows, 'API', reference);
-            this.close();
-          } else {
-            let apiCases = this.$refs.apiCaseList.selectRows;
-            let ids = Array.from(apiCases).map(row => row.id);
-            this.result = this.$post("/api/testcase/get/request", {ids: ids}, (response) => {
-              apiCases.forEach((item) => {
-                item.request = response.data[item.id];
-              });
-              this.$emit('save', apiCases, 'CASE', reference);
-              this.close();
-            });
-          }
-        },
-        close() {
-          this.refresh();
-          this.$refs.relevanceDialog.close();
-        },
-        open() {
-          if (this.$refs.apiList) {
-            this.$refs.apiList.clearSelection();
-          }
-          if (this.$refs.apiCaseList) {
-            this.$refs.apiCaseList.clearSelection();
-          }
-          this.$refs.relevanceDialog.open();
-        },
-        isApiListEnableChange(data) {
-          this.isApiListEnable = data;
-        },
-        nodeChange(node, nodeIds, pNodes) {
-          this.selectNodeIds = nodeIds;
-        },
-        handleProtocolChange(protocol) {
-          this.currentProtocol = protocol;
-        },
-        setModuleOptions(data) {
-          this.moduleOptions = data;
-        },
-        refresh() {
-          if (this.isApiListEnable) {
-            this.$refs.apiList.initTable();
-          } else {
-            this.$refs.apiCaseList.initTable();
-          }
-        },
-      }
+      moduleOptions: {},
+      isApiListEnable: true,
+      projectId: ""
     }
+  },
+  watch: {
+    projectId() {
+      this.refresh();
+      this.$refs.nodeTree.list(this.projectId);
+    }
+  },
+  methods: {
+    reference() {
+      this.save('REF');
+    },
+    copy() {
+      this.save('Copy');
+    },
+    save(reference) {
+      if (this.isApiListEnable) {
+        let apis = this.$refs.apiList.selectRows;
+        apis.forEach(api => {
+          api.projectId = this.projectId;
+        })
+        this.$emit('save', this.$refs.apiList.selectRows, 'API', reference);
+        this.$refs.baseRelevance.close();
+      } else {
+        let apiCases = this.$refs.apiCaseList.selectRows;
+        let ids = Array.from(apiCases).map(row => row.id);
+        this.result = this.$post("/api/testcase/get/request", {ids: ids}, (response) => {
+          apiCases.forEach((item) => {
+            item.request = response.data[item.id];
+            item.projectId = this.projectId;
+          });
+          this.$emit('save', apiCases, 'CASE', reference);
+          this.$refs.baseRelevance.close();
+        });
+      }
+    },
+    close() {
+      this.refresh();
+      this.$refs.relevanceDialog.close();
+    },
+    open() {
+      if (this.$refs.apiList) {
+        this.$refs.apiList.clearSelection();
+      }
+      if (this.$refs.apiCaseList) {
+        this.$refs.apiCaseList.clearSelection();
+      }
+      this.$refs.baseRelevance.open();
+    },
+    isApiListEnableChange(data) {
+      this.isApiListEnable = data;
+    },
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    handleProtocolChange(protocol) {
+      this.currentProtocol = protocol;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+    refresh() {
+      if (this.isApiListEnable) {
+        this.$refs.apiList.initTable(this.projectId);
+      } else {
+        this.$refs.apiCaseList.initTable(this.projectId);
+      }
+    },
+    setProject(projectId) {
+      this.projectId = projectId;
+    },
+  }
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index 8b2270f704..d41d84b82a 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -178,18 +178,19 @@ export default {
     isApiListEnableChange(data) {
       this.$emit('isApiListEnableChange', data);
     },
-    initTable() {
+    initTable(projectId) {
       this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
       this.condition.moduleIds = this.selectNodeIds;
       if (this.trashEnable) {
         this.condition.filters = {status: ["Trash"]};
         this.condition.moduleIds = [];
       }
-      if (this.projectId != null) {
+      if (projectId != null && typeof projectId === 'string') {
+        this.condition.projectId = projectId;
+      } else if (this.projectId != null) {
         this.condition.projectId = this.projectId;
-      } else {
-        this.condition.projectId = getCurrentProjectID();
       }
+
       if (this.currentProtocol != null) {
         this.condition.protocol = this.currentProtocol;
       }else{
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
index 37ba68459b..cb3433ce13 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
@@ -164,14 +164,13 @@ export default {
       isApiListEnableChange(data) {
         this.$emit('isApiListEnableChange', data);
       },
-      initTable() {
+      initTable(projectId) {
         this.condition.status = "";
         this.condition.moduleIds = this.selectNodeIds;
-        if (this.projectId != null) {
+        if (projectId != null && typeof projectId === 'string') {
+          this.condition.projectId = projectId;
+        } else if (this.projectId != null) {
           this.condition.projectId = this.projectId;
-        } else {
-          this.condition.projectId = getCurrentProjectID();
-
         }
         if (this.currentProtocol != null) {
           this.condition.protocol = this.currentProtocol;
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 29ff7fb1c4..5f089a65b7 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue
@@ -1,9 +1,11 @@
 <template>
   <test-case-relevance-base
+    :dialog-title="$t('api_test.automation.scenario_import')"
     @setProject="setProject"
     ref="baseRelevance">
     <template v-slot:aside>
       <ms-api-scenario-module
+        style="margin-top: 5px;"
         @nodeSelectEvent="nodeChange"
         @refreshTable="refresh"
         @setModuleOptions="setModuleOptions"
@@ -27,12 +29,9 @@
 </template>
 
 <script>
-  import ScenarioRelevanceCaseList from "./RelevanceCaseList";
-  import MsApiModule from "../../../definition/components/module/ApiModule";
   import MsContainer from "../../../../common/components/MsContainer";
   import MsAsideContainer from "../../../../common/components/MsAsideContainer";
   import MsMainContainer from "../../../../common/components/MsMainContainer";
-  import ScenarioRelevanceApiList from "./RelevanceApiList";
   import MsApiScenarioModule from "../ApiScenarioModule";
   import MsApiScenarioList from "../ApiScenarioList";
   import {getUUID} from "../../../../../../common/js/utils";
@@ -63,6 +62,7 @@
     watch: {
       projectId() {
         this.$refs.apiScenarioList.search(this.projectId);
+        this.$refs.nodeTree.list(this.projectId);
       }
     },
     methods: {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 1bfc9ebdc0..40189f0feb 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -104,7 +104,10 @@
       if (!this.request.requestResult) {
         this.request.requestResult = {responseResult: {}};
       }
-      this.request.projectId = getCurrentProjectID();
+      // 跨项目关联，如果没有ID，则赋值本项目ID
+      if (!this.request.projectId) {
+        this.request.projectId = getCurrentProjectID();
+      }
       // 加载引用对象数据
       this.getApiInfo();
       if (this.request.protocol === 'HTTP') {
diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index 18331f0e80..4156d1cae6 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/frontend/src/business/components/api/definition/components/Run.vue
@@ -74,7 +74,7 @@ import {getUUID, getBodyUploadFiles, getCurrentProjectID, strMapToObj} from "@/c
           // 场景步骤下接口调用
           projectId = this.runData.projectId;
         }
-        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId:getCurrentProjectID(), environmentMap: strMapToObj(this.envMap)};
+        let reqObj = {id: this.reportId, testElement: testPlan, type: this.type,projectId: projectId, environmentMap: strMapToObj(this.envMap)};
         let bodyFiles = getBodyUploadFiles(reqObj, this.runData);
         let url = "";
         if (this.debug) {
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index d715896968..3d3feae393 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -107,14 +107,14 @@ export default {
       }
     },
     methods: {
-      list() {
+      list(projectId) {
         let url = undefined;
         if (this.isPlanModel) {
           url = '/api/module/list/plan/' + this.planId + '/' + this.condition.protocol;
         } else if (this.isRelevanceModel) {
           url = "/api/module/list/" + this.relevanceProjectId + "/" + this.condition.protocol;
         } else {
-          url = "/api/module/list/" + this.projectId + "/" + this.condition.protocol;
+          url = "/api/module/list/" + (projectId ? projectId : this.projectId) + "/" + this.condition.protocol;
           if (!this.projectId) {
             return;
           }
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 23355459ee..f9a6d4eb04 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -1,5 +1,5 @@
 <template>
-  <relevance-dialog :title="$t('test_track.plan_view.relevance_test_case')"  ref="relevanceDialog">
+  <relevance-dialog :title="dialogTitle"  ref="relevanceDialog">
 
     <template v-slot:aside>
       <select-menu
@@ -51,6 +51,12 @@
     props: {
       planId: {
         type: String
+      },
+      dialogTitle: {
+        type: String,
+        default() {
+          return this.$t('test_track.plan_view.relevance_test_case');
+        }
       }
     },
     watch: {