diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue index 30b3964cc9..fa7e50b04e 100644 --- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue +++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue @@ -154,10 +154,6 @@ :response="response" :old-response="oldResponse" > - - 取 消 - 确 定 - @@ -182,6 +178,7 @@ import {createComponent } from ".././jmeter/components"; import { TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting"; const {Body} = require("@/business/components/api/definition/model/ApiTestModel"); +const Sampler = require("@/business/components/api/definition/components/jmeter/components/sampler/sampler"); const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/); const versionHistory = requireComponent.keys().length > 0 ? requireComponent("./version/VersionHistory.vue") : {}; @@ -235,7 +232,7 @@ export default { newMockBaseUrl: "", count: 0, versionData: [], - oldRequest:{}, + oldRequest:Sampler, oldResponse:{} }; }, @@ -441,7 +438,6 @@ export default { this.httpForm.versionId = this.$refs.versionHistory.currentVersion.id; } } - this.$emit('saveApi', this.httpForm); this.count = 0; this.$store.state.apiMap.delete(this.httpForm.id); @@ -555,14 +551,12 @@ export default { this.setRequest(res.data) if (!this.setRequest(res.data)) { this.oldRequest = createComponent("HTTPSamplerProxy"); + this.dialogVisible = true; } this.formatApi(res.data) } }); }); - if(this.newData){ - this.dialogVisible = true; - } }, setRequest(api) { if (api.request !== undefined) { @@ -574,6 +568,7 @@ export default { if (!this.oldRequest.headers) { this.oldRequest.headers = []; } + this.dialogVisible = true; return true; } return false; diff --git a/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue b/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue index 30d1806ae0..2e9e8c24ee 100644 --- a/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue +++ b/frontend/src/business/components/api/definition/components/complete/version/HttpApiVersionDiff.vue @@ -111,7 +111,24 @@ - + + + + + + + + + + + + + + + + @@ -225,9 +242,26 @@ - + + + + + + + + + + + + + + + + + - diff --git a/frontend/src/business/components/performance/test/DiffVersion.vue b/frontend/src/business/components/performance/test/DiffVersion.vue index 4d49d57aef..8f8163347f 100644 --- a/frontend/src/business/components/performance/test/DiffVersion.vue +++ b/frontend/src/business/components/performance/test/DiffVersion.vue @@ -1,6 +1,7 @@