diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java index eda66e7914..d4351db62c 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java @@ -33,6 +33,7 @@ public class MsAssertions extends MsTestElement { private MsAssertionDocument document; private static final String delimiter = "split=="; + private static final String delimiterScript = "split&&"; @Override public void toHashTree(HashTree tree, List hashTree, MsParameter msParameter) { @@ -176,9 +177,9 @@ public class MsAssertions extends MsTestElement { JSR223Assertion assertion = new JSR223Assertion(); assertion.setEnabled(this.isEnable()); if (StringUtils.isNotEmpty(assertionJSR223.getDesc())) { - assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + "&&" + assertionJSR223.getScript()); + assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + delimiterScript + assertionJSR223.getScript()); } else { - assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + "&&" + assertionJSR223.getScript()); + assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + delimiterScript + assertionJSR223.getScript()); } assertion.setProperty(TestElement.TEST_CLASS, JSR223Assertion.class.getName()); assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI")); diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue index 598d45e4b8..37c0ce4f71 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue @@ -344,7 +344,7 @@ export default { } } else { this.$emit('invisible'); - this.$warning('报告已删除'); + this.$warning(this.$t('commons.report_delete')); } }, buildReport() { diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index c0084b6ba0..736486875a 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -223,6 +223,7 @@ export default { run_fail: "Run Fail", run_warning: "Is running, please check later", run_stop: "The current task has been stopped and the report cannot be viewed", + report_delete: "Report deleted", follow_success: "Follow Success", cancel_follow_success: "Cancel Follow Success", generate_test_data: "Generate test data", diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 9818a25536..753e4d4080 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -223,6 +223,7 @@ export default { run_completed: "执行完成", run_warning: "正在运行中,请稍后查看", run_stop: "当前任务已停止,无法查看报告", + report_delete: "报告已删除", run_fail: "执行失败", follow_success: "关注成功", cancel_follow_success: "取消关注成功", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index dac570b02e..066c923b7e 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -223,6 +223,7 @@ export default { run_completed: "執行完成", run_warning: "正在運行中,請稍後查看", run_stop: "當前任務已停止,無法查看報告", + report_delete: "報告已删除", run_fail: "執行失敗", follow_success: "關註成功", cancel_follow_success: "取消關註成功",