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

fix: 测试评审脑图无法显示前置条件

This commit is contained in:
chenjianxing 2021-06-17 14:02:52 +08:00 committed by jianxing
parent 8bb93694bc
commit 0bec8af6c4
5 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
View File

@ -432,7 +432,7 @@
t.type, t.node_id,
t.steps, t.prerequisite,
t.remark,
t.node_path, t.method, t.num
t.node_path, t.method, t.num, t.step_model, t.expected_result, t.step_description
from test_plan_test_case pc
inner join test_case t on pc.case_id = t.id
<where>

3
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
View File

@ -392,7 +392,8 @@
test_case.id as caseId, test_case.name, test_case.priority,
test_case.type, test_case.node_path, test_case.method, test_case.review_status,
test_case.remark as remark, test_case.maintainer, test_case.steps as steps,
test_case.node_id as nodeId
test_case.node_id as nodeId,
test_case.prerequisite, test_case.step_description, test_case.expected_result, test_case.step_model
from test_case_review_test_case tcrtc
inner join test_case
on tcrtc.case_id = test_case.id

8
frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
View File

@ -41,14 +41,6 @@
title: this.$t('api_test.request.processor.code_template_set_variable'),
value: 'vars.put("variable_name", "variable_value")',
},
{
title: this.$t('api_test.request.processor.code_template_get_global_variable'),
value: 'props.get("variable_name")',
},
{
title: this.$t('api_test.request.processor.code_template_set_global_variable'),
value: 'props.put("variable_name", "variable_value")',
},
{
title: this.$t('api_test.request.processor.param_environment_set_global_variable'),
value: 'vars.put(${__metersphere_env_id}+"key","value")',

4
frontend/src/business/components/api/definition/components/body/ApiBody.vue
View File

@ -115,7 +115,9 @@
formatChange() {
const MsConvert = new Convert();
if (this.body.format === 'JSON-SCHEMA') {
this.body.jsonSchema = MsConvert.format(JSON.parse(this.body.raw));
if (this.body.raw) {
this.body.jsonSchema = MsConvert.format(JSON.parse(this.body.raw));
}
} else {
if (this.body.jsonSchema) {
MsConvert.schemaToJsonStr(this.body.jsonSchema, (result) => {

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

@ -66,14 +66,6 @@ export default {
title: this.$t('api_test.request.processor.code_template_set_variable'),
value: 'vars.put("variable_name", "variable_value")',
},
{
title: this.$t('api_test.request.processor.code_template_get_global_variable'),
value: 'props.get("variable_name")',
},
{
title: this.$t('api_test.request.processor.code_template_set_global_variable'),
value: 'props.put("variable_name", "variable_value")',
},
{
title: this.$t('api_test.request.processor.code_template_get_response_header'),
value: 'prev.getResponseHeaders()',