From 6303bcb42ed9ea229fda126208b28507e5eef57a Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 13:55:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9D=97=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E9=83=BD=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/ApiAutomation.vue | 2 +- .../automation/scenario/AddBasisScenario.vue | 3 ++ .../automation/scenario/ApiScenarioModule.vue | 42 +++++++++++-------- .../automation/scenario/api/AddBasisApi.vue | 12 +++--- .../scenario/common/ApiBaseComponent.vue | 2 +- .../components/basis/AddBasisApi.vue | 3 ++ .../track/case/components/TestCaseCreate.vue | 4 +- .../track/case/components/TestCaseEdit.vue | 30 +++++++------ .../components/track/common/NodeTree.vue | 4 +- .../track/common/TestCaseNodeTree.vue | 11 +++++ 10 files changed, 68 insertions(+), 45 deletions(-) diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue index 11dc10b0f9..556fa95b77 100644 --- a/frontend/src/business/components/api/automation/ApiAutomation.vue +++ b/frontend/src/business/components/api/automation/ApiAutomation.vue @@ -190,7 +190,7 @@ this.activeName = name; let currentScenario = { status: "Underway", principal: getCurrentUser().id, - apiScenarioModuleId: "root", id: getUUID(), + apiScenarioModuleId: "default-module", id: getUUID(), modulePath: "/" + this.$t("commons.module_title") }; if (this.nodeTree && this.nodeTree.length > 0) { diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue index ae28794b28..43a3b5d57b 100644 --- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue +++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue @@ -117,6 +117,9 @@ if (this.currentModule && this.currentModule.id != "root") { this.scenarioForm.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null; this.scenarioForm.apiScenarioModuleId = this.currentModule.id; + }else{ + this.scenarioForm.modulePath = this.$t("commons.module_title"); + this.scenarioForm.apiScenarioModuleId = "default-module"; } }, getMaintainerOptions() { diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue index fc3266b5bc..eeec636123 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue @@ -29,7 +29,7 @@ @refresh="refresh" ref="basisScenario"/> - + @@ -82,9 +82,7 @@ trashEnable: false }, data: [], - extendTreeNodes: [], currentModule: undefined, - moduleOptions: [], operators: [ { label: this.$t('api_test.automation.add_scenario'), @@ -141,11 +139,16 @@ this.result = this.$get("/api/automation/module/list/" + this.projectId, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - let moduleOptions = []; - this.data.forEach(node => { - buildNodePath(node, {path: ''}, moduleOptions); + this.data.unshift({ + "id": "default-module", + "name": this.$t('commons.module_title'), + "level": 0, + "path": "/" + this.$t('commons.module_title'), + "children": [], + }); + this.data.forEach(node => { + buildTree(node, {path: ''}); }); - this.moduleOptions = moduleOptions } }); this.$refs.apiImport.open(this.currentModule); @@ -163,11 +166,16 @@ this.result = this.$get("/api/automation/module/list/" + this.projectId, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - let moduleOptions = []; - this.data.forEach(node => { - buildNodePath(node, {path: ''}, moduleOptions); + this.data.unshift({ + "id": "default-module", + "name": this.$t('commons.module_title'), + "level": 0, + "path": "/" + this.$t('commons.module_title'), + "children": [], + }); + this.data.forEach(node => { + buildTree(node, {path: ''}); }); - this.moduleOptions = moduleOptions } }); this.$refs.apiImport.open(this.currentModule); @@ -188,17 +196,17 @@ this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - this.extendTreeNodes = []; - this.extendTreeNodes.unshift({ - "id": "root", + this.data.unshift({ + "id": "default-module", "name": this.$t('commons.module_title'), "level": 0, - "children": this.data, + "path": "/" + this.$t('commons.module_title'), + "children": [], }); - this.extendTreeNodes.forEach(node => { + this.data.forEach(node => { buildTree(node, {path: ''}); }); - this.$emit('setModuleOptions', this.extendTreeNodes); + this.$emit('setModuleOptions', this.data); this.$emit('setNodeTree', this.data); if (this.$refs.nodeTree) { this.$refs.nodeTree.filter(this.condition.filterText); diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue index 31f10c7792..0189f7db60 100644 --- a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue +++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue @@ -84,7 +84,7 @@ callback(); }; return { - httpForm: {environmentId: "", moduleId: "root"}, + httpForm: {environmentId: "", moduleId: "default-module"}, moduleOptions: [], httpVisible: false, currentModule: {}, @@ -251,13 +251,13 @@ let url = "/api/module/list/" + getCurrentProjectID() + "/" + data.protocol; this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { - let data = response.data; - this.moduleOptions = []; + this.moduleOptions = response.data; this.moduleOptions.unshift({ - "id": "root", + "id": "default-module", "name": this.$t('commons.module_title'), "level": 0, - "children": data, + "path": "/" + this.$t('commons.module_title'), + "children": [], }); this.moduleOptions.forEach(node => { buildTree(node, {path: ''}); @@ -282,7 +282,7 @@ data.protocol = "DUBBO"; } data.id = getUUID(); - this.httpForm = {id: data.id, name: data.name, protocol: data.protocol, path: data.path, method: api.method, userId: getCurrentUser().id, request: data, moduleId: "root"}; + this.httpForm = {id: data.id, name: data.name, protocol: data.protocol, path: data.path, method: api.method, userId: getCurrentUser().id, request: data, moduleId: "default-module"}; this.getMaintainerOptions(); this.list(data); this.httpVisible = true; diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue index 2cff5e9ca6..706f6e2cb3 100644 --- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue @@ -32,7 +32,7 @@ - + diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue index 7bd6e6124a..055a927db7 100644 --- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue +++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue @@ -154,6 +154,9 @@ if (this.currentModule != null) { this.httpForm.modulePath = this.currentModule.method != undefined ? this.currentModule.method : null; this.httpForm.moduleId = this.currentModule.id; + } else { + this.httpForm.modulePath = this.$t("commons.module_title"); + this.httpForm.moduleId = "default-module"; } }, diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue index 98d5bbec1e..31b6d3d606 100644 --- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue +++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue @@ -114,8 +114,8 @@ export default { this.testCaseForm.nodePath = this.currentModule.path; this.testCaseForm.nodeId = this.currentModule.id; } else { - this.testCaseForm.nodePath = "/全部用例" - this.testCaseForm.nodeId = "root" + this.testCaseForm.nodePath = "/默认模块" + this.testCaseForm.nodeId = "default-module" } this.result = this.$post(path, this.testCaseForm, response => { this.testCaseForm.id = response.data.id diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 5ed25a3951..03571723a0 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -35,7 +35,7 @@ - @@ -314,7 +314,7 @@ export default { dialogFormVisible: false, form: { name: '', - module: 'root', + module: 'default-module', nodePath:'', maintainer: getCurrentUser().id, priority: 'P0', @@ -416,10 +416,6 @@ export default { }; }); }, 1000); - if(this.selectNode && this.selectNode.data){ - this.form.module = this.selectNode.data.id; - this.form.nodePath = this.selectNode.data.path; - } }, watch: { treeNodes() { @@ -432,7 +428,14 @@ export default { created() { this.loadOptions(); this.addListener(); // 添加 ctrl s 监听 - + if(this.selectNode && this.selectNode.data && this.form.id){ + this.form.module = this.selectNode.data.id; + this.form.nodePath = this.selectNode.data.path; + } + if (this.type === 'edit' || this.type === 'copy') { + this.form.module = this.currentTestCaseInfo.nodeId; + this.form.nodePath = this.currentTestCaseInfo.nodePath; + } }, methods: { setModule(id,data) { @@ -836,16 +839,11 @@ export default { this.getTestOptions() }, getModuleOptions() { - this.moduleOptions = []; - this.moduleOptions.unshift({ - "id": "root", - "name": this.$t('commons.module_title'), - "level": 0, - "children": this.treeNodes, - }); - this.moduleOptions.forEach(node => { - buildTree(node, {path: ''}); + let moduleOptions = []; + this.treeNodes.forEach(node => { + buildNodePath(node, {path: ''}, moduleOptions); }); + this.moduleOptions = moduleOptions; }, getMaintainerOptions() { let workspaceId = localStorage.getItem(WORKSPACE_ID); diff --git a/frontend/src/business/components/track/common/NodeTree.vue b/frontend/src/business/components/track/common/NodeTree.vue index 80a9ea0aba..4792327081 100644 --- a/frontend/src/business/components/track/common/NodeTree.vue +++ b/frontend/src/business/components/track/common/NodeTree.vue @@ -32,7 +32,7 @@ { this.treeNodes = response.data; + this.treeNodes.unshift({ + "id": "default-module", + "name": this.$t('commons.module_title'), + "level": 0, + "path": "/" + this.$t('commons.module_title'), + "children": [], + }); + this.treeNodes.forEach(node => { + buildTree(node, {path: ''}); + }); if (this.$refs.nodeTree) { this.$refs.nodeTree.filter(); } From b9eae5ed70ac89379cfb7273bcdba3965eac0de7 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 30 Mar 2021 14:10:46 +0800 Subject: [PATCH 02/11] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=20Intellij=20?= =?UTF-8?q?Toolbox=20=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .idea/icon.png | Bin 0 -> 106910 bytes 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .idea/icon.png diff --git a/.gitignore b/.gitignore index 165db4e885..309a8126a5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,8 @@ yarn-debug.log* yarn-error.log* # Editor directories and files -.idea +.idea/* +!.idea/icon.png **/*.iml .vscode *.suo diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..15fb97a69325b4766cb9af2f854ded18ec3fa527 GIT binary patch literal 106910 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%0DuU>UjeYxe4)_IoFB*~sCt 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 Date: Tue, 30 Mar 2021 14:52:34 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E8=BF=87=E7=9F=AD=E5=AF=BC=E8=87=B4=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E6=97=A0=E6=B3=95=E5=BC=95=E5=85=A5=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=A4=8D=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V79__v1.8.1_release.sql | 2 + .../test/components/ExistFiles.vue | 41 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V79__v1.8.1_release.sql diff --git a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql new file mode 100644 index 0000000000..db9b4273a0 --- /dev/null +++ b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql @@ -0,0 +1,2 @@ +ALTER TABLE file_metadata + MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name'; \ No newline at end of file diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue index bcecb0713c..e264843c2b 100644 --- a/frontend/src/business/components/performance/test/components/ExistFiles.vue +++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue @@ -154,35 +154,39 @@ export default { } let rows = this.existFiles.filter(f => this.selectIds.has(f.id)); + let jmxIds = []; for (let i = 0; i < rows.length; i++) { let row = rows[i]; if (this.tableData.filter(f => f.name === row.name).length > 0) { - this.$error(this.$t('load_test.delete_file') + ', name: ' + row.name); - this.selectIds.clear(); - return; + setTimeout(() => { + this.$warning(this.$t('load_test.delete_file') + 'name: ' + row.name); + }, 100); + continue; } + if (row.type.toUpperCase() === 'JMX') { + jmxIds.push(row.id); + } + this.tableData.push({ + name: row.name, + size: (row.size / 1024).toFixed(2) + ' KB', + type: row.type.toUpperCase(), + updateTime: row.lastModified, + }); } if (this.loadType === 'resource') { rows.forEach(row => { this.fileList.push(row); - this.tableData.push({ - name: row.name, - size: (row.size / 1024).toFixed(2) + ' KB', - type: row.type.toUpperCase(), - updateTime: row.lastModified, - }); }) this.$success(this.$t('test_track.case.import.success')); - this.loadFileVisible = false; - this.selectIds.clear(); + this.close(); return; } - this.getJmxContents(); + this.getJmxContents(jmxIds); }, - getJmxContents() { - this.projectLoadingResult = this.$post('/performance/export/jmx', [...this.selectIds], (response) => { + getJmxContents(jmxIds) { + this.projectLoadingResult = this.$post('/performance/export/jmx', jmxIds, (response) => { let data = response.data; if (!data) { return; @@ -195,18 +199,11 @@ export default { }); let file = new File([d.jmx], d.name); this.uploadList.push(file); - this.tableData.push({ - name: file.name, - size: (file.size / 1024).toFixed(2) + ' KB', - type: 'JMX', - updateTime: file.lastModified, - }); }); this.$emit('fileChange', this.scenarios); this.$success(this.$t('test_track.case.import.success')); - this.loadFileVisible = false; - this.selectIds.clear(); + this.close(); }); }, beforeUploadFile(file) { From cff32b828c3d8c4287c6ba03fe9bebfb833d42d5 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 15:03:31 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9D=97=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E9=83=BD=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/ApiAutomationService.java | 18 ++++++---- .../api/service/ApiDefinitionService.java | 35 ++++++++++++++----- .../api/service/ApiModuleService.java | 18 ++++++++-- .../api/service/ApiScenarioModuleService.java | 16 +++++++++ .../track/service/TestCaseNodeService.java | 15 ++++++++ .../track/service/TestCaseService.java | 31 +++++++++++----- .../automation/scenario/ApiScenarioModule.vue | 21 ----------- .../automation/scenario/api/AddBasisApi.vue | 7 ---- .../components/module/ApiModule.vue | 7 ---- .../track/case/components/TestCaseEdit.vue | 10 ++++-- .../track/common/TestCaseNodeTree.vue | 7 ---- frontend/src/business/components/xpack | 2 +- 12 files changed, 116 insertions(+), 71 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java index dc8adc3040..9f969416cb 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java @@ -21,10 +21,7 @@ import io.metersphere.api.dto.scenario.environment.EnvironmentConfig; import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.parse.ApiImportParser; import io.metersphere.base.domain.*; -import io.metersphere.base.mapper.ApiScenarioMapper; -import io.metersphere.base.mapper.ApiScenarioReportMapper; -import io.metersphere.base.mapper.TestCaseReviewScenarioMapper; -import io.metersphere.base.mapper.TestPlanApiScenarioMapper; +import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.ext.*; import io.metersphere.commons.constants.*; import io.metersphere.commons.exception.MSException; @@ -61,6 +58,8 @@ import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) public class ApiAutomationService { + @Resource + ApiScenarioModuleMapper apiScenarioModuleMapper; @Resource private ExtScheduleMapper extScheduleMapper; @Resource @@ -242,9 +241,14 @@ public class ApiAutomationService { } else { scenario.setUserId(request.getUserId()); } - if (StringUtils.isEmpty(request.getApiScenarioModuleId()) || StringUtils.isEmpty(request.getModulePath())) { - scenario.setApiScenarioModuleId("default-module"); - scenario.setModulePath("/默认模块"); + if (StringUtils.isEmpty(request.getApiScenarioModuleId()) || StringUtils.isEmpty(request.getModulePath()) || "default-module".equals(request.getApiScenarioModuleId())) { + ApiScenarioModuleExample example = new ApiScenarioModuleExample(); + example.createCriteria().andProjectIdEqualTo(request.getProjectId()).andNameEqualTo("默认模块"); + List modules = apiScenarioModuleMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(modules)) { + scenario.setApiScenarioModuleId(modules.get(0).getId()); + scenario.setModulePath(modules.get(0).getName()); + } } return scenario; } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index d6be5e5be4..435846891b 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -94,6 +94,8 @@ public class ApiDefinitionService { private ApiTestEnvironmentService environmentService; @Resource private EsbApiParamService esbApiParamService; + @Resource + ApiModuleMapper apiModuleMapper; private static Cache cache = Cache.newHardMemoryCache(0, 3600 * 24); @@ -262,9 +264,14 @@ public class ApiDefinitionService { test.setEnvironmentId(request.getEnvironmentId()); test.setUserId(request.getUserId()); test.setTags(request.getTags()); - if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId())) { - test.setModulePath("/默认模块"); - test.setModuleId("default-module"); + if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) { + ApiModuleExample example = new ApiModuleExample(); + example.createCriteria().andProjectIdEqualTo(test.getProjectId()).andProtocolEqualTo(test.getProtocol()).andNameEqualTo("默认模块"); + List modules = apiModuleMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(modules)) { + test.setModuleId(modules.get(0).getId()); + test.setModulePath(modules.get(0).getName()); + } } apiDefinitionMapper.updateByPrimaryKeySelective(test); return test; @@ -290,9 +297,14 @@ public class ApiDefinitionService { test.setStatus(APITestStatus.Underway.name()); test.setModulePath(request.getModulePath()); test.setModuleId(request.getModuleId()); - if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId())) { - test.setModulePath("/默认模块"); - test.setModuleId("default-module"); + if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) { + ApiModuleExample example = new ApiModuleExample(); + example.createCriteria().andProjectIdEqualTo(test.getProjectId()).andProtocolEqualTo(test.getProtocol()).andNameEqualTo("默认模块"); + List modules = apiModuleMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(modules)) { + test.setModuleId(modules.get(0).getId()); + test.setModulePath("/默认模块"); + } } test.setResponse(JSONObject.toJSONString(request.getResponse())); test.setEnvironmentId(request.getEnvironmentId()); @@ -604,9 +616,14 @@ public class ApiDefinitionService { } for (int i = 0; i < data.size(); i++) { ApiDefinitionWithBLOBs item = data.get(i); - if (StringUtils.isEmpty(item.getModuleId()) || StringUtils.isEmpty(item.getModulePath())) { - item.setModuleId("default-module"); - item.setModulePath("/默认模块"); + if (StringUtils.isEmpty(item.getModuleId()) || StringUtils.isEmpty(item.getModulePath()) || "default-module".equals(item.getModuleId())) { + ApiModuleExample example = new ApiModuleExample(); + example.createCriteria().andProjectIdEqualTo(item.getProjectId()).andProtocolEqualTo(item.getProtocol()).andNameEqualTo("默认模块"); + List modules = apiModuleMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(modules)) { + item.setModuleId(modules.get(0).getId()); + item.setModulePath(modules.get(0).getName()); + } } if (item.getName().length() > 255) { item.setName(item.getName().substring(0, 255)); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java index a0eddeeca5..b620710743 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java @@ -39,8 +39,6 @@ public class ApiModuleService extends NodeTreeService { @Resource ExtApiModuleMapper extApiModuleMapper; @Resource - private ApiDefinitionMapper apiDefinitionMapper; - @Resource private ExtApiDefinitionMapper extApiDefinitionMapper; @Resource private TestPlanProjectService testPlanProjectService; @@ -61,6 +59,22 @@ public class ApiModuleService extends NodeTreeService { } public List getNodeTreeByProjectId(String projectId, String protocol) { + // 判断当前项目下是否有默认模块，没有添加默认模块 + ApiModuleExample example = new ApiModuleExample(); + example.createCriteria().andProjectIdEqualTo(projectId).andProtocolEqualTo(protocol).andNameEqualTo("默认模块"); + long count = apiModuleMapper.countByExample(example); + if (count <= 0) { + ApiModule record = new ApiModule(); + record.setId(UUID.randomUUID().toString()); + record.setName("默认模块"); + record.setProtocol(protocol); + record.setPos(1.0); + record.setLevel(1); + record.setCreateTime(System.currentTimeMillis()); + record.setUpdateTime(System.currentTimeMillis()); + record.setProjectId(projectId); + apiModuleMapper.insert(record); + } List apiModules = extApiModuleMapper.getNodeTreeByProjectId(projectId, protocol); return getNodeTrees(apiModules); } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java index 23493f60c5..18ad89eed4 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java @@ -53,6 +53,22 @@ public class ApiScenarioModuleService extends NodeTreeService getNodeTreeByProjectId(String projectId) { + // 判断当前项目下是否有默认模块，没有添加默认模块 + ApiScenarioModuleExample example = new ApiScenarioModuleExample(); + example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo("默认模块"); + long count = apiScenarioModuleMapper.countByExample(example); + if (count <= 0) { + ApiScenarioModule record = new ApiScenarioModule(); + record.setId(UUID.randomUUID().toString()); + record.setName("默认模块"); + record.setPos(1.0); + record.setLevel(1); + record.setCreateTime(System.currentTimeMillis()); + record.setUpdateTime(System.currentTimeMillis()); + record.setProjectId(projectId); + apiScenarioModuleMapper.insert(record); + } + List nodes = extApiScenarioModuleMapper.getNodeTreeByProjectId(projectId); return getNodeTrees(nodes); } diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java index 2e6658799e..636deb6ac0 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java @@ -107,6 +107,21 @@ public class TestCaseNodeService extends NodeTreeService { } public List getNodeTreeByProjectId(String projectId) { + // 判断当前项目下是否有默认模块，没有添加默认模块 + TestCaseNodeExample example = new TestCaseNodeExample(); + example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo("默认模块"); + long count = testCaseNodeMapper.countByExample(example); + if (count <= 0) { + TestCaseNode record = new TestCaseNode(); + record.setId(UUID.randomUUID().toString()); + record.setName("默认模块"); + record.setPos(1.0); + record.setLevel(1); + record.setCreateTime(System.currentTimeMillis()); + record.setUpdateTime(System.currentTimeMillis()); + record.setProjectId(projectId); + testCaseNodeMapper.insert(record); + } List testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(projectId); return getNodeTrees(testCaseNodes); } diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java index 1ed153236f..881d60f382 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -52,6 +52,8 @@ import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) public class TestCaseService { + @Resource + TestCaseNodeMapper testCaseNodeMapper; @Resource TestCaseMapper testCaseMapper; @@ -90,6 +92,18 @@ public class TestCaseService { @Resource TestCaseTestMapper testCaseTestMapper; + private void setNode(TestCaseWithBLOBs testCase){ + if (StringUtils.isEmpty(testCase.getNodeId()) || StringUtils.isEmpty(testCase.getNodePath()) || "default-module".equals(testCase.getNodeId())) { + TestCaseNodeExample example = new TestCaseNodeExample(); + example.createCriteria().andProjectIdEqualTo(testCase.getProjectId()).andNameEqualTo("默认模块"); + List nodes = testCaseNodeMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(nodes)) { + testCase.setNodeId(nodes.get(0).getId()); + testCase.setNodePath("/" + nodes.get(0).getName()); + } + } + } + public TestCaseWithBLOBs addTestCase(TestCaseWithBLOBs testCase) { testCase.setName(testCase.getName()); checkTestCaseExist(testCase); @@ -100,7 +114,7 @@ public class TestCaseService { testCase.setReviewStatus(TestCaseReviewStatus.Prepare.name()); testCase.setDemandId(testCase.getDemandId()); testCase.setDemandName(testCase.getDemandName()); - + this.setNode(testCase); testCaseMapper.insert(testCase); return testCase; } @@ -179,7 +193,7 @@ public class TestCaseService { String steps = tc.getSteps(); String remark = tc.getRemark(); if (StringUtils.equals(steps, testCase.getSteps()) && StringUtils.equals(remark, caseRemark)) { - //MSException.throwException(Translator.get("test_case_already_exists")); + //MSException.throwException(Translator.get("test_case_already_exists")); isExt = true; } } @@ -195,16 +209,16 @@ public class TestCaseService { * 根据id和pojectId查询id是否在数据库中存在。 * 在数据库中单id的话是可重复的,id与projectId的组合是唯一的 */ - public Integer checkIdExist(Integer id, String projectId){ + public Integer checkIdExist(Integer id, String projectId) { TestCaseExample example = new TestCaseExample(); TestCaseExample.Criteria criteria = example.createCriteria(); if (null != id) { criteria.andNumEqualTo(id); criteria.andProjectIdEqualTo(projectId); long count = testCaseMapper.countByExample(example); //查询是否有包含此ID的数据 - if(count == 0){ //如果ID不存在 + if (count == 0) { //如果ID不存在 return null; - }else { //有对应ID的数据 + } else { //有对应ID的数据 return id; } } @@ -415,7 +429,7 @@ public class TestCaseService { testcase.setSort(sort.getAndIncrement()); testcase.setNum(num.decrementAndGet()); testcase.setReviewStatus(TestCaseReviewStatus.Prepare.name()); - mapper.insert(testcase); + mapper.insert(testcase); }); } sqlSession.flushStatements(); @@ -443,6 +457,7 @@ public class TestCaseService { /** * 把Excel中带ID的数据更新到数据库 + * * @param testCases * @param projectId */ @@ -820,14 +835,14 @@ public class TestCaseService { if (files != null) { files.forEach(file -> { - final FileMetadata fileMetadata = fileService.saveFile(file,testCaseWithBLOBs.getProjectId()); + final FileMetadata fileMetadata = fileService.saveFile(file, testCaseWithBLOBs.getProjectId()); TestCaseFile testCaseFile = new TestCaseFile(); testCaseFile.setFileId(fileMetadata.getId()); testCaseFile.setCaseId(request.getId()); testCaseFileMapper.insert(testCaseFile); }); } - + this.setNode(request); editTestCase(request); return request.getId(); } diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue index eeec636123..c93547beca 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue @@ -139,13 +139,6 @@ this.result = this.$get("/api/automation/module/list/" + this.projectId, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - this.data.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.data.forEach(node => { buildTree(node, {path: ''}); }); @@ -166,13 +159,6 @@ this.result = this.$get("/api/automation/module/list/" + this.projectId, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - this.data.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.data.forEach(node => { buildTree(node, {path: ''}); }); @@ -196,13 +182,6 @@ this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - this.data.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.data.forEach(node => { buildTree(node, {path: ''}); }); diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue index 0189f7db60..09349bb9e6 100644 --- a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue +++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue @@ -252,13 +252,6 @@ this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { this.moduleOptions = response.data; - this.moduleOptions.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.moduleOptions.forEach(node => { buildTree(node, {path: ''}); }); diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue index 387ce3d13e..1d2e735ff6 100644 --- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue +++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue @@ -130,13 +130,6 @@ this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { this.data = response.data; - this.data.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.data.forEach(node => { buildTree(node, {path: ''}); }); diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 03571723a0..96e8d81efa 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -315,7 +315,7 @@ export default { form: { name: '', module: 'default-module', - nodePath:'', + nodePath:'/默认模块', maintainer: getCurrentUser().id, priority: 'P0', type: '', @@ -416,6 +416,10 @@ export default { }; }); }, 1000); + if(this.selectNode && this.selectNode.data && !this.form.id){ + this.form.module = this.selectNode.data.id; + this.form.nodePath = this.selectNode.data.path; + } }, watch: { treeNodes() { @@ -428,9 +432,11 @@ export default { created() { this.loadOptions(); this.addListener(); // 添加 ctrl s 监听 - if(this.selectNode && this.selectNode.data && this.form.id){ + if(this.selectNode && this.selectNode.data && !this.form.id){ this.form.module = this.selectNode.data.id; this.form.nodePath = this.selectNode.data.path; + }else{ + this.form.module =this.treeNodes && this.length>0? this.treeNodes[0].id:""; } if (this.type === 'edit' || this.type === 'copy') { this.form.module = this.currentTestCaseInfo.nodeId; diff --git a/frontend/src/business/components/track/common/TestCaseNodeTree.vue b/frontend/src/business/components/track/common/TestCaseNodeTree.vue index b6d9415dc9..e4e89ab7ea 100644 --- a/frontend/src/business/components/track/common/TestCaseNodeTree.vue +++ b/frontend/src/business/components/track/common/TestCaseNodeTree.vue @@ -116,13 +116,6 @@ export default { if (this.projectId) { this.result = this.$get("/case/node/list/" + this.projectId, response => { this.treeNodes = response.data; - this.treeNodes.unshift({ - "id": "default-module", - "name": this.$t('commons.module_title'), - "level": 0, - "path": "/" + this.$t('commons.module_title'), - "children": [], - }); this.treeNodes.forEach(node => { buildTree(node, {path: ''}); }); diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 2115bd28a9..07951ba17a 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 2115bd28a90854d2b6276a90878934715498c584 +Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd From a05d1a773a1008a56fa8d0857c3ebdc5029a2f7a Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 15:20:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=BC=96=E8=BE=91=E4=B9=9F=E4=B8=8D=E8=83=BD=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/components/track/common/NodeTree.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/business/components/track/common/NodeTree.vue b/frontend/src/business/components/track/common/NodeTree.vue index 4792327081..fb4929c35e 100644 --- a/frontend/src/business/components/track/common/NodeTree.vue +++ b/frontend/src/business/components/track/common/NodeTree.vue @@ -32,7 +32,7 @@ Date: Tue, 30 Mar 2021 15:25:23 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A2=AB?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V79__v1.8.1_release.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql index db9b4273a0..4d0e75059a 100644 --- a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql +++ b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql @@ -1,2 +1,4 @@ ALTER TABLE file_metadata - MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name'; \ No newline at end of file + MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name'; +-- api_scenario_report modify column length +ALTER TABLE api_scenario_report MODIFY COLUMN name VARCHAR(300); \ No newline at end of file From d556c722ad6e6dc6c7accd4c2fce7ff41891e24d Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 30 Mar 2021 15:28:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95)?= =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=83=AD=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=80=82=E9=85=8D=E5=8D=95=E4=BD=8D=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parse/xml/reader/jmx/JmeterDocumentParser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java index 09fbda18a5..a8d33e4391 100644 --- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java +++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java @@ -701,9 +701,11 @@ public class JmeterDocumentParser implements DocumentParser { switch (unit) { case "M": duration = String.valueOf(Long.parseLong(duration) * 60); + rampUp = String.valueOf(Long.parseLong(rampUp) * 60); break; case "H": duration = String.valueOf(Long.parseLong(duration) * 60 * 60); + rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60); break; default: break; @@ -804,9 +806,11 @@ public class JmeterDocumentParser implements DocumentParser { switch (unit) { case "M": hold = String.valueOf(Long.parseLong(hold) * 60); + rampUp = String.valueOf(Long.parseLong(rampUp) * 60); break; case "H": hold = String.valueOf(Long.parseLong(hold) * 60 * 60); + rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60); break; default: break; From 1847fbbf5d9824a19b0d56446f8b5ee6497fc467 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 30 Mar 2021 15:31:02 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E8=BF=87=E7=9F=AD=E5=AF=BC=E8=87=B4=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E6=97=A0=E6=B3=95=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V79__v1.8.1_release.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql index 4d0e75059a..4c177ecbc6 100644 --- a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql +++ b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql @@ -1,3 +1,4 @@ +-- file name length change ALTER TABLE file_metadata MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name'; -- api_scenario_report modify column length From 3a11fd16eb63d288759f6ec33b1cfa120a902a79 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 30 Mar 2021 15:31:27 +0800 Subject: [PATCH 09/11] chore: sync --- 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 07951ba17a..2115bd28a9 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd +Subproject commit 2115bd28a90854d2b6276a90878934715498c584 From 81645d4387f928f4415044a90f094d37177d580c Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 15:35:11 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E9=80=89=E4=B8=AD=E6=A8=A1=E5=9D=97=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8D=E9=80=89=E6=8B=A9=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/business/components/api/automation/ApiAutomation.vue | 4 ++++ .../src/business/components/api/definition/ApiDefinition.vue | 3 +++ 2 files changed, 7 insertions(+) diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue index 556fa95b77..180b05750b 100644 --- a/frontend/src/business/components/api/automation/ApiAutomation.vue +++ b/frontend/src/business/components/api/automation/ApiAutomation.vue @@ -197,6 +197,10 @@ currentScenario.apiScenarioModuleId = this.nodeTree[0].id; currentScenario.modulePath = this.nodeTree[0].path; } + + if (this.selectNodeIds && this.selectNodeIds.length > 0) { + currentScenario.apiScenarioModuleId = this.selectNodeIds[0]; + } this.tabs.push({label: label, name: name, currentScenario: currentScenario}); } if (tab.name === 'edit') { diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue index 659458f6cb..3abdc02222 100644 --- a/frontend/src/business/components/api/definition/ApiDefinition.vue +++ b/frontend/src/business/components/api/definition/ApiDefinition.vue @@ -302,6 +302,9 @@ api.moduleId = this.nodeTree[0].id; api.modulePath = this.nodeTree[0].path; } + if (this.selectNodeIds && this.selectNodeIds.length > 0) { + api.moduleId = this.selectNodeIds[0]; + } this.handleTabsEdit(this.$t('api_test.definition.request.title'), e, api); }, handleTabClose() { From 6db8a133de285d535c83f7a2035e6d37349d8db2 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 30 Mar 2021 15:52:25 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E7=AB=AF=E5=8F=A3=E6=98=AF?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../definition/request/sampler/MsHTTPSamplerProxy.java | 9 +++++---- frontend/src/business/components/xpack | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java index 2d88dde7f5..d70423500e 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java @@ -130,7 +130,7 @@ public class MsHTTPSamplerProxy extends MsTestElement { } // 1.8 之前历史数据 - if(StringUtils.isEmpty(this.getProjectId()) && config.getConfig()!= null && !config.getConfig().isEmpty()){ + if (StringUtils.isEmpty(this.getProjectId()) && config.getConfig() != null && !config.getConfig().isEmpty()) { this.setProjectId("historyProjectID"); } @@ -154,10 +154,11 @@ public class MsHTTPSamplerProxy extends MsTestElement { } URL urlObject = new URL(url); sampler.setDomain(URLDecoder.decode(urlObject.getHost(), "UTF-8")); - if (urlObject.getPort() > 0 && urlObject.getPort() != 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) { - sampler.setPort(urlObject.getPort()); - } else { + + if (urlObject.getPort() > 0 && urlObject.getPort() == 10990 && StringUtils.isNotEmpty(this.getPort()) && this.getPort().startsWith("${")) { sampler.setProperty("HTTPSampler.port", this.getPort()); + } else { + sampler.setPort(urlObject.getPort()); } sampler.setProtocol(urlObject.getProtocol()); sampler.setPath(urlObject.getPath()); diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 2115bd28a9..07951ba17a 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 2115bd28a90854d2b6276a90878934715498c584 +Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd