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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2021-02-24 11:04:39 +08:00
parent 56a38525e4 1f2ffba0d4
commit aa6bf4cb6e
3 changed files with 495 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/business/components/api/definition/ApiDefinition.vue
View File

@ -27,6 +27,7 @@
<!-- 列表集合 --> <!-- 列表集合 -->
<ms-api-list <ms-api-list
v-if="item.type === 'list' && activeDom==='api' " v-if="item.type === 'list' && activeDom==='api' "
@runTest="runTest"
:module-tree="nodeTree" :module-tree="nodeTree"
:module-options="moduleOptions" :module-options="moduleOptions"
:current-protocol="currentProtocol" :current-protocol="currentProtocol"

977
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -40,7 +40,7 @@
<el-col> <el-col>
<el-form-item :label="$t('system_parameter_setting.test_recipients')"> <el-form-item :label="$t('system_parameter_setting.test_recipients')">
<el-input v-model="formInline.recipient" :placeholder="$t('system_parameter_setting.test_recipients')" <el-input v-model="formInline.recipient" :placeholder="$t('system_parameter_setting.test_recipients')"
autocomplete="new-password" show-password type="text" ref="input"> autocomplete="new-password" type="text" ref="input">
</el-input> </el-input>
<p style="color: #8a8b8d">({{ $t('system_parameter_setting.tip') }})</p> <p style="color: #8a8b8d">({{ $t('system_parameter_setting.tip') }})</p>
</el-form-item> </el-form-item>