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 2020-09-23 18:03:18 +08:00
parent ff2fcd620b
commit 105115de01
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@
<span class="environment-name">{{ request.environment ? request.environment.name + ': ' : '' }}</span> <span class="environment-name">{{ request.environment ? request.environment.name + ': ' : '' }}</span>
<span class="environment-url">{{ displayUrl }}</span> <span class="environment-url">{{ displayUrl }}</span>
<span v-if="!displayUrl" <span v-if="!displayUrl"
class="environment-url-tip">{{ $t('api_test.request.please_configure_environment_in_scenario') }}</span> class="environment-url-tip">{{ $t('api_test.request.please_configure_socket_in_environment') }}</span>
</el-tag> </el-tag>
</el-form-item> </el-form-item>

10
frontend/src/business/components/api/test/model/ScenarioModel.js
View File

@ -246,7 +246,7 @@ export class Scenario extends BaseConfig {
isValid() { isValid() {
if (this.enable) { if (this.enable) {
for (let i = 0; i < this.requests.length; i++) { for (let i = 0; i < this.requests.length; i++) {
let validator = this.requests[i].isValid(this.environmentId); let validator = this.requests[i].isValid(this.environmentId, this.environment);
if (!validator.isValid) { if (!validator.isValid) {
return validator; return validator;
} }
@ -357,7 +357,7 @@ export class HttpRequest extends Request {
return options; return options;
} }
isValid(environmentId) { isValid(environmentId, environment) {
if (this.enable) { if (this.enable) {
if (this.useEnvironment) { if (this.useEnvironment) {
if (!environmentId) { if (!environmentId) {
@ -366,6 +366,12 @@ export class HttpRequest extends Request {
info: 'api_test.request.please_configure_environment_in_scenario' info: 'api_test.request.please_configure_environment_in_scenario'
} }
} }
if (!environment.config.httpConfig.socket) {
return {
isValid: false,
info: 'api_test.request.please_configure_socket_in_environment'
}
}
} else { } else {
if (!this.url) { if (!this.url) {
return { return {