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 79129c721d..fd9e3ae2c0 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java @@ -1818,12 +1818,12 @@ public class ApiAutomationService { List scenarioNames = extApiScenarioMapper.selectNameByIdIn(scenarioIdList); if (StringUtils.isNotEmpty(deleteScenarioName) && CollectionUtils.isNotEmpty(scenarioNames)) { - String nameListStr = "【"; + String nameListStr = "["; for (String name : scenarioNames) { nameListStr += name + ","; } if (nameListStr.length() > 1) { - nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "】"; + nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "]"; } String msg = deleteScenarioName + " " + Translator.get("delete_check_reference_by") + ": " + nameListStr + " "; checkMsgList.add(msg); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java index 7923a5447b..76fe1dd978 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java @@ -962,12 +962,12 @@ public class ApiTestCaseService { String deleteCaseName = extApiTestCaseMapper.selectNameById(refreceId); if (StringUtils.isNotEmpty(deleteCaseName) && CollectionUtils.isNotEmpty(scenarioNameList)) { - String nameListStr = "【"; + String nameListStr = "["; for (String name : scenarioNameList) { nameListStr += name + ","; } if (nameListStr.length() > 1) { - nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "】"; + nameListStr = nameListStr.substring(0, nameListStr.length() - 1) + "]"; } String msg = deleteCaseName + " " + Translator.get("delete_check_reference_by") + ": " + nameListStr + " "; checkMsgList.add(msg); diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 8b08f1dd2b..3a020f670f 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -484,7 +484,7 @@ export default { permissions: ['PROJECT_API_SCENARIO:READ+DELETE'] }, { - name: "生成依赖关系", + name: this.$t('test_track.case.generate_dependencies'), handleClick: this.generateGraph, isXPack: true, permissions: ['PROJECT_API_SCENARIO:READ+EDIT'] @@ -1057,7 +1057,7 @@ export default { if (!checkResult.deleteFlag) { alertMsg = ""; checkResult.checkMsg.forEach(item => { - alertMsg += item + ";"; + alertMsg += item; }); if (alertMsg === "") { alertMsg = this.$t('load_test.delete_threadgroup_confirm') + " ?"; diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue index 2fbd303ee3..fe37c8f16e 100644 --- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue +++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue @@ -467,6 +467,7 @@ export default { if (this.validate(row)) { return; } + this.compare = []; if (this.compare.indexOf(row.id) === -1) { this.compare.push(row.id); if (this.api.saved) { diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue index 41296354f1..5f144eec3d 100644 --- a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue +++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue @@ -6,7 +6,7 @@ - +
@@ -38,7 +38,13 @@ export default { } }, formLabelWidth: String, - form: Object + form: Object, + isPublic: { + type: Boolean, + default() { + return false; + } + } }, computed: { customFieldRowNums() { diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue index 2f28e099e5..4454e0d838 100644 --- a/frontend/src/business/components/track/case/TestCase.vue +++ b/frontend/src/business/components/track/case/TestCase.vue @@ -49,6 +49,7 @@ :public-enable="true" @refreshTable="refresh" @testCaseEdit="editTestCase" + @testCaseEditShow="editTestCaseShow" @testCaseCopy="copyTestCase" @testCaseDetail="showTestCaseDetail" @getTrashList="getTrashList" @@ -101,7 +102,7 @@ :label="item.label" :name="item.name" closable> -
+
+
+ + +