diff --git a/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..566956a5d86473690739176736ba6ca6df54ba92 --- /dev/null +++ b/backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java @@ -0,0 +1,21 @@ +package io.metersphere.commons.utils; + +import io.metersphere.controller.request.OrderRequest; + +import java.util.ArrayList; +import java.util.List; + +public class ServiceUtils { + + public static List getDefaultOrder(List orders) { + if (orders == null || orders.size() < 1) { + OrderRequest orderRequest = new OrderRequest(); + orderRequest.setName("update_time"); + orderRequest.setType("desc"); + orders = new ArrayList<>(); + orders.add(orderRequest); + return orders; + } + return orders; + } +} 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 ca3454bf55f2d04c45ebd6ac16b3ac0f511b2600..263d0aced412e5c4c4506a8df09b17facd7e86ac 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -10,7 +10,9 @@ import io.metersphere.commons.exception.MSException; import io.metersphere.commons.user.SessionUser; import io.metersphere.commons.utils.BeanUtils; import io.metersphere.commons.utils.LogUtil; +import io.metersphere.commons.utils.ServiceUtils; import io.metersphere.commons.utils.SessionUtils; +import io.metersphere.controller.request.OrderRequest; import io.metersphere.excel.domain.ExcelErrData; import io.metersphere.excel.domain.ExcelResponse; import io.metersphere.excel.domain.TestCaseExcelData; @@ -101,6 +103,7 @@ public class TestCaseService { } public List listTestCase(QueryTestCaseRequest request) { + request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); return extTestCaseMapper.list(request); } diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java index 09535720376a919b828a4896c166becdb9779f94..42858f3c99dbe8a94b3767132d41435812e443bd 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java @@ -7,7 +7,9 @@ import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper; import io.metersphere.commons.constants.TestPlanTestCaseStatus; import io.metersphere.commons.user.SessionUser; import io.metersphere.commons.utils.BeanUtils; +import io.metersphere.commons.utils.ServiceUtils; import io.metersphere.commons.utils.SessionUtils; +import io.metersphere.controller.request.OrderRequest; import io.metersphere.controller.request.member.QueryMemberRequest; import io.metersphere.service.UserService; import io.metersphere.track.dto.TestPlanCaseDTO; @@ -41,6 +43,7 @@ public class TestPlanTestCaseService { ExtTestPlanTestCaseMapper extTestPlanTestCaseMapper; public List list(QueryTestPlanCaseRequest request) { + request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); List list = extTestPlanTestCaseMapper.list(request); QueryMemberRequest queryMemberRequest = new QueryMemberRequest(); queryMemberRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); diff --git a/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue b/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue index cf131f252b5838f2f6674c495750c6099a7d6981..970bcba6c25418122220b589c5dac931c672cac8 100644 --- a/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue +++ b/frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue @@ -51,11 +51,16 @@ methods: { add: function () { - this.list.push(new Regex(this.regex)); + this.list.push(this.getRegex()); this.callback(); }, remove: function () { this.list.splice(this.index, 1); + }, + getRegex() { + let regex = new Regex(this.regex); + regex.description = regex.subject + " has: " + regex.expression; + return regex; } } } diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js index af20e6fdb92ae67f3b57f6360d3c61e28d52abed..36aba589759651ca66cd4c3ae5e381670f4c91e1 100644 --- a/frontend/src/business/components/api/test/model/ScenarioModel.js +++ b/frontend/src/business/components/api/test/model/ScenarioModel.js @@ -477,7 +477,7 @@ class JMXGenerator { } if (assertions.duration.isValid()) { - let name = "Response In Time :" + assertions.duration.value + let name = "Response In Time: " + assertions.duration.value httpSamplerProxy.put(new DurationAssertion(name, assertions.duration.value)); } } diff --git a/frontend/src/business/components/common/components/MsTableOperator.vue b/frontend/src/business/components/common/components/MsTableOperator.vue index c0917e67794d3733edebdbc2af331079cc894ce7..3c5aa550bb6f967ac2160ca9556ccb34c3ca0a64 100644 --- a/frontend/src/business/components/common/components/MsTableOperator.vue +++ b/frontend/src/business/components/common/components/MsTableOperator.vue @@ -40,13 +40,7 @@ }, deleteClickStop() { this.$emit('deleteClickStop'); - }, - /* removeClick(){ - this.$emit('removeClick'); - }, - removeClickStop(){ - this.$emit('removeClickStop') - }*/ + } } } diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 5f31fb98eb944cd73b3a2a6f128f5c33312bc026..a8ac4ca8ea395be48f0c7e0eb1ecc4e5fbab631e 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -86,7 +86,7 @@ - + { - if (isContinuous) { - this.updateTestCases(param); - return; - } - this.$refs.drawer.closeDrawer(); this.$success(this.$t('commons.save_success')); - this.$emit('refresh'); }); }, handleNext() { - this.saveCase(true); this.index++; this.getTestCase(this.index); }, handlePre() { - this.saveCase(true); this.index--; this.getTestCase(this.index); }, diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue index 5bc05dac5b2accc37c136f64dfeff2f3ffe6d96c..74251da2f89acbb79e256bfbd955ec5e428ca4f7 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue @@ -19,12 +19,12 @@ {{$t('report.test_start_time')}}: {{reportInfo.startTime}} - + {{$t('report.test_end_time')}}: {{reportInfo.endTime}} - + diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 153fab241fe5990e9f2875634aa35ba809a191e9..55e24a867a7a24dda2a72288168b36716ecf1634 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -89,7 +89,7 @@ export default { 'weeks_6': 'Sat', 'test_unit': 'tests', 'remove': 'Remove', - 'remove_cancel': 'Remove Failed', + 'remove_cancel': 'Remove Cancel', 'remove_success': 'Remove Success', 'tips': 'The authentication information has expired, please login again' }, diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 7b6fca86a9cc3291362b06254d1e79572410de4c..939b2a3648f18d02d0c27c65de90fbde455bef11 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -88,7 +88,7 @@ export default { 'port_cannot_be_empty': '端口号不能为空', 'account_cannot_be_empty': '帐户不能为空', 'remove': '移除', - 'remove_cancel': '移除失败', + 'remove_cancel': '移除取消', 'remove_success': '移除成功', 'tips': '认证信息已过期,请重新登录' }, diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 28b1b351246f09c7560c6624a2dbea20fdbcc310..6498f07a0c4cdf5c41d7a737ba93755751abd5d9 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -88,7 +88,7 @@ export default { 'port_cannot_be_empty': '埠號不能為空', 'account_cannot_be_empty': '帳戶不能為空', 'remove': '移除', - 'remove_cancel': '移除失敗', + 'remove_cancel': '移除取消', 'remove_success': '移除成功', 'tips': '认認證資訊已過期,請重新登入' },