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

修复空数据

This commit is contained in:
q4speed 2020-04-21 15:43:52 +08:00
parent 3b0e2c11b7
commit 8dc3249347
8 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,13 @@
<el-input class="test-name" v-model="test.name" maxlength="64" :placeholder="$t('api_test.input_name')"> <el-input class="test-name" v-model="test.name" maxlength="64" :placeholder="$t('api_test.input_name')">
<el-select class="test-project" v-model="test.projectId" slot="prepend" <el-select class="test-project" v-model="test.projectId" slot="prepend"
:placeholder="$t('api_test.select_project')"> :placeholder="$t('api_test.select_project')">
<el-option v-for="item in projects" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id"/>
</el-select> </el-select>
</el-input> </el-input>
<el-button type="primary" plain :disabled="isDisabled" @click="saveTest">保存</el-button> <el-button type="primary" plain :disabled="isDisabled" @click="saveTest">保存</el-button>
</el-row> </el-row>
</el-header> </el-header>
<ms-api-scenario-config :scenarios="test.scenario_definition"/> <ms-api-scenario-config :scenarios="test.scenarioDefinition"/>
</el-container> </el-container>
</el-card> </el-card>
</div> </div>
@ -35,9 +35,10 @@
projects: [], projects: [],
change: false, change: false,
test: { test: {
id: null,
projectId: null, projectId: null,
name: null, name: null,
scenario_definition: [] scenarioDefinition: []
} }
} }
}, },
@ -53,12 +54,22 @@
methods: { methods: {
saveTest: function () { saveTest: function () {
this.change = false; this.change = false;
let param = {
id: this.test.id,
projectId: this.test.projectId,
name: this.test.name,
scenarioDefinition: JSON.stringify(this.test.scenarioDefinition)
}
this.result = this.$post("/api/save", param, response => {
this.test.id = response.data;
this.$message({ this.$message({
message: this.$t('commons.save_success'), message: this.$t('commons.save_success'),
type: 'success' type: 'success'
}); });
});
} }
}, },

6
frontend/src/business/components/api/test/components/ApiAssertionRegex.vue
View File

@ -4,9 +4,9 @@
<el-col class="assertion-select"> <el-col class="assertion-select">
<el-select class="assertion-item" v-model="regex.subject" size="small" <el-select class="assertion-item" v-model="regex.subject" size="small"
:placeholder="$t('api_test.request.assertions.select_subject')"> :placeholder="$t('api_test.request.assertions.select_subject')">
<el-option label="Http-Code" value="HTTP-CODE"></el-option> <el-option label="HttpCode" value="HTTP_CODE"/>
<el-option label="Header" value="HEADER"></el-option> <el-option label="Header" value="HEADER"/>
<el-option label="Body" value="BODY"></el-option> <el-option label="Body" value="BODY"/>
</el-select> </el-select>
</el-col> </el-col>
<el-col> <el-col>

16
frontend/src/business/components/api/test/components/ApiAssertionText.vue
View File

@ -4,19 +4,19 @@
<el-col class="assertion-select"> <el-col class="assertion-select">
<el-select class="assertion-item" v-model="subject" size="small" <el-select class="assertion-item" v-model="subject" size="small"
:placeholder="$t('api_test.request.assertions.select_subject')"> :placeholder="$t('api_test.request.assertions.select_subject')">
<el-option label="Http-Code" value="HTTP-CODE"></el-option> <el-option label="HttpCode" value="HTTP_CODE"/>
<el-option label="Header" value="HEADER"></el-option> <el-option label="Header" value="HEADER"/>
<el-option label="Body" value="BODY"></el-option> <el-option label="Body" value="BODY"/>
</el-select> </el-select>
</el-col> </el-col>
<el-col class="assertion-select"> <el-col class="assertion-select">
<el-select class="assertion-item" v-model="condition" size="small" <el-select class="assertion-item" v-model="condition" size="small"
:placeholder="$t('api_test.request.assertions.select_contains')"> :placeholder="$t('api_test.request.assertions.select_contains')">
<el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"></el-option> <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS"/>
<el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"></el-option> <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS"/>
<el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"></el-option> <el-option :label="$t('api_test.request.assertions.equals')" value="EQUALS"/>
<el-option :label="$t('api_test.request.assertions.start_with')" value="START_WITH"></el-option> <el-option :label="$t('api_test.request.assertions.start_with')" value="START_WITH"/>
<el-option :label="$t('api_test.request.assertions.end_with')" value="END_WITH"></el-option> <el-option :label="$t('api_test.request.assertions.end_with')" value="END_WITH"/>
</el-select> </el-select>
</el-col> </el-col>
<el-col> <el-col>

49
frontend/src/business/components/api/test/components/ApiKeyValue.vue
View File

@ -12,8 +12,21 @@
<el-input v-model="item.value" placeholder="Value" size="small" maxlength="100" @change="check"/> <el-input v-model="item.value" placeholder="Value" size="small" maxlength="100" @change="check"/>
</el-col> </el-col>
<el-col class="kv-delete"> <el-col class="kv-delete">
<el-button size="mini" class="el-icon-delete-solid" circle @click="remove(index)" <el-button size="mini" class="el-icon-delete-solid" circle @click="remove(index)"/>
:disabled="isDisable(index)"/> </el-col>
</el-row>
</div>
<div class="kv-row">
<el-row type="flex" :gutter="20" justify="space-between" align="middle">
<el-col>
<el-input v-model="kv.key" placeholder="Key" size="small" maxlength="100" @change="add"/>
</el-col>
<el-col>
<el-input v-model="kv.value" placeholder="Value" size="small" maxlength="100" @change="add"/>
</el-col>
<el-col class="kv-delete">
<el-button size="mini" class="el-icon-delete-solid" circle :disabled="true"/>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -31,45 +44,33 @@
items: Array items: Array
}, },
data() {
return {
kv: new KeyValue()
}
},
methods: { methods: {
add: function () { add: function () {
this.items.push(new KeyValue()); if (this.kv.key || this.kv.value) {
this.items.push(this.kv);
this.kv = new KeyValue();
}
}, },
remove: function (index) { remove: function (index) {
this.items.splice(index, 1); this.items.splice(index, 1);
if (this.items.length === 0) {
this.add();
}
}, },
check: function () { check: function () {
let isNeedCreate = true;
let removeIndex = -1; let removeIndex = -1;
this.items.forEach((item, index) => { this.items.forEach((item, index) => {
if (!item.key && !item.value) { if (!item.key && !item.value) {
// 多余的空行
if (index !== this.items.length - 1) {
removeIndex = index; removeIndex = index;
} }
// 没有空行，需要创建空行
isNeedCreate = false;
}
}); });
if (isNeedCreate) {
this.add();
}
if (removeIndex !== -1) { if (removeIndex !== -1) {
this.remove(removeIndex); this.remove(removeIndex);
} }
// TODO 检查key重复 // TODO 检查key重复
},
isDisable: function (index) {
return this.items.length - 1 === index;
}
},
created() {
if (this.items.length === 0) {
this.add();
} }
} }
} }

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

@ -11,7 +11,7 @@
</div> </div>
<div class="request-btn"> <div class="request-btn">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link el-icon-more"></span> <span class="el-dropdown-link el-icon-more"/>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{type: 'copy', index: index}">复制请求</el-dropdown-item> <el-dropdown-item :command="{type: 'copy', index: index}">复制请求</el-dropdown-item>
<el-dropdown-item :command="{type: 'delete', index: index}">删除请求</el-dropdown-item> <el-dropdown-item :command="{type: 'delete', index: index}">删除请求</el-dropdown-item>

20
frontend/src/business/components/api/test/components/ApiRequestForm.vue
View File

@ -1,20 +1,20 @@
<template> <template>
<el-form :model="request" :rules="rules" ref="request" label-width="100px"> <el-form :model="request" :rules="rules" ref="request" label-width="100px">
<el-form-item :label="$t('api_test.request.name')" prop="name"> <el-form-item :label="$t('api_test.request.name')" prop="name">
<el-input v-model="request.name" maxlength="100"></el-input> <el-input v-model="request.name" maxlength="100"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('api_test.request.url')" prop="url"> <el-form-item :label="$t('api_test.request.url')" prop="url">
<el-input v-model="request.url" maxlength="100" :placeholder="$t('api_test.request.url_description')"> <el-input v-model="request.url" maxlength="100" :placeholder="$t('api_test.request.url_description')">
<el-select v-model="request.method" slot="prepend" class="request-method-select"> <el-select v-model="request.method" slot="prepend" class="request-method-select">
<el-option label="GET" value="GET"></el-option> <el-option label="GET" value="GET"/>
<el-option label="POST" value="POST"></el-option> <el-option label="POST" value="POST"/>
<el-option label="PUT" value="PUT"></el-option> <el-option label="PUT" value="PUT"/>
<el-option label="PATCH" value="PATCH"></el-option> <el-option label="PATCH" value="PATCH"/>
<el-option label="DELETE" value="DELETE"></el-option> <el-option label="DELETE" value="DELETE"/>
<el-option label="OPTIONS" value="OPTIONS"></el-option> <el-option label="OPTIONS" value="OPTIONS"/>
<el-option label="HEAD" value="HEAD"></el-option> <el-option label="HEAD" value="HEAD"/>
<el-option label="CONNECT" value="CONNECT"></el-option> <el-option label="CONNECT" value="CONNECT"/>
</el-select> </el-select>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -30,7 +30,7 @@
<ms-api-body :body="request.body"/> <ms-api-body :body="request.body"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('api_test.request.assertions.label')" name="assertions"> <el-tab-pane :label="$t('api_test.request.assertions.label')" name="assertions">
<ms-api-assertions :assertions="request.assertions"></ms-api-assertions> <ms-api-assertions :assertions="request.assertions"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('api_test.request.extract')" name="extract" v-if="false"> <el-tab-pane :label="$t('api_test.request.extract')" name="extract" v-if="false">
TODO TODO

7
frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
View File

@ -18,14 +18,13 @@
</ms-api-collapse-item> </ms-api-collapse-item>
</ms-api-collapse> </ms-api-collapse>
</div> </div>
<el-button class="scenario-create" type="primary" size="mini" icon="el-icon-plus" plain <el-button class="scenario-create" type="primary" size="mini" icon="el-icon-plus" plain @click="createScenario"/>
@click="createScenario"/>
</el-aside> </el-aside>
<el-main class="scenario-main"> <el-main class="scenario-main">
<div class="scenario-form"> <div class="scenario-form">
<ms-api-scenario-form :scenario="selected" v-if="isScenario"></ms-api-scenario-form> <ms-api-scenario-form :scenario="selected" v-if="isScenario"/>
<ms-api-request-form :request="selected" v-if="isRequest"></ms-api-request-form> <ms-api-request-form :request="selected" v-if="isRequest"/>
</div> </div>
</el-main> </el-main>
</el-container> </el-container>

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

@ -1,7 +1,7 @@
<template> <template>
<el-form :model="scenario" :rules="rules" ref="scenario" label-width="100px"> <el-form :model="scenario" :rules="rules" ref="scenario" label-width="100px">
<el-form-item :label="$t('api_test.scenario.name')" prop="name"> <el-form-item :label="$t('api_test.scenario.name')" prop="name">
<el-input v-model="scenario.name" maxlength="100"></el-input> <el-input v-model="scenario.name" maxlength="100"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('api_test.scenario.base_url')" prop="url"> <el-form-item :label="$t('api_test.scenario.base_url')" prop="url">