From 832636725e82b8b201e9acabb70cfc6bb7ed5c41 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Wed, 27 Jan 2021 13:39:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20tag=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/components/api/automation/scenario/MsInputTag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/api/automation/scenario/MsInputTag.vue b/frontend/src/business/components/api/automation/scenario/MsInputTag.vue index c53111a410..ee43a990c8 100644 --- a/frontend/src/business/components/api/automation/scenario/MsInputTag.vue +++ b/frontend/src/business/components/api/automation/scenario/MsInputTag.vue @@ -21,7 +21,7 @@ v-if="!readOnly" class="tag-input el-input" v-model="newTag" - placeholder="$t('commons.tag_tip)" + :placeholder="$t('commons.tag_tip')" @keydown.delete.stop="removeLastTag" @keydown="addNew" @blur="addNew"/> From 866db48255b0bcaec673b2f9533af197fe3a0e19 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 27 Jan 2021 13:40:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AEoidc=E8=AE=A4=E8=AF=81=E6=BA=90=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/config/MybatisConfig.java | 2 ++ backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/config/MybatisConfig.java b/backend/src/main/java/io/metersphere/config/MybatisConfig.java index a78dad72a2..6495f83b93 100644 --- a/backend/src/main/java/io/metersphere/config/MybatisConfig.java +++ b/backend/src/main/java/io/metersphere/config/MybatisConfig.java @@ -2,6 +2,7 @@ package io.metersphere.config; import com.github.pagehelper.PageInterceptor; import io.metersphere.base.domain.ApiTestReportDetail; +import io.metersphere.base.domain.AuthSource; import io.metersphere.base.domain.FileContent; import io.metersphere.base.domain.TestResource; import io.metersphere.commons.utils.CompressUtils; @@ -45,6 +46,7 @@ public class MybatisConfig { configList.add(new MybatisInterceptorConfig(FileContent.class, "file", CompressUtils.class, "zip", "unzip")); configList.add(new MybatisInterceptorConfig(ApiTestReportDetail.class, "content", CompressUtils.class, "compress", "decompress")); configList.add(new MybatisInterceptorConfig(TestResource.class, "configuration")); + configList.add(new MybatisInterceptorConfig(AuthSource.class, "configuration")); interceptor.setInterceptorConfigList(configList); return interceptor; } diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index bb9c030916..387ca56312 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit bb9c0309161c91bf7d0a9f85cc44bc0eb0fc11ac +Subproject commit 387ca56312b62ae5edb3d7f34afa08946d86d621 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 3a3363c7d6..fa2fa8796b 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 3a3363c7d651f340cc37fca74c1edb92af484915 +Subproject commit fa2fa8796ba55b6409238ccda06712f87cfc7886 From 9583cd95ae413536e4f51d7a52231125d5a05241 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 27 Jan 2021 13:43:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AEoidc=E8=AE=A4=E8=AF=81=E6=BA=90=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/components/xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index fa2fa8796b..2b0af7c05f 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit fa2fa8796ba55b6409238ccda06712f87cfc7886 +Subproject commit 2b0af7c05f8148046fd17e4f2c06129367d69ac9 From dd7843525c8dc329dc9d8f030114f6b60c817982 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 27 Jan 2021 14:15:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automation/scenario/EditApiScenario.vue | 6 ++--- .../components/debug/DebugDubboPage.vue | 12 ++++++++-- .../components/debug/DebugHttpPage.vue | 23 +++++++++++++++++-- .../components/debug/DebugJdbcPage.vue | 12 ++++++++-- .../components/debug/DebugTcpPage.vue | 9 +++++++- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue index f7fc3ea11a..582b148523 100644 --- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue +++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue @@ -143,7 +143,7 @@ highlight-current @node-expand="nodeExpand" @node-collapse="nodeCollapse" - :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable class="ms-is-leaf"> + :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable> >> .el-tree-node__expand-icon.expanded { color: #7C3985; } - /deep/ .el-icon-caret-right { + .ms-el-icon-caret-right .el-icon-caret-right { color: #7C3985; } 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 e3459af13d..508f84f008 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue @@ -24,7 +24,7 @@
- {{$t('commons.save')}} + {{$t('commons.save')}}
@@ -103,7 +103,10 @@ handleCommand(e) { if (e === "save_as") { this.saveAs(); - } else { + } else if (e === 'save_as_api') { + this.saveAsApi(); + } + else { this.runDebug(); } }, @@ -121,6 +124,11 @@ this.loading = false; this.$refs.debugResult.reload(); }, + saveAsApi() { + let obj = {request: this.request}; + obj.request.id = getUUID(); + this.$emit('saveAs', obj); + }, saveAs() { let obj = {request: this.request}; obj.request.id = getUUID(); 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 67dfb4b088..ce99bcbdcc 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue @@ -39,7 +39,7 @@
- {{$t('commons.save')}} + {{$t('commons.save')}}
@@ -131,7 +131,10 @@ handleCommand(e) { if (e === "save_as") { this.saveAs(); - } else { + } else if (e === 'save_as_api') { + this.saveAsApi(); + } + else { this.runDebug(); } }, @@ -157,6 +160,22 @@ this.loading = false; this.$refs.debugResult.reload(); }, + saveAsApi() { + 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"; + this.debugForm.protocol = this.currentProtocol; + this.$emit('saveAs', this.debugForm); + } + else { + return false; + } + }) + }, saveAs() { this.$refs['debugForm'].validate((valid) => { if (valid) { 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 ef54ae3535..b1bd7200ab 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue @@ -25,7 +25,7 @@
- {{$t('commons.save')}} + {{$t('commons.save')}}
@@ -105,7 +105,10 @@ handleCommand(e) { if (e === "save_as") { this.saveAs(); - } else { + } else if (e === 'save_as_api') { + this.saveAsApi(); + } + else { this.$refs['requestForm'].validate(); } }, @@ -123,6 +126,11 @@ this.loading = false; this.$refs.debugResult.reload(); }, + saveAsApi() { + let obj = {request: this.request}; + obj.request.id = getUUID(); + this.$emit('saveAs', obj); + }, saveAs() { let obj = {request: this.request}; obj.request.id = getUUID(); 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 4396231a90..575df88736 100644 --- a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue +++ b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue @@ -35,7 +35,7 @@
- {{$t('commons.save')}} + {{$t('commons.save')}}
@@ -120,6 +120,8 @@ handleCommand(e) { if (e === "save_as") { this.saveAs(); + } else if (e === 'save_as_api') { + this.saveAsApi(); } else { this.$refs['requestForm'].validate(); } @@ -138,6 +140,11 @@ this.loading = false; this.$refs.debugResult.reload(); }, + saveAsApi() { + let obj = {request: this.request}; + obj.request.id = getUUID(); + this.$emit('saveAs', obj); + }, saveAs() { let obj = {request: this.request}; obj.request.server = this.debugForm.server;