test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.2'

This commit is contained in:
chenjianxing 2020-09-03 13:31:01 +08:00
parent 788f60b7b8 306773ddcd
commit 765d0941c3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue
View File

@ -82,6 +82,11 @@
default: false
}
},
watch: {
jsr223Processor() {
this.reload();
}
},
methods: {
addTemplate(template) {
if (!this.jsr223Processor.script) {

6
frontend/src/business/components/api/test/components/request/ApiRequestForm.vue
View File

@ -8,7 +8,7 @@
</template>
<script>
import {Request, RequestFactory, Scenario} from "../../model/ScenarioModel";
import {JSR223Processor, Request, RequestFactory, Scenario} from "../../model/ScenarioModel";
import MsApiHttpRequestForm from "./ApiHttpRequestForm";
import MsApiDubboRequestForm from "./ApiDubboRequestForm";
import MsScenarioResults from "../../../report/components/ScenarioResults";
@ -58,10 +58,10 @@ export default {
mounted() {
//兼容旧版本 beanshell
if (!this.request.jsr223PreProcessor.script && this.request.beanShellPreProcessor) {
this.request.jsr223PreProcessor = this.request.beanShellPreProcessor;
this.request.jsr223PreProcessor = new JSR223Processor(this.request.beanShellPreProcessor);
}
if (!this.request.jsr223PostProcessor.script && this.request.beanShellPostProcessor) {
this.request.jsr223PostProcessor = this.request.beanShellPostProcessor;
this.request.jsr223PostProcessor = new JSR223Processor(this.request.beanShellPostProcessor);
}
},
methods: {