diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java index 72228adfdb..54f43eb9b6 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java +++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java @@ -193,15 +193,8 @@ public class MsAssertions extends MsTestElement { private TestElement jsr223Assertion(MsAssertionJSR223 assertionJSR223) { TestElement assertion = new JSR223Assertion(); - assertion.setEnabled(this.isEnable()); - if (StringUtils.isNotEmpty(assertionJSR223.getDesc())) { - assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + delimiterScript + assertionJSR223.getScript()); - } else { - assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + delimiterScript + assertionJSR223.getScript()); - } assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI")); assertion.setProperty(TestElement.TEST_CLASS, JSR223Assertion.class.getName()); - assertion.setProperty("cacheKey", "false"); String scriptLanguage = assertionJSR223.getScriptLanguage(); if (StringUtils.equals(scriptLanguage, "nashornScript")) { scriptLanguage = "nashorn"; @@ -219,6 +212,13 @@ public class MsAssertions extends MsTestElement { assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("BeanShellAssertionGui")); assertion.setProperty(BeanShellAssertion.SCRIPT, assertionJSR223.getScript()); } + if (StringUtils.isNotEmpty(assertionJSR223.getDesc())) { + assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + delimiterScript + assertionJSR223.getScript()); + } else { + assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + delimiterScript + assertionJSR223.getScript()); + } + assertion.setEnabled(this.isEnable()); + assertion.setProperty("cacheKey", "false"); assertion.setProperty("scriptLanguage", scriptLanguage); assertion.setProperty(ElementConstants.SCRIPT, assertionJSR223.getScript()); return assertion; diff --git a/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue b/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue index f2882ffde3..ae1c7a1eec 100644 --- a/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue +++ b/api-test/frontend/src/business/automation/scenario/ApiScenarioModule.vue @@ -159,6 +159,9 @@ export default { relevanceProjectId() { this.list(); }, + isTrashData() { + this.list(); + }, }, created() { this.$EventBus.$on('scenarioConditionBus', (param) => {