From 48e4b0806e4edf9bcc14283bac68e4da42da21aa Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 28 Jan 2021 15:30:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=B8=A4=E4=B8=AA=E4=B8=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=B8=8D=E5=90=8CprojectId=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/ApiDefinition.vue          | 29 +++++++++++--------
 .../api/definition/components/ApiConfig.vue   |  3 +-
 .../components/runtest/RunTestDubboPage.vue   |  8 ++---
 .../components/runtest/RunTestHTTPPage.vue    |  4 +--
 .../components/runtest/RunTestSQLPage.vue     |  8 ++---
 .../components/runtest/RunTestTCPPage.vue     |  4 +--
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index c872f3a654..b2492190de 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -59,6 +59,7 @@
           <div v-else-if="item.type=== 'ADD'" class="ms-api-div">
             <ms-api-config :syncTabs="syncTabs" @runTest="runTest" @saveApi="saveApi" @createRootModel="createRootModel" ref="apiConfig"
                            :current-api="item.api"
+                           :project-id="projectId"
                            :currentProtocol="currentProtocol"
                            :moduleOptions="moduleOptions"/>
           </div>
@@ -76,14 +77,14 @@
 
           <!-- 测试-->
           <div v-else-if="item.type=== 'TEST'" class="ms-api-div">
-            <ms-run-test-http-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
-                                   @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
-            <ms-run-test-tcp-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
-                                  @refresh="refresh" v-if="currentProtocol==='TCP'"/>
-            <ms-run-test-sql-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
-                                  @refresh="refresh" v-if="currentProtocol==='SQL'"/>
-            <ms-run-test-dubbo-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" @saveAsApi="editApi"
-                                    @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
+            <ms-run-test-http-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                   @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
+            <ms-run-test-tcp-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                  @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='TCP'"/>
+            <ms-run-test-sql-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                  @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='SQL'"/>
+            <ms-run-test-dubbo-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                    @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
           </div>
         </el-tab-pane>
 
@@ -186,8 +187,12 @@
         }],
         isApiListEnable: true,
         syncTabs: [],
+        projectId: ""
       }
     },
+    mounted() {
+      this.projectId = getCurrentProjectID();
+    },
     watch: {
       currentProtocol() {
         this.handleCommand("CLOSE_ALL");
@@ -248,7 +253,7 @@
         }
       },
       handleTabAdd(e) {
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
@@ -286,7 +291,7 @@
         this.$refs.nodeTree.createRootModel();
       },
       handleTabsEdit(targetName, action, api) {
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
@@ -325,7 +330,7 @@
           this.$warning('用例列表暂不支持导出，请切换成接口列表');
           return;
         }
-        let obj = {projectName: getCurrentProjectID(), protocol: this.currentProtocol}
+        let obj = {projectName: this.projectId, protocol: this.currentProtocol}
         if (this.$refs.apiList[0].selectRows && this.$refs.apiList[0].selectRows.size > 0) {
           let arr = Array.from(this.$refs.apiList[0].selectRows);
           obj.data = arr;
@@ -339,7 +344,7 @@
               ["status", ["Prepare", "Underway", "Completed"]],
             ]
           );
-          condition.projectId = getCurrentProjectID();
+          condition.projectId = this.projectId;
           this.$post(url, condition, response => {
             obj.data = response.data;
             this.buildApiPath(obj.data);
diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index be68994833..235431817c 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -38,7 +38,6 @@
         request: Sampler,
         config: {},
         response: {},
-        projectId: "",
         maintainerOptions: [],
       }
     },
@@ -47,9 +46,9 @@
       moduleOptions: {},
       currentProtocol: String,
       syncTabs: Array,
+      projectId: String
     },
     created() {
-      this.projectId = getCurrentProjectID();
       this.getMaintainerOptions();
       switch (this.currentProtocol) {
         case Request.TYPES.SQL:
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
index 8b1aa32bc4..1643d36bbb 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-  import {downloadFile, getUUID, getCurrentProjectID} from "@/common/js/utils";
+  import {downloadFile, getUUID} from "@/common/js/utils";
   import MsApiCaseList from "../case/ApiCaseList";
   import MsContainer from "../../../../common/components/MsContainer";
   import MsBottomContainer from "../BottomContainer";
@@ -89,7 +89,7 @@
         reportId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array, projectId: String},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -187,7 +187,7 @@
         }
       },
       getEnvironments() {
-        this.$get('/api/environment/list/' + getCurrentProjectID(), response => {
+        this.$get('/api/environment/list/' + this.projectId, response => {
           this.environments = response.data;
           this.environments.forEach(environment => {
             parseEnvironment(environment);
@@ -207,7 +207,7 @@
         });
       },
       openEnvironmentConfig() {
-        this.$refs.environmentConfig.open(getCurrentProjectID());
+        this.$refs.environmentConfig.open(this.projectId);
       },
       environmentChange(value) {
         for (let i in this.environments) {
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 3104935d8a..86e599809c 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -110,10 +110,9 @@
         },
         runData: [],
         reportId: "",
-        projectId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String, syncTabs: Array},
+    props: {apiData: {}, currentProtocol: String, syncTabs: Array, projectId: String},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -232,7 +231,6 @@
       }
     },
     created() {
-      this.projectId = getCurrentProjectID();
       // 深度复制
       this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
index c58872bb76..68af7c8962 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-  import {downloadFile, getUUID, getCurrentProjectID} from "@/common/js/utils";
+  import {downloadFile, getUUID} from "@/common/js/utils";
   import MsApiCaseList from "../case/ApiCaseList";
   import MsContainer from "../../../../common/components/MsContainer";
   import MsBottomContainer from "../BottomContainer";
@@ -89,7 +89,7 @@
         reportId: "",
       }
     },
-    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array, projectId: String},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -186,7 +186,7 @@
         }
       },
       getEnvironments() {
-        this.$get('/api/environment/list/' + getCurrentProjectID(), response => {
+        this.$get('/api/environment/list/' + this.projectId, response => {
           this.environments = response.data;
           this.environments.forEach(environment => {
             parseEnvironment(environment);
@@ -206,7 +206,7 @@
         });
       },
       openEnvironmentConfig() {
-        this.$refs.environmentConfig.open(getCurrentProjectID());
+        this.$refs.environmentConfig.open(this.projectId);
       },
       environmentChange(value) {
         for (let i in this.environments) {
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
index eb1e147d17..e259438d5a 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
@@ -96,10 +96,9 @@
         },
         runData: [],
         reportId: "",
-        projectId: ""
       }
     },
-    props: {apiData: {}, currentProtocol: String,syncTabs: Array},
+    props: {apiData: {}, currentProtocol: String,syncTabs: Array, projectId: String},
     methods: {
       handleCommand(e) {
         switch (e) {
@@ -214,7 +213,6 @@
       this.api = JSON.parse(JSON.stringify(this.apiData));
       this.api.protocol = this.currentProtocol;
       this.currentRequest = this.api.request;
-      this.projectId = getCurrentProjectID();
       this.getResult();
     }
   }