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.3'

This commit is contained in:
chenjianxing 2020-09-28 18:11:44 +08:00
parent b88b7730e8 556118cd9f
commit 4f22705ec4
9 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit cf6b06526324326a563d933e07118fac014a63b4
Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8

7
frontend/src/business/components/api/report/components/ResponseText.vue
View File

@ -63,6 +63,13 @@
this.mode = mode;
}
},
created() {
console.log(this.response.headers);
if (this.response.headers.indexOf("Content-Type: application/json") > 0) {
this.mode = BODY_FORMAT.JSON;
}
}
}
</script>

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

@ -38,7 +38,15 @@
},
{
title: this.$t('api_test.request.processor.code_template_set_variable'),
value: 'vars.put("variable_name", "variable_value");',
value: 'vars.put("variable_name", "variable_value")',
},
{
title: this.$t('api_test.request.processor.code_template_get_global_variable'),
value: '${__P("variable_name")}',
},
{
title: this.$t('api_test.request.processor.code_template_set_global_variable'),
value: '${__setProperty("variable_name","variable_value",)}',
},
{
title: this.$t('api_test.request.processor.code_template_get_response_header'),

2
frontend/src/business/components/settings/system/BaseSetting.vue
View File

@ -6,7 +6,7 @@
<el-col>
<el-form-item :label="$t('system_config.base.url')" prop="url">
<el-input v-model="formInline.url" :placeholder="$t('system_config.base.url_tip')"/>
<i>(示例:https://rdmetersphere.fit2cloud.com)</i>
<i>({{$t('commons.examples')}}:https://rdmetersphere.fit2cloud.com)</i>
</el-form-item>
</el-col>
</el-row>

12
frontend/src/business/components/track/home/components/ReviewList.vue
View File

@ -1,11 +1,11 @@
<template>
<home-base-component title="我的评审" v-loading>
<home-base-component :title="$t('test_track.review.my_review')" v-loading>
<template slot="header-area">
<div style="float: right">
<ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view"
content="我创建的评审" @click="searchMyCreator"/>
:content="$t('test_track.review.my_create')" @click="searchMyCreator"/>
<ms-table-button :is-tester-permission="true" v-if="showMyCreator" icon="el-icon-view"
content="待我评审" @click="searchMyCreator"/>
:content="$t('test_track.review.reviewed_by_me')" @click="searchMyCreator"/>
</div>
</template>
@ -24,13 +24,13 @@
<el-table-column
prop="creator"
fixed
label="创建人"
:label="$t('test_track.review.creator')"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="reviewerName"
fixed
label="评审人"
:label="$t('test_track.review.reviewer')"
show-overflow-tooltip>
</el-table-column>
@ -45,7 +45,7 @@
<el-table-column
prop="projectName"
label="已评用例"
:label="$t('test_track.review.done')"
show-overflow-tooltip>
<template v-slot:default="scope">
{{scope.row.reviewed}}/{{scope.row.total}}

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

18
frontend/src/i18n/en-US.js
View File

@ -1,5 +1,6 @@
export default {
commons: {
examples: 'examples',
help_documentation: 'Help documentation',
delete_cancelled: 'Delete cancelled',
workspace: 'Workspace',
@ -537,11 +538,13 @@ export default {
post_exec_script: "PostProcessor",
code_template: "Code template",
bean_shell_processor_tip: "Currently only BeanShell scripts are supported",
code_template_get_variable: "Get variable",
code_template_set_variable: "Set variable",
code_template_get_response_header: "Get response header",
code_template_get_response_code: "Get response code",
code_template_get_response_result: "Get response result"
code_template_get_variable: "Get Variable",
code_template_set_variable: "Set Variable",
code_template_get_global_variable: "Get Global Variable",
code_template_set_global_variable: "Set Global variable",
code_template_get_response_header: "Get Response Header",
code_template_get_response_code: "Get Response Code",
code_template_get_response_result: "Get Response Result"
},
dubbo: {
protocol: "protocol",
@ -758,6 +761,11 @@ export default {
pass: "pass",
un_pass: "UnPass",
comment: "Comment",
my_review: "My Review",
my_create: "My Create",
reviewed_by_me: "Review By Me",
creator: "Creator",
done: "Commented use cases"
},
comment: {
no_comment: "No Comment",

8
frontend/src/i18n/zh-CN.js
View File

@ -1,5 +1,6 @@
export default {
commons: {
examples: '示例',
help_documentation: '帮助文档',
delete_cancelled: '已取消删除',
workspace: '工作空间',
@ -540,6 +541,8 @@ export default {
bean_shell_processor_tip: "仅支持 BeanShell 脚本",
code_template_get_variable: "获取变量",
code_template_set_variable: "设置变量",
code_template_get_global_variable: "获取全局变量",
code_template_set_global_variable: "设置全局变量",
code_template_get_response_header: "获取响应头",
code_template_get_response_code: "获取响应码",
code_template_get_response_result: "获取响应结果"
@ -764,6 +767,11 @@ export default {
pass: "通过",
un_pass: "未通过",
comment: "评论",
my_review: "我的评审",
my_create: "我创建的评审",
reviewed_by_me: "待我评审",
creator: "创建人",
done: "已评用例"
},
comment: {
no_comment: "暂无评论",

8
frontend/src/i18n/zh-TW.js
View File

@ -1,5 +1,6 @@
export default {
commons: {
examples: '示例',
help_documentation: '幫助文檔',
delete_cancelled: '已取消刪除',
workspace: '工作空間',
@ -540,6 +541,8 @@ export default {
bean_shell_processor_tip: "僅支持 BeanShell 腳本",
code_template_get_variable: "獲取變量",
code_template_set_variable: "設置變量",
code_template_get_global_variable: "獲取全局變量",
code_template_set_global_variable: "設置全局變量",
code_template_get_response_header: "獲取響應頭",
code_template_get_response_code: "獲取響應碼",
code_template_get_response_result: "獲取響應結果"
@ -760,6 +763,11 @@ export default {
pass: "通過",
un_pass: "未通過",
comment: "評論",
my_review: "我的評審",
my_create: "我創建的評審",
reviewed_by_me: "待我評審",
creator: "創建人",
done: "已評用例"
},
comment: {
no_comment: "暫無評論",