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

Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

This commit is contained in:
chenjianxing 2020-04-24 15:08:43 +08:00
parent 83ce0f228a 5c40ea5327
commit 89cea4833e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/business/components/api/test/ApiTestConfig.vue
View File

@ -19,7 +19,7 @@
<el-button type="primary" plain :disabled="isDisabled" @click="runTest"> <el-button type="primary" plain :disabled="isDisabled" @click="runTest">
{{$t('load_test.save_and_run')}} {{$t('load_test.save_and_run')}}
</el-button> </el-button>
<el-button type="warning" plain @click="clear">{{$t('commons.cancel')}}</el-button> <el-button type="warning" plain @click="clear">{{$t('commons.clear')}}</el-button>
</el-row> </el-row>
</el-header> </el-header>
<ms-api-scenario-config :scenarios="test.scenarioDefinition" ref="config"/> <ms-api-scenario-config :scenarios="test.scenarioDefinition" ref="config"/>

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

@ -5,6 +5,7 @@ export default {
'project': '项目', 'project': '项目',
'name': '名称', 'name': '名称',
'description': '描述', 'description': '描述',
'clear': '清空',
'save': '保存', 'save': '保存',
'save_success': '保存成功', 'save_success': '保存成功',
'delete_success': '删除成功', 'delete_success': '删除成功',
@ -174,6 +175,7 @@ export default {
}, },
api_test: { api_test: {
save_and_run: "保存并执行", save_and_run: "保存并执行",
reset: "重置",
input_name: "请输入测试名称", input_name: "请输入测试名称",
select_project: "请选择项目", select_project: "请选择项目",
scenario: { scenario: {