From eb47d5151c5fe31ef5b68da2b4012a1b89c06c82 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 22 Jan 2021 10:35:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E9=99=8D=E4=BD=8E=E6=96=B0?= =?UTF-8?q?=E6=89=8B=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8=E9=97=A8=E6=A7=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/definition/ApiDefinition.vue | 2 +- .../api/definition/components/ApiConfig.vue | 20 +++++++++++++++++++ .../components/debug/DebugDubboPage.vue | 5 +++-- .../components/debug/DebugHttpPage.vue | 6 ++++-- .../components/debug/DebugJdbcPage.vue | 3 ++- .../components/debug/DebugTcpPage.vue | 3 ++- 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue index 6629c9ae86..0421b518eb 100644 --- a/frontend/src/business/components/api/definition/ApiDefinition.vue +++ b/frontend/src/business/components/api/definition/ApiDefinition.vue @@ -209,7 +209,7 @@ }, addTab(tab) { if (tab.name === 'add') { - this.handleCommand("ADD"); + this.handleTabsEdit(this.$t('api_test.definition.request.fast_debug'), "debug"); } }, handleCommand(e) { diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue index e34b9a4838..1cf299f8a2 100644 --- a/frontend/src/business/components/api/definition/components/ApiConfig.vue +++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue @@ -169,10 +169,27 @@ let bodyFiles = this.getBodyUploadFiles(data); this.$fileUpload(this.reqUrl, null, bodyFiles, data, () => { this.$success(this.$t('commons.save_success')); + if (this.reqUrl.endsWith('/create')) { + this.saveTestCase(data); + } this.reqUrl = "/api/definition/update"; this.$emit('saveApi', data); }); }, + saveTestCase(row) { + let tmp = {request: JSON.parse(JSON.stringify(row.request))}; + tmp.projectId = getCurrentProjectID(); + tmp.active = true; + tmp.priority = "P0"; + tmp.name = row.name; + tmp.request.path = row.path; + tmp.request.method = row.method; + tmp.apiDefinitionId = row.id; + let bodyFiles = this.getBodyUploadFiles(tmp); + let url = "/api/testcase/create"; + this.$fileUpload(url, null, bodyFiles, tmp, (response) => { + }); + }, setParameters(data) { data.projectId = this.projectId; this.request.name = this.currentApi.name; @@ -185,6 +202,9 @@ data.request.protocol = this.currentProtocol; } data.id = data.request.id; + if (!data.method) { + data.method = this.currentProtocol; + } data.response = this.response; }, getBodyUploadFiles(data) { diff --git a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue index 62ea6900dc..a96f72f204 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue @@ -6,7 +6,7 @@ @command="handleCommand" size="small" style="float: right;margin-right: 20px"> {{$t('commons.test')}} - {{$t('api_test.definition.request.save_as')}} + {{$t('api_test.definition.request.save_as_case')}} @@ -43,7 +43,7 @@ export default { name: "ApiConfig", - components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters,MsJmxStep}, + components: {MsRequestResultTail, MsResponseResult, MsRequestMetric, MsResponseText, MsRun, MsBasisParameters, MsJmxStep}, props: { currentProtocol: String, scenario: Boolean, @@ -119,6 +119,7 @@ }, saveAs() { let obj = {request: this.request}; + obj.request.id = getUUID(); this.$emit('saveAs', obj); } } diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue index 26f47ea2c2..10b5287bec 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue @@ -19,7 +19,7 @@ @command="handleCommand" size="small" v-if="testCase===undefined && !scenario"> {{$t('commons.test')}} - {{$t('api_test.definition.request.save_as')}} + {{$t('api_test.definition.request.save_as_case')}} @@ -58,7 +58,7 @@ export default { name: "ApiConfig", - components: {MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun,MsJmxStep}, + components: {MsRequestResultTail, MsResponseResult, MsApiRequestForm, MsRequestMetric, MsResponseText, MsRun, MsJmxStep}, props: { currentProtocol: String, testCase: {}, @@ -155,6 +155,8 @@ saveAs() { this.$refs['debugForm'].validate((valid) => { if (valid) { + this.debugForm.id = null; + this.request.id = getUUID(); this.debugForm.request = this.request; this.debugForm.userId = getCurrentUser().id; this.debugForm.status = "Underway"; diff --git a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue index 22d6824c1e..56308135bf 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue @@ -6,7 +6,7 @@ @command="handleCommand" size="small" style="float: right;margin-right: 20px"> {{$t('commons.test')}} - {{$t('api_test.definition.request.save_as')}} + {{$t('api_test.definition.request.save_as_case')}} @@ -122,6 +122,7 @@ }, saveAs() { let obj = {request: this.request}; + obj.request.id = getUUID(); this.$emit('saveAs', obj); } } diff --git a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue index b1ff7e6041..c90a7443a6 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue @@ -15,7 +15,7 @@ @command="handleCommand" size="small" style="float: right;margin-right: 20px"> {{$t('commons.test')}} - {{$t('api_test.definition.request.save_as')}} + {{$t('api_test.definition.request.save_as_case')}} @@ -131,6 +131,7 @@ }, saveAs() { let obj = {request: this.request}; + obj.request.id = getUUID(); this.$emit('saveAs', obj); } }