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

frontend/src/business/components/api/test/ApiTestConfig.vue

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

frontend/src/i18n/zh-CN.js

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