From ffbec714ae1a3c33b63def73914d08562d207874 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 1 Dec 2021 19:08:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=90=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=9E=8B=E8=B7=B3=E8=BD=AC=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=8E=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008454 --user=郭雨琦 项目A导入项目B中的场景，项目B的id链接跳转后仍显示项目A --bug=1008453
【接口自动化】-dubbo 的ID链接跳转协议显示不正确，是http协议
---
 .../components/api/automation/ApiAutomation.vue      |  7 +++++++
 .../automation/scenario/component/ApiComponent.vue   |  2 +-
 .../scenario/component/ApiScenarioComponent.vue      |  2 +-
 .../api/automation/scenario/component/urlhelper.js   | 10 +++++-----
 .../components/api/definition/ApiDefinition.vue      |  9 +++++++++
 .../api/definition/components/module/ApiModule.vue   | 12 +++++++++---
 frontend/src/business/components/api/router.js       |  4 ++--
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index ba751d4512..6fd091c1b3 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -98,6 +98,7 @@
 <script>
 
 import {getCurrentProjectID, getCurrentUser, getUUID, hasPermission} from "@/common/js/utils";
+import {PROJECT_ID} from "@/common/js/constants";
 
 export default {
   name: "ApiAutomation",
@@ -149,6 +150,12 @@ export default {
       initApiTableOpretion: 'init',
     };
   },
+  created() {
+    let projectId = this.$route.params.projectId;
+    if(projectId){
+      sessionStorage.setItem(PROJECT_ID, projectId);
+    }
+  },
   mounted() {
     this.getProject();
     this.getTrashCase();
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 6fcba534c1..0669ff5b69 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -637,7 +637,7 @@ export default {
       if(resource.refType&&resource.refType==='API'){
         let definitionData = this.$router.resolve({
           name: 'ApiDefinition',
-          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id}
+          params: {redirectID: getUUID(), dataType: "api", dataSelectRange: 'edit:' + resource.id,projectId:resource.projectId,type:resource.protocol}
         });
         window.open(definitionData.href, '_blank');
       }else if(resource.refType&&resource.refType==='CASE'){
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index a8639ca434..173b4adf9a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -273,7 +273,7 @@ export default {
     clickResource(resource) {
       let automationData = this.$router.resolve({
         name: 'ApiAutomation',
-        params: {redirectID: getUUID(), dataType: "scenario", dataSelectRange: 'edit:' + resource.id}
+        params: {redirectID: getUUID(), dataType: "scenario", dataSelectRange: 'edit:' + resource.id,projectId:resource.projectId}
       });
       window.open(automationData.href, '_blank');
     },
diff --git a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
index 8098059c73..6296ec3dca 100644
--- a/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
+++ b/frontend/src/business/components/api/automation/scenario/component/urlhelper.js
@@ -18,7 +18,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
         break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
         break;
       }
       break;
@@ -28,7 +28,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -38,7 +38,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -48,7 +48,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
@@ -58,7 +58,7 @@ export function getUrl(d) {
           url += "/api/definition?resourceId=" + resourceId;
           break;
         case "CASE":
-          url += "/api/definition?caseId=" + d.id;
+          url += "/api/definition?caseId=" + d.id+"&projectId="+d.projectId;
           break;
       }
       break;
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 11463c908b..fd2bc98efc 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -254,6 +254,7 @@ import MockConfig from "@/business/components/api/definition/components/mock/Moc
 import ApiSchedule from "@/business/components/api/definition/components/import/ApiSchedule";
 import MsEditCompleteContainer from "./components/EditCompleteContainer";
 import MsEnvironmentSelect from "./components/case/MsEnvironmentSelect";
+import {PROJECT_ID} from "@/common/js/constants";
 
 
 export default {
@@ -371,6 +372,7 @@ export default {
   },
   watch: {
     currentProtocol() {
+      debugger
       if (this.activeDom === 'right') {
         this.activeDom = 'left';
       }
@@ -397,6 +399,13 @@ export default {
     },
   },
   created() {
+    let projectId = this.$route.params.projectId;
+    if(projectId){
+      sessionStorage.setItem(PROJECT_ID, projectId);
+    }
+    if (this.$route.query.projectId){
+      sessionStorage.setItem(PROJECT_ID, this.$route.query.projectId);
+    }
     this.getEnv();
     // 通知过来的数据跳转到编辑
     if (this.$route.query.caseId) {
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 1a414e68ad..3402362cc7 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -145,11 +145,17 @@
     },
     methods: {
       initProtocol() {
-        this.$get('/api/module/getUserDefaultApiType/', response => {
-          this.condition.protocol = response.data;
+        if(this.$route.params.type){
+          this.condition.protocol = this.$route.params.type;
           this.$emit('protocolChange', this.condition.protocol);
           this.list();
-        });
+        }else {
+          this.$get('/api/module/getUserDefaultApiType/', response => {
+            this.condition.protocol = response.data;
+            this.$emit('protocolChange', this.condition.protocol);
+            this.list();
+          });
+        }
       },
       filter() {
         this.$refs.nodeTree.filter(this.condition.filterText);
diff --git a/frontend/src/business/components/api/router.js b/frontend/src/business/components/api/router.js
index e5e9bf53f9..22a09f92aa 100644
--- a/frontend/src/business/components/api/router.js
+++ b/frontend/src/business/components/api/router.js
@@ -40,12 +40,12 @@ export default {
 
     },
     {
-      path: "definition/:redirectID?/:dataType?/:dataSelectRange?",
+      path: "definition/:redirectID?/:dataType?/:dataSelectRange?/:projectId?/:type?",
       name: "ApiDefinition",
       component: () => import('@/business/components/api/definition/ApiDefinition'),
     },
     {
-      path: "automation/:redirectID?/:dataType?/:dataSelectRange?",
+      path: "automation/:redirectID?/:dataType?/:dataSelectRange?/:projectId?",
       name: "ApiAutomation",
       component: () => import('@/business/components/api/automation/ApiAutomation'),
     },