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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Captain.B 2020-04-23 18:51:55 +08:00
parent cebfba849e 618ab09d97
commit d0ddd8d869
31 changed files with 519 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -60,9 +60,9 @@ public class APITestController {
public void delete(@RequestBody DeleteAPITestRequest request) {
apiTestService.delete(request);
}
//
// @PostMapping("/run")
// public void run(@RequestBody RunTestPlanRequest request) {
// apiTestService.run(request);
// }
@PostMapping("/run")
public void run(@RequestBody SaveAPITestRequest request) {
apiTestService.run(request);
}
}

4
backend/src/main/java/io/metersphere/api/service/ApiTestService.java
View File

@ -66,6 +66,10 @@ public class ApiTestService {
apiTestMapper.deleteByPrimaryKey(request.getId());
}
public void run(SaveAPITestRequest request) {
save(request);
}
private ApiTestWithBLOBs updateTest(SaveAPITestRequest request) {
final ApiTestWithBLOBs test = new ApiTestWithBLOBs();
test.setId(request.getId());

9
frontend/package.json
View File

@ -14,13 +14,14 @@
"@fortawesome/vue-fontawesome": "^0.1.9",
"axios": "^0.19.0",
"core-js": "^3.4.3",
"echarts": "^4.6.0",
"element-ui": "^2.13.0",
"vue": "^2.6.10",
"vue-echarts": "^4.1.0",
"vue-i18n": "^8.15.3",
"vue-router": "^3.1.3",
"vuex": "^3.1.2",
"echarts": "^4.6.0",
"vue-echarts": "^4.1.0"
"vuedraggable": "^2.23.2",
"vuex": "^3.1.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.1.0",
@ -42,7 +43,7 @@
],
"rules": {
"vue/no-unused-components": "off",
"no-console":"off",
"no-console": "off",
"no-unused-vars": "off"
},
"parserOptions": {

17
frontend/src/business/App.vue
View File

@ -1,19 +1,18 @@
<template>
<el-col v-if="auth">
<el-row id="header-top" type="flex" justify="space-between" align="middle">
<el-col :span="2">
<el-col :span="12">
<a class="logo"/>
</el-col>
<el-col :span="10">
<ms-top-menus/>
</el-col>
<el-col :span="12">
<ms-user/>
</el-col>
</el-row>
<ms-view/>
<ms-web-socket/>
</el-col>
</template>
@ -21,7 +20,6 @@
import MsTopMenus from "./components/common/head/HeaderTopMenus";
import MsView from "./components/common/router/View";
import MsUser from "./components/common/head/HeaderUser";
import MsWebSocket from "./components/common/websocket/WebSocket";
export default {
name: 'app',
@ -33,7 +31,6 @@
beforeCreate() {
this.$get("/isLogin").then(response => {
if (response.data.success) {
window.console.log(response.data);
this.$setLang(response.data.data);
this.auth = true;
} else {
@ -43,7 +40,7 @@
window.location.href = "/login"
});
},
components: {MsWebSocket, MsUser, MsView, MsTopMenus},
components: {MsUser, MsView, MsTopMenus},
methods: {}
}
</script>
@ -62,6 +59,7 @@
width: 156px;
margin-right: 20px;
display: inline-block;
line-height: 40px;
background-size: 156px 30px;
height: 40px;
background-repeat: no-repeat;
@ -78,6 +76,11 @@
line-height: 40px;
}
.header-top-menus {
display: inline-block;
border: 0;
}
.menus > a {
padding-right: 15px;
text-decoration: none;

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

@ -11,7 +11,15 @@
<el-option v-for="project in projects" :key="project.id" :label="project.name" :value="project.id"/>
</el-select>
</el-input>
<el-button type="primary" plain :disabled="isDisabled" @click="saveTest">保存</el-button>
<el-button type="primary" plain :disabled="isDisabled" @click="saveTest">
{{$t('commons.save')}}
</el-button>
<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-row>
</el-header>
<ms-api-scenario-config :scenarios="test.scenarioDefinition" ref="config"/>
@ -41,17 +49,15 @@
}
},
beforeRouteUpdate(to, from, next) {
if (to.params.type === "edit") {
this.getTest(to.query.id);
} else {
this.test = new Test();
this.$refs.config.reset();
}
next();
},
watch: {
'$route'(to) {
if (to.query.id) {
this.getTest(to.query.id);
} else {
this.test = new Test();
this.$refs.config.reset();
}
},
test: {
handler: function () {
this.change = true;
@ -65,7 +71,7 @@
this.result = this.$get("/api/get/" + id, response => {
let item = response.data;
this.test.reset({
this.test = new Test({
id: item.id,
projectId: item.projectId,
name: item.name,
@ -77,20 +83,35 @@
saveTest: function () {
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.result = this.$post("/api/save", this.getParam(), response => {
this.test.id = response.data;
this.$message({
message: this.$t('commons.save_success'),
type: 'success'
});
});
},
runTest: function () {
this.change = false;
this.result = this.$post("/api/run", this.getParam(), response => {
this.test.id = response.data;
this.$message({
message: this.$t('commons.save_success'),
type: 'success'
});
});
},
clear: function () {
this.test = new Test();
},
getParam: function () {
return {
id: this.test.id,
projectId: this.test.projectId,
name: this.test.name,
scenarioDefinition: JSON.stringify(this.test.scenarioDefinition)
}
}
},

34
frontend/src/business/components/api/test/ApiTestList.vue
View File

@ -3,17 +3,8 @@
<div class="main-content">
<el-card>
<template v-slot:header>
<div>
<el-row type="flex" justify="space-between" align="middle">
<span class="title">{{$t('commons.test')}}</span>
<span class="search">
<el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60"
v-model="condition" @change="search" clearable/>
</span>
</el-row>
</div>
<ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')"
@create="create" :createTip="$t('load_test.create')"/>
</template>
<el-table :data="tableData" class="test-content">
<el-table-column
@ -65,13 +56,14 @@
<script>
import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader";
export default {
components: {MsTablePagination},
components: {MsTableHeader, MsTablePagination},
data() {
return {
result: {},
condition: "",
condition: {name: ""},
projectId: null,
tableData: [],
multipleSelection: [],
@ -83,10 +75,11 @@
}
},
beforeRouteUpdate(to, from, next) {
this.projectId = to.params.projectId;
this.search();
next();
watch: {
'$route'(to) {
this.projectId = to.params.projectId;
this.search();
}
},
created: function () {
@ -95,9 +88,12 @@
},
methods: {
create() {
this.$router.push('/api/test/create');
},
search() {
let param = {
name: this.condition,
name: this.condition.name,
};
if (this.projectId !== 'all') {
@ -129,7 +125,7 @@
message: this.$t('commons.delete_success'),
type: 'success'
});
this.initTableData();
this.search();
});
}
}

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

@ -1,27 +1,5 @@
import {generateId} from "element-ui/src/utils/util";
const assign = function (obj, options) {
if (options) {
for (let name in options) {
if (options.hasOwnProperty(name)) {
if (!(obj[name] instanceof Array)) {
obj[name] = options[name];
}
}
}
}
}
const assigns = function (target, source, type) {
if (target instanceof Array && source instanceof Array) {
if (source && source.length > 0) {
source.forEach((options) => {
target.push(new type(options));
})
}
}
}
export const BODY_TYPE = {
KV: "KV",
TEXT: "TEXT"
@ -33,54 +11,80 @@ export const ASSERTION_TYPE = {
RESPONSE_TIME: "RESPONSE_TIME"
}
export class Test {
constructor(options) {
this.reset(options);
class BaseConfig {
set(options) {
options = this.initOptions(options)
for (let name in options) {
if (options.hasOwnProperty(name)) {
if (!(this[name] instanceof Array)) {
this[name] = options[name];
}
}
}
}
reset(options) {
options = this.getDefaultOptions(options);
sets(types, options) {
options = this.initOptions(options)
if (types) {
for (let name in types) {
if (types.hasOwnProperty(name) && options.hasOwnProperty(name)) {
options[name].forEach((o) => {
this[name].push(new types[name](o));
})
}
}
}
}
initOptions(options) {
return options || {};
}
}
export class Test extends BaseConfig {
constructor(options) {
super();
this.id = null;
this.name = null;
this.projectId = null;
this.scenarioDefinition = [];
assign(this, options);
assigns(this.scenarioDefinition, options.scenarioDefinition, Scenario);
this.set(options);
this.sets({scenarioDefinition: Scenario}, options);
}
getDefaultOptions(options) {
initOptions(options) {
options = options || {};
options.scenarioDefinition = options.scenarioDefinition || [new Scenario()];
return options;
}
}
export class Scenario {
export class Scenario extends BaseConfig {
constructor(options) {
options = this.getDefaultOptions(options);
super();
this.name = null;
this.url = null;
this.variables = [];
this.headers = [];
this.requests = [];
assign(this, options);
assigns(this.variables, options.variables, KeyValue);
assigns(this.headers, options.headers, KeyValue);
assigns(this.requests, options.requests, Request);
this.set(options);
this.sets({variables: KeyValue, headers: KeyValue, requests: Request}, options);
}
getDefaultOptions(options) {
initOptions(options) {
options = options || {};
options.requests = options.requests || [new Request()];
return options;
}
}
export class Request {
export class Request extends BaseConfig {
constructor(options) {
options = this.getDefaultOptions(options);
super();
this.randomId = generateId();
this.name = null;
this.url = null;
@ -91,13 +95,12 @@ export class Request {
this.assertions = null;
this.extract = [];
assign(this, options);
assigns(this.parameters, options.parameters, KeyValue);
assigns(this.headers, options.headers, KeyValue);
this.set(options);
this.sets({parameters: KeyValue, headers: KeyValue}, options);
// TODO assigns extract
}
getDefaultOptions(options) {
initOptions(options) {
options = options || {};
options.method = "GET";
options.body = new Body(options.body);
@ -106,15 +109,15 @@ export class Request {
}
}
export class Body {
export class Body extends BaseConfig {
constructor(options) {
options = options || {};
super();
this.type = null;
this.text = null;
this.kvs = [];
assign(this, options);
assigns(this.kvs, options.kvs, KeyValue);
this.set(options);
this.sets({kvs: KeyValue}, options);
}
isKV() {
@ -122,72 +125,69 @@ export class Body {
}
}
export class KeyValue {
export class KeyValue extends BaseConfig {
constructor(options) {
options = options || {};
super();
this.key = null;
this.value = null;
assign(this, options);
this.set(options);
}
}
export class Assertions {
export class Assertions extends BaseConfig {
constructor(options) {
options = this.getDefaultOptions(options);
super();
this.text = [];
this.regex = [];
this.responseTime = null;
assign(this, options);
assigns(this.text, options.text, KeyValue);
assigns(this.regex, options.regex, KeyValue);
this.set(options);
this.sets({text: KeyValue, regex: KeyValue}, options);
}
getDefaultOptions(options) {
initOptions(options) {
options = options || {};
options.responseTime = new ResponseTime(options.responseTime);
return options;
}
}
class AssertionType {
class AssertionType extends BaseConfig {
constructor(type) {
super();
this.type = type;
}
}
export class Text extends AssertionType {
constructor(options) {
options = options || {};
super(ASSERTION_TYPE.TEXT);
this.subject = null;
this.condition = null;
this.value = null;
assign(this, options);
this.set(options);
}
}
export class Regex extends AssertionType {
constructor(options) {
options = options || {};
super(ASSERTION_TYPE.REGEX);
this.subject = null;
this.expression = null;
this.description = null;
assign(this, options);
this.set(options);
}
}
export class ResponseTime extends AssertionType {
constructor(options) {
options = options || {};
super(ASSERTION_TYPE.RESPONSE_TIME);
this.responseInTime = null;
assign(this, options);
this.set(options);
}
}

35
frontend/src/business/components/common/components/MsTableOperator.vue Normal file
View File

@ -0,0 +1,35 @@
<template>
<span>
<ms-table-operator-button icon="el-icon-edit"
@click="editClick" @click.stop="editClickStop"/>
<ms-table-operator-button icon="el-icon-delete" type="danger"
@click="deletClick" @click.stop="deleteClickStop"/>
</span>
</template>
<script>
import MsTableOperatorButton from "./MsTableOperatorButton";
export default {
name: "MsTableOperator",
components: {MsTableOperatorButton},
methods: {
editClick() {
this.$emit('editClick');
},
editClickStop() {
this.$emit('editClickStop');
},
deletClick() {
this.$emit('deleteClick');
},
deleteClickStop() {
this.$emit('deleteClickStop');
}
}
}
</script>
<style scoped>
</style>

34
frontend/src/business/components/common/components/MsTableOperatorButton.vue Normal file
View File

@ -0,0 +1,34 @@
<template>
<el-button @click="click"
@click.stop="clickStop" :type="type"
:icon="icon" size="mini" circle/>
</template>
<script>
import MsTableButton from "./MsTableButton";
export default {
name: "MsTableOperatorButton",
components: {MsTableButton},
props: {
icon: {
type: String,
default: 'el-icon-question'
},
type: {
type: String,
default: 'primary'
}
},
methods: {
click() {
this.$emit('click');
},
clickStop() {
this.$emit('clickStop');
}
}
}
</script>
<style scoped>
</style>

34
frontend/src/business/components/common/head/RecentList.vue
View File

@ -1,11 +1,11 @@
<template>
<div>
<div v-loading="result.loading">
<div class="recent-text">
<i class="el-icon-time"/>
<span>{{options.title}}</span>
<i class="el-icon-refresh" @click="recent"/>
</div>
<el-menu-item :key="i.id" v-for="i in items"
:index="getIndex(i)" :route="getRouter(i)">
<el-menu-item :key="i.id" v-for="i in items" :index="getIndex(i)" :route="getRouter(i)">
<span class="title">{{ i.name }}</span>
</el-menu-item>
</div>
@ -21,14 +21,11 @@
options: Object
},
mounted() {
if (hasRoles(ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
this.$get(this.options.url, (response) => {
this.items = response.data;
});
}
this.recent();
},
data() {
return {
result: {},
items: []
}
},
@ -45,6 +42,16 @@
}
}
}
},
methods: {
recent: function () {
if (hasRoles(ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
this.result = this.$get(this.options.url, (response) => {
this.items = response.data;
});
}
}
}
}
</script>
@ -60,6 +67,17 @@
.recent-text span {
padding-left: 6px;
line-height: 36px;
}
.recent-text .el-icon-refresh {
cursor: pointer;
float: right;
line-height: 36px;
}
.recent-text .el-icon-refresh:hover {
color: #BBBBBB;
}
.title {

2
frontend/src/business/components/common/router/router.js
View File

@ -26,7 +26,7 @@ import PerformanceReportView from "../../performance/report/PerformanceReportVie
import ApiReportView from "../../api/report/ApiReportView";
import TrackHome from "../../track/home/TrackHome";
import TestPlan from "../../track/plan/TestPlan";
import TestPlanView from "../../track/plan/TestPlanView";
import TestPlanView from "../../track/plan/view/TestPlanView";
import TestCase from "../../track/case/TestCase";
import TestTrack from "../../track/TestTrack";

6
frontend/src/business/components/project/MsProject.vue
View File

@ -12,8 +12,7 @@
<el-table-column prop="workspaceName" label="所属工作空间"/>
<el-table-column>
<template v-slot:default="scope">
<el-button @click="edit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
<el-button @click="del(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
<ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
</template>
</el-table-column>
</el-table>
@ -48,10 +47,11 @@
import {TokenKey} from "../../../common/js/constants";
import MsTablePagination from "../common/pagination/TablePagination";
import MsTableHeader from "../common/components/MsTableHeader";
import MsTableOperator from "../common/components/MsTableOperator";
export default {
name: "MsProject",
components: {MsCreateBox, MsTablePagination, MsTableHeader},
components: {MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader},
data() {
return {
createVisible: false,

19
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -46,19 +46,10 @@
<!-- dialog of workspace member -->
<el-dialog :visible.sync="memberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
<el-row type="flex" justify="space-between" align="middle">
<span class="member-title">{{$t('commons.member')}}
<ms-create-box :tips="addTips" :exec="addMember" v-permission="['admin','org_admin']"/>
</span>
<span class="search">
<el-input type="text" size="small"
:placeholder="$t('organization.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60" v-model="condition.name" clearable/>
</span>
</el-row>
<ms-table-header :condition.sync="dialogCondition" @create="addMember"
:create-tip="dialogBtnTips" :title="$t('commons.member')"/>
<!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%">
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/>
@ -394,9 +385,11 @@
result: {},
loading: false,
createVisible: false,
btnTips: this.$t('workspace.add'),
btnTips: this.$t('workspace.create'),
dialogBtnTips: this.$t('member.create'),
addTips: this.$t('member.create'),
condition: {},
dialogCondition: {},
items: [],
currentPage: 1,
pageSize: 5,

19
frontend/src/business/components/settings/system/Organization.vue
View File

@ -31,19 +31,10 @@
</el-card>
<!-- dialog of organization member -->
<el-dialog :visible.sync="memberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
<el-row type="flex" justify="space-between" align="middle">
<span class="member-title">{{$t('commons.member')}}
<ms-create-box :tips="btnTips" :exec="addMember"/>
</span>
<span class="search">
<el-input type="text" size="small"
:placeholder="$t('organization.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60" v-model="condition.name" clearable/>
</span>
</el-row>
<ms-table-header :condition.sync="dialogCondition" @create="addMember"
:create-tip="dialogBtnTips" :title="$t('commons.member')"/>
<!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%">
<el-table :data="memberLineData" style="width: 100%;margin-top:5px;">
<el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/>
@ -214,8 +205,10 @@
pageMemberSize: 5,
memberTotal: 0,
currentRow: {},
btnTips: this.$t('member.create'),
btnTips: this.$t('organization.create'),
dialogBtnTips: this.$t('member.create'),
condition: {},
dialogCondition: {},
tableData: [],
memberLineData: [],
form: {},

19
frontend/src/business/components/settings/system/SystemWorkspace.vue
View File

@ -87,19 +87,10 @@
<!-- dialog of workspace member -->
<el-dialog :visible.sync="memberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
<el-row type="flex" justify="space-between" align="middle">
<span class="member-title">{{$t('commons.member')}}
<ms-create-box :tips="addTips" :exec="addMember"/>
</span>
<span class="search">
<el-input type="text" size="small"
:placeholder="$t('organization.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60" v-model="condition.name" clearable/>
</span>
</el-row>
<ms-table-header :condition.sync="dialogCondition" @create="addMember"
:create-tip="dialogBtnTips" :title="$t('commons.member')"/>
<!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%">
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/>
@ -437,9 +428,11 @@
memberVisible: false,
addMemberVisible: false,
updateMemberVisible: false,
btnTips: this.$t('workspace.add'),
btnTips: this.$t('workspace.create'),
dialogBtnTips: this.$t('member.create'),
addTips: this.$t('member.create'),
condition: {},
dialogCondition: {},
items: [],
currentPage: 1,
pageSize: 5,

2
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
View File

@ -112,7 +112,7 @@
return {
result: {},
form: {},
btnTips: "添加工作空间成员",
btnTips: this.$t('member.create'),
createVisible: false,
updateVisible: false,
queryPath: "/user/ws/member/list",

74
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -1,4 +1,4 @@
<template>
<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
<div>
<el-card v-loading="result.loading">
@ -27,26 +27,32 @@
</el-table-column>
<el-table-column
prop="priority"
:filters="priorityFilters"
:filter-method="filter"
:label="$t('test_track.case.priority')"
show-overflow-tooltip>
<template v-slot:default="scope">
<priority-table-item :value="scope.row.priority"/>
</template>
</el-table-column>
<el-table-column
prop="type"
:filters="typeFilters"
:filter-method="filter"
:label="$t('test_track.case.type')"
show-overflow-tooltip>
<template v-slot:default="scope">
<span v-if="scope.row.type == 'functional'">{{$t('test_track.case.functional_test')}}</span>
<span v-if="scope.row.type == 'performance'">{{$t('commons.performance')}}</span>
<span v-if="scope.row.type == 'api'">{{$t('commons.api')}}</span>
<type-table-item :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column
prop="method"
:filters="methodFilters"
:filter-method="filter"
:label="$t('test_track.case.method')"
show-overflow-tooltip>
<template v-slot:default="scope">
<span v-if="scope.row.method == 'manual'">{{$t('test_track.case.manual')}}</span>
<span v-if="scope.row.method == 'auto'">{{$t('test_track.case.auto')}}</span>
<method-table-item :value="scope.row.method"/>
</template>
</el-table-column>
<el-table-column
@ -55,12 +61,16 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="createTime"
sortable
:label="$t('commons.create_time')">
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
sortable
:label="$t('commons.update_time')">
<template v-slot:default="scope">
<span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@ -69,8 +79,7 @@
<el-table-column
:label="$t('commons.operating')">
<template v-slot:default="scope">
<el-button @click="handleEdit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
<el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
<ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@ -90,20 +99,43 @@
import MsTablePagination from '../../../../components/common/pagination/TablePagination';
import NodeBreadcrumb from '../../common/NodeBreadcrumb';
import MsTableHeader from '../../../../components/common/components/MsTableHeader';
import PriorityTableItem from "../../common/TableItems/PriorityTableItem";
import TypeTableItem from "../../common/TableItems/TypeTableItem";
import MethodTableItem from "../../common/TableItems/MethodTableItem";
import MsTableOperator from "../../../common/components/MsTableOperator";
export default {
name: "TestCaseList",
components: {MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableHeader},
data() {
return {
result: {},
deletePath: "/test/case/delete",
condition: {},
tableData: [],
currentPage: 1,
pageSize: 5,
total: 0,
}
components: {
MsTableOperator,
MethodTableItem,
TypeTableItem,
PriorityTableItem,
MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableHeader},
data() {
return {
result: {},
deletePath: "/test/case/delete",
condition: {},
tableData: [],
currentPage: 1,
pageSize: 5,
total: 0,
priorityFilters: [
{text: 'P0', value: 'P0'},
{text: 'P1', value: 'P1'},
{text: 'P2', value: 'P2'}
],
methodFilters: [
{text: this.$t('test_track.case.manual'), value: 'manual'},
{text: this.$t('test_track.case.auto'), value: 'auto'}
],
typeFilters: [
{text: this.$t('commons.functional'), value: 'functional'},
{text: this.$t('commons.performance'), value: 'performance'},
{text: this.$t('commons.api'), value: 'api'}
]
}
},
props: {
currentProject: {
@ -174,6 +206,10 @@
refresh() {
this.condition = {};
this.$emit('refresh');
},
filter(value, row, column) {
const property = column['property'];
return row[property] === value;
}
}
}

183
frontend/src/business/components/track/common/PlanNodeTree.vue
View File

@ -1,183 +0,0 @@
<template>
<div>
<el-input :placeholder="$t('test_track.module.search')" v-model="filterText" size="small"></el-input>
<el-tree
v-loading="result.loading"
class="filter-tree node-tree"
:data="treeNodes"
node-key="id"
@node-drag-end="handleDragEnd"
:filter-node-method="filterNode"
:expand-on-click-node="false"
highlight-current
draggable
ref="tree">
<template v-slot:default="{node}">
<span class="custom-tree-node" @click="selectNode(node)">
{{node.label}}
</span>
</template>
</el-tree>
</div>
</template>
<script>
export default {
name: "PlanNodeTree",
data() {
return {
result: {},
filterText: '',
defaultProps: {
children: 'children',
label: 'label'
},
dialogTableVisible: false,
defaultKeys: [],
treeNodes: []
};
},
props: {
planId: {
type: String
},
showAll: {
type: Boolean
}
},
created() {
this.initTree();
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
},
planId() {
this.initTree();
},
'$route'(to, from) {
if (to.path.indexOf("/track/plan/view/") >= 0){
this.initTree();
}
}
},
selectNode(node) {
let nodeIds = [];
this.getChildNodeId(node, nodeIds);
this.$emit("nodeSelectEvent", nodeIds);
},
getChildNodeId(rootNode, nodeIds) {
//递归获取所有子节点ID
nodeIds.push(rootNode.data.id);
for (let i = 0; i < rootNode.childNodes.length; i++) {
this.getChildNodeId(rootNode.childNodes[i], nodeIds);
}
return nodeIds;
},
methods: {
initTree() {
if (this.showAll) {
this.getAllNodeTreeByPlanId();
} else {
this.getNodeTreeByPlanId();
}
},
handleDragEnd(draggingNode, dropNode, dropType, ev) {
let param = {};
param.id = draggingNode.data.id;
if(dropType === 'inner'){
param.pId = dropNode.data.id;
param.level = dropNode.data.level + 1;
} else {
if(dropNode.parent.id === 0){
param.pId = 0;
param.level = 1;
} else {
param.pId = dropNode.parent.data.id;
param.level = dropNode.parent.data.level + 1;
}
}
this.$post('/case/node/edit', param);
},
selectNode(node) {
let nodeIds = [];
let nodeNames = [];
this.getChildNodeId(node, nodeIds);
this.getParentNodeName(node, nodeNames);
this.$emit("nodeSelectEvent", nodeIds, nodeNames);
},
getChildNodeId(rootNode, nodeIds) {
//递归获取所有子节点ID
nodeIds.push(rootNode.data.id);
for (let i = 0; i < rootNode.childNodes.length; i++){
this.getChildNodeId(rootNode.childNodes[i], nodeIds);
}
},
getParentNodeName(rootNode, nodeNames) {
if (rootNode.parent && rootNode.parent.id != 0) {
this.getParentNodeName(rootNode.parent, nodeNames)
}
if (rootNode.data.name && rootNode.data.name != '') {
nodeNames.push(rootNode.data.name);
}
},
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
getNodeTreeByPlanId() {
if(this.planId){
this.result = this.$get("/case/node/list/plan/" + this.planId, response => {
this.treeNodes = response.data;
});
}
},
getAllNodeTreeByPlanId() {
if (this.planId) {
this.result = this.$get("/case/node/list/all/plan/" + this.planId, response => {
this.treeNodes = response.data;
});
}
}
}
}
</script>
<style scoped>
.el-dropdown-link {
cursor: pointer;
color: #409EFF;
}
.el-icon-arrow-down {
font-size: 12px;
}
.custom-tree-node {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
width: 100%;
}
.node-tree {
margin-top: 15px;
}
.father .child {
display: none;
}
.father:hover .child {
display: block;
}
</style>

21
frontend/src/business/components/track/common/TableItems/MethodTableItem.vue Normal file
View File

@ -0,0 +1,21 @@
<template>
<div>
<span v-if="value == 'manual'">{{$t('test_track.case.manual')}}</span>
<span v-if="value == 'auto'">{{$t('test_track.case.auto')}}</span>
</div>
</template>
<script>
export default {
name: "MethodTableItem",
props: {
value: {
type: String
}
}
}
</script>
<style scoped>
</style>

36
frontend/src/business/components/track/common/TableItems/PriorityTableItem.vue Normal file
View File

@ -0,0 +1,36 @@
<template>
<div>
<el-tag v-if="value == 'P0'"
type="danger"
effect="dark"
size="mini">{{value}}</el-tag>
<el-tag v-if="value == 'P1'"
type="danger"
effect="light"
size="mini">{{value}}</el-tag>
<el-tag v-if="value == 'P2'"
type="warning"
effect="dark"
size="mini">{{value}}</el-tag>
<el-tag v-if="value == 'P3'"
type="warning"
effect="light"
size="mini">{{value}}</el-tag>
</div>
</template>
<script>
export default {
name: "PriorityTableItem",
props: {
value: {
type: String
}
}
}
</script>
<style scoped>
</style>

39
frontend/src/business/components/track/common/TableItems/StatusTableItem.vue Normal file
View File

@ -0,0 +1,39 @@
<template>
<div>
<el-tag v-if="value == 'Prepare'"
type="info"
effect="dark"
size="mini">{{$t('test_track.plan.plan_status_prepare')}}</el-tag>
<el-tag v-if="value == 'Pass'"
type="success"
effect="dark"
size="mini">{{$t('test_track.plan_view.pass')}}</el-tag>
<el-tag v-if="value == 'Failure'"
type="danger"
effect="dark"
size="mini">{{$t('test_track.plan_view.failure')}}</el-tag>
<el-tag v-if="value == 'Blocking'"
type="warning"
effect="dark"
size="mini">{{$t('test_track.plan_view.blocking')}}</el-tag>
<el-tag v-if="value == 'Skip'"
type="info"
effect="dark"
size="mini">{{$t('test_track.plan_view.skip')}}</el-tag>
</div>
</template>
<script>
export default {
name: "StatusTableItem",
props: {
value: {
type: String
}
}
}
</script>
<style scoped>
</style>

24
frontend/src/business/components/track/common/TableItems/TypeTableItem.vue Normal file
View File

@ -0,0 +1,24 @@
<template>
<div>
<span v-if="value == 'functional'">{{$t('commons.functional')}}</span>
<span v-if="value == 'performance'">{{$t('commons.performance')}}</span>
<span v-if="value == 'api'">{{$t('commons.api')}}</span>
</div>
</template>
<script>
export default {
name: "TypeTableItem",
props: {
value: {
type: String
}
}
}
</script>
<style scoped>
</style>

1
frontend/src/business/components/track/plan/TestPlan.vue
View File

@ -43,6 +43,7 @@
this.$refs.testPlanEditDialog.openTestPlanEditDialog(data);
},
refreshTestPlanList() {
this.$refs.testPlanList.condition = {};
this.$refs.testPlanList.initTableData();
}
}

39
frontend/src/business/components/track/plan/components/TestPlanList.vue
View File

@ -4,23 +4,8 @@
<el-main class="main-content">
<el-card v-loading="result.loading">
<template v-slot:header>
<div>
<el-row type="flex" justify="space-between" align="middle">
<el-col :span="5">
<span class="title">{{$t('test_track.plan.test_plan')}}</span>
<ms-create-box :tips="$t('test_track.plan.create_plan')" :exec="testPlanCreate"/>
</el-col>
<el-col :span="5">
<span class="search">
<el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
prefix-icon="el-icon-search"
maxlength="60"
v-model="condition" @change="initTableData" clearable/>
</span>
</el-col>
</el-row>
</div>
<ms-table-header :condition.sync="condition" @search="initTableData" @create="testPlanCreate"
:create-tip="$t('test_track.plan.create_plan')" :title="$t('test_track.plan.test_plan')"/>
</template>
<el-table
@ -78,12 +63,7 @@
<el-table-column
:label="$t('commons.operating')">
<template v-slot:default="scope">
<el-button @click="handleEdit(scope.row)"
@click.stop="deleteVisible = true" type="primary"
icon="el-icon-edit" size="mini" circle/>
<el-button @click="handleDelete(scope.row)"
@click.stop="deleteVisible = true" type="danger"
icon="el-icon-delete" size="mini" circle/>
<ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@ -99,16 +79,20 @@
<script>
import MsCreateBox from '../../../settings/CreateBox';
import MsTablePagination from '../../../../components/common/pagination/TablePagination';
import MsTableHeader from "../../../common/components/MsTableHeader";
import MsDialogFooter from "../../../common/components/MsDialogFooter";
import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
import MsTableOperator from "../../../common/components/MsTableOperator";
export default {
name: "TestPlanList",
components: {MsCreateBox, MsTablePagination},
components: {MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination},
data() {
return {
result: {},
queryPath: "/test/plan/list",
deletePath: "/test/plan/delete",
condition: "",
condition: {},
currentPage: 1,
pageSize: 5,
total: 0,
@ -121,10 +105,7 @@
},
methods: {
initTableData() {
let param = {
name: this.condition,
};
this.result = this.$post(this.buildPagePath(this.queryPath), param, response => {
this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;

8
frontend/src/business/components/track/plan/TestPlanView.vue → frontend/src/business/components/track/plan/view/TestPlanView.vue
View File

@ -37,10 +37,10 @@
<script>
import NodeTree from "../common/NodeTree";
import TestPlanTestCaseList from "./components/TestPlanTestCaseList";
import TestCaseRelevance from "./components/TestCaseRelevance";
import SelectMenu from "../common/SelectMenu";
import NodeTree from "../../common/NodeTree";
import TestPlanTestCaseList from "./comonents/TestPlanTestCaseList";
import TestCaseRelevance from "./comonents/TestCaseRelevance";
import SelectMenu from "../../common/SelectMenu";
export default {
name: "TestPlanView",

4
frontend/src/business/components/track/plan/components/ExecutorEdit.vue → frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue
View File

@ -20,8 +20,8 @@
</template>
<script>
import {WORKSPACE_ID} from '../../../../../common/js/constants'
import MsDialogFooter from '../../../common/components/MsDialogFooter'
import {WORKSPACE_ID} from '../../../../../../common/js/constants'
import MsDialogFooter from '../../../../common/components/MsDialogFooter'
export default {
name: "executorEdit",

4
frontend/src/business/components/track/plan/components/StatusEdit.vue → frontend/src/business/components/track/plan/view/comonents/StatusEdit.vue
View File

@ -19,8 +19,8 @@
</template>
<script>
import TestPlanTestCaseStatusButton from '../common/TestPlanTestCaseStatusButton';
import MsDialogFooter from '../../../common/components/MsDialogFooter'
import TestPlanTestCaseStatusButton from '../../common/TestPlanTestCaseStatusButton';
import MsDialogFooter from '../../../../common/components/MsDialogFooter'
export default {
name: "statusEdit",

4
frontend/src/business/components/track/plan/components/TestCaseRelevance.vue → frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue
View File

@ -54,8 +54,8 @@
<script>
import NodeTree from '../../common/NodeTree';
import MsDialogFooter from '../../../common/components/MsDialogFooter'
import NodeTree from '../../../common/NodeTree';
import MsDialogFooter from '../../../../common/components/MsDialogFooter'
export default {
name: "TestCaseRelevance",

2
frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue → frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
View File

@ -165,7 +165,7 @@
</template>
<script>
import TestPlanTestCaseStatusButton from '../common/TestPlanTestCaseStatusButton';
import TestPlanTestCaseStatusButton from '../../common/TestPlanTestCaseStatusButton';
export default {
name: "TestPlanTestCaseEdit",

114
frontend/src/business/components/track/plan/components/TestPlanTestCaseList.vue → frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
View File

@ -33,49 +33,36 @@
</el-table-column>
<el-table-column
prop="priority"
:filters="priorityFilters"
:filter-method="filter"
:label="$t('test_track.case.priority')">
<template v-slot:default="scope">
<el-tag v-if="scope.row.priority == 'P0'"
type="danger"
effect="dark"
size="mini">{{scope.row.priority}}</el-tag>
<el-tag v-if="scope.row.priority == 'P1'"
type="danger"
effect="light"
size="mini">{{scope.row.priority}}</el-tag>
<el-tag v-if="scope.row.priority == 'P2'"
type="warning"
effect="dark"
size="mini">{{scope.row.priority}}</el-tag>
<el-tag v-if="scope.row.priority == 'P3'"
type="warning"
effect="light"
size="mini">{{scope.row.priority}}</el-tag>
<priority-table-item :value="scope.row.priority" ref="priority"/>
</template>
</el-table-column>
<el-table-column
prop="type"
:filters="typeFilters"
:filter-method="filter"
:label="$t('test_track.case.type')"
show-overflow-tooltip>
<template v-slot:default="scope">
<span v-if="scope.row.type == 'functional'">{{$t('commons.functional')}}</span>
<span v-if="scope.row.type == 'performance'">{{$t('commons.performance')}}</span>
<span v-if="scope.row.type == 'api'">{{$t('commons.api')}}</span>
<type-table-item :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column
prop="method"
:filters="methodFilters"
:filter-method="filter"
:label="$t('test_track.case.method')"
show-overflow-tooltip>
<template v-slot:default="scope">
<span v-if="scope.row.method == 'manual'">{{$t('test_track.case.manual')}}</span>
<span v-if="scope.row.method == 'auto'">{{$t('test_track.case.auto')}}</span>
<method-table-item :value="scope.row.method"/>
</template>
</el-table-column>
<el-table-column
prop="executor"
:label="$t('test_track.plan_view.executor')">
@ -83,32 +70,17 @@
<el-table-column
prop="status"
:filters="statusFilters"
:filter-method="filter"
:label="$t('test_track.plan_view.execute_result')">
<template v-slot:default="scope">
<el-tag v-if="scope.row.status == 'Prepare'"
type="info"
effect="dark"
size="mini">{{$t('test_track.plan.plan_status_prepare')}}</el-tag>
<el-tag v-if="scope.row.status == 'Pass'"
type="success"
effect="dark"
size="mini">{{$t('test_track.plan_view.pass')}}</el-tag>
<el-tag v-if="scope.row.status == 'Failure'"
type="danger"
effect="dark"
size="mini">{{$t('test_track.plan_view.failure')}}</el-tag>
<el-tag v-if="scope.row.status == 'Blocking'"
type="warning"
effect="dark"
size="mini">{{$t('test_track.plan_view.blocking')}}</el-tag>
<el-tag v-if="scope.row.status == 'Skip'"
type="info"
effect="dark"
size="mini">{{$t('test_track.plan_view.skip')}}</el-tag>
<status-table-item :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column
sortable
prop="updateTime"
:label="$t('commons.update_time')">
<template v-slot:default="scope">
<span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@ -117,8 +89,7 @@
<el-table-column
:label="$t('commons.operating')">
<template v-slot:default="scope">
<el-button @click="handleEdit(scope.row, scope.$index)" type="primary" icon="el-icon-edit" size="mini" circle/>
<el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-unlock" size="mini" circle/>
<ms-table-operator @editClick="handleEdit(scope.row, scope.$index)" @deleteClick="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@ -135,21 +106,31 @@
</template>
<script>
import PlanNodeTree from '../../common/PlanNodeTree';
import ExecutorEdit from './ExecutorEdit';
import StatusEdit from './StatusEdit';
import TestPlanTestCaseEdit from "../components/TestPlanTestCaseEdit";
import MsTipButton from '../../../../components/common/components/MsTipButton';
import MsTablePagination from '../../../../components/common/pagination/TablePagination';
import MsTableHeader from '../../../../components/common/components/MsTableHeader';
import MsTableButton from '../../../../components/common/components/MsTableButton';
import NodeBreadcrumb from '../../common/NodeBreadcrumb';
import TestPlanTestCaseEdit from "./TestPlanTestCaseEdit";
import MsTipButton from '../../../../common/components/MsTipButton';
import MsTablePagination from '../../../../common/pagination/TablePagination';
import MsTableHeader from '../../../../common/components/MsTableHeader';
import MsTableButton from '../../../../common/components/MsTableButton';
import NodeBreadcrumb from '../../../common/NodeBreadcrumb';
import {TokenKey} from '../../../../../common/js/constants';
import {TokenKey} from '../../../../../../common/js/constants';
import {tableFilter} from '../../../../../../common/js/utils';
import PriorityTableItem from "../../../common/TableItems/PriorityTableItem";
import StatusTableItem from "../../../common/TableItems/StatusTableItem";
import TypeTableItem from "../../../common/TableItems/TypeTableItem";
import MethodTableItem from "../../../common/TableItems/MethodTableItem";
import MsTableOperator from "../../../../common/components/MsTableOperator";
export default {
name: "TestPlanTestCaseList",
components: {PlanNodeTree, StatusEdit, ExecutorEdit, MsTipButton, MsTablePagination,
components: {
MsTableOperator,
MethodTableItem,
TypeTableItem,
StatusTableItem,
PriorityTableItem, StatusEdit, ExecutorEdit, MsTipButton, MsTablePagination,
TestPlanTestCaseEdit, MsTableHeader, NodeBreadcrumb, MsTableButton},
data() {
return {
@ -161,7 +142,28 @@
currentPage: 1,
pageSize: 5,
total: 0,
selectIds: new Set()
selectIds: new Set(),
priorityFilters: [
{text: 'P0', value: 'P0'},
{text: 'P1', value: 'P1'},
{text: 'P2', value: 'P2'}
],
methodFilters: [
{text: this.$t('test_track.case.manual'), value: 'manual'},
{text: this.$t('test_track.case.auto'), value: 'auto'}
],
typeFilters: [
{text: this.$t('commons.functional'), value: 'functional'},
{text: this.$t('commons.performance'), value: 'performance'},
{text: this.$t('commons.api'), value: 'api'}
],
statusFilters: [
{text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
{text: this.$t('test_track.plan_view.pass'), value: 'Pass'},
{text: this.$t('test_track.plan_view.failure'), value: 'Failure'},
{text: this.$t('test_track.plan_view.blocking'), value: 'Blocking'},
{text: this.$t('test_track.plan_view.skip'), value: 'Skip'},
]
}
},
props:{
@ -267,6 +269,10 @@
this.condition.executor = null;
}
this.initTableData();
},
filter(value, row, column) {
const property = column['property'];
return row[property] === value;
}
}
}

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

@ -171,6 +171,7 @@ export default {
'resource_pool_is_null': '资源池为空',
},
api_test: {
save_and_run: "保存并执行",
input_name: "请输入测试名称",
select_project: "请选择项目",
scenario: {