From 3aa0d05d667bb6648da73918df4280b034714fcd Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 4 Feb 2021 19:24:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=A6=E5=AD=98=E4=B8=BA=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=8A=A5id=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/ApiConfig.vue   | 42 ++++++++---------
 .../components/runtest/RunTestDubboPage.vue   | 46 ++++++++++---------
 .../components/runtest/RunTestSQLPage.vue     |  4 +-
 .../components/runtest/RunTestTCPPage.vue     | 46 ++++++++++---------
 4 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index 84fb71cc1d..b3adcaf920 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -17,29 +17,29 @@
 </template>
 
 <script>
-  import MsEditCompleteHttpApi from "./complete/EditCompleteHTTPApi";
-  import MsEditCompleteTcpApi from "./complete/EditCompleteTCPApi";
-  import MsEditCompleteDubboApi from "./complete/EditCompleteDubboApi";
-  import MsEditCompleteSqlApi from "./complete/EditCompleteSQLApi";
+import MsEditCompleteHttpApi from "./complete/EditCompleteHTTPApi";
+import MsEditCompleteTcpApi from "./complete/EditCompleteTCPApi";
+import MsEditCompleteDubboApi from "./complete/EditCompleteDubboApi";
+import MsEditCompleteSqlApi from "./complete/EditCompleteSQLApi";
 
-  import {ResponseFactory, Body} from "../model/ApiTestModel";
-  import {getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import {createComponent, Request} from "./jmeter/components";
-  import Sampler from "./jmeter/components/sampler/sampler";
-  import {WORKSPACE_ID} from '@/common/js/constants';
-  import {handleCtrlSEvent} from "../../../../../common/js/utils";
+import {Body} from "../model/ApiTestModel";
+import {getUUID} from "@/common/js/utils";
+import {createComponent, Request} from "./jmeter/components";
+import Sampler from "./jmeter/components/sampler/sampler";
+import {WORKSPACE_ID} from '@/common/js/constants';
+import {handleCtrlSEvent} from "../../../../../common/js/utils";
 
-  export default {
-    name: "ApiConfig",
-    components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
-    data() {
-      return {
-        reqUrl: "",
-        request: Sampler,
-        config: {},
-        response: {},
-        maintainerOptions: [],
-      }
+export default {
+  name: "ApiConfig",
+  components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
+  data() {
+    return {
+      reqUrl: "",
+      request: Sampler,
+      config: {},
+      response: {},
+      maintainerOptions: [],
+    }
     },
     props: {
       currentApi: {},
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 1643d36bbb..bdf5efc266 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
@@ -44,29 +44,29 @@
 </template>
 
 <script>
-  import {downloadFile, getUUID} from "@/common/js/utils";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import {parseEnvironment} from "../../model/EnvironmentModel";
-  import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
-  import MsRequestResultTail from "../response/RequestResultTail";
-  import MsRun from "../Run";
-  import MsBasisParameters from "../request/dubbo/BasisParameters";
-  import {REQ_METHOD} from "../../model/JsonData";
-  import MsJmxStep from "../step/JmxStep";
+import {getUUID, uuid} from "@/common/js/utils";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import {parseEnvironment} from "../../model/EnvironmentModel";
+import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
+import MsRequestResultTail from "../response/RequestResultTail";
+import MsRun from "../Run";
+import MsBasisParameters from "../request/dubbo/BasisParameters";
+import {REQ_METHOD} from "../../model/JsonData";
+import MsJmxStep from "../step/JmxStep";
 
-  export default {
-    name: "RunTestDubboPage",
-    components: {
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      MsRequestResultTail,
-      ApiEnvironmentConfig,
-      MsRun,
-      MsBasisParameters,
-      MsJmxStep
+export default {
+  name: "RunTestDubboPage",
+  components: {
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    MsRequestResultTail,
+    ApiEnvironmentConfig,
+    MsRun,
+    MsBasisParameters,
+    MsJmxStep
     },
     data() {
       return {
@@ -161,12 +161,14 @@
       },
       saveAsApi() {
         let data = {};
+        this.api.request.id = uuid();
         data.request = JSON.stringify(this.api.request);
         data.method = this.api.method;
         data.status = this.api.status;
         data.userId = this.api.userId;
         data.description = this.api.description;
         this.$emit('saveAsApi', data);
+        this.$emit('refresh');
       },
       updateApi() {
         let url = "/api/definition/update";
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 fb76cbb717..5b9b128666 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 {getUUID} from "@/common/js/utils";
+import {getUUID, uuid} from "@/common/js/utils";
 import MsApiCaseList from "../case/ApiCaseList";
 import MsContainer from "../../../../common/components/MsContainer";
 import MsBottomContainer from "../BottomContainer";
@@ -160,12 +160,14 @@ export default {
       },
       saveAsApi() {
         let data = {};
+        this.api.request.id = uuid();
         data.request = JSON.stringify(this.api.request);
         data.method = this.api.method;
         data.status = this.api.status;
         data.userId = this.api.userId;
         data.description = this.api.description;
         this.$emit('saveAsApi', data);
+        this.$emit('refresh');
       },
       updateApi() {
         let url = "/api/definition/update";
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 e259438d5a..0e89cec878 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
@@ -54,29 +54,29 @@
 </template>
 
 <script>
-  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-  import {downloadFile, getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import MsRequestResultTail from "../response/RequestResultTail";
-  import MsRun from "../Run";
-  import MsBasisParameters from "../request/tcp/TcpBasisParameters";
-  import {REQ_METHOD} from "../../model/JsonData";
-  import EnvironmentSelect from "../environment/EnvironmentSelect";
-  import MsJmxStep from "../step/JmxStep";
+import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+import {getUUID, uuid} from "@/common/js/utils";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import MsRequestResultTail from "../response/RequestResultTail";
+import MsRun from "../Run";
+import MsBasisParameters from "../request/tcp/TcpBasisParameters";
+import {REQ_METHOD} from "../../model/JsonData";
+import EnvironmentSelect from "../environment/EnvironmentSelect";
+import MsJmxStep from "../step/JmxStep";
 
-  export default {
-    name: "RunTestTCPPage",
-    components: {
-      MsJmxStep,
-      EnvironmentSelect,
-      MsApiRequestForm,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      MsRequestResultTail,
-      MsRun,
+export default {
+  name: "RunTestTCPPage",
+  components: {
+    MsJmxStep,
+    EnvironmentSelect,
+    MsApiRequestForm,
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    MsRequestResultTail,
+    MsRun,
       MsBasisParameters
     },
     data() {
@@ -173,12 +173,14 @@
       },
       saveAsApi() {
         let data = {};
+        this.api.request.id = uuid();
         data.request = JSON.stringify(this.api.request);
         data.method = this.api.method;
         data.status = this.api.status;
         data.userId = this.api.userId;
         data.description = this.api.description;
         this.$emit('saveAsApi', data);
+        this.$emit('refresh');
       },
       updateApi() {
         let url = "/api/definition/update";