fix(接口自动化): 场景列表增加停止按钮

This commit is contained in:
shiziyuan9527 2021-08-30 14:53:18 +08:00 committed by 刘瑞斌
parent 56a3b1edcc
commit c23cd4aa50
3 changed files with 47 additions and 7 deletions

View File

@ -68,6 +68,7 @@ import MsApiReportViewHeader from "./ApiReportViewHeader";
import {RequestFactory} from "../../definition/model/ApiTestModel"; import {RequestFactory} from "../../definition/model/ApiTestModel";
import {windowPrint, getCurrentProjectID, getUUID} from "@/common/js/utils"; import {windowPrint, getCurrentProjectID, getUUID} from "@/common/js/utils";
import {ELEMENTS} from "../scenario/Setting"; import {ELEMENTS} from "../scenario/Setting";
import {scenario} from "@/business/components/track/plan/event-bus";
export default { export default {
name: "SysnApiReportDetail", name: "SysnApiReportDetail",
@ -294,6 +295,7 @@ export default {
removeReport() { removeReport() {
let url = "/api/scenario/report/remove/real/" + this.reportId; let url = "/api/scenario/report/remove/real/" + this.reportId;
this.$get(url, response => { this.$get(url, response => {
scenario.$emit('hide', this.scenarioId);
this.$success(this.$t('schedule.event_success')); this.$success(this.$t('schedule.event_success'));
this.websocket.close(); this.websocket.close();
this.messageWebSocket.close(); this.messageWebSocket.close();

View File

@ -178,6 +178,20 @@
min-width="120px"/> min-width="120px"/>
</span> </span>
<template v-slot:opt-before="scope">
<ms-table-operator-button v-permission=" ['PROJECT_API_SCENARIO:READ+RUN']"
:tip="$t('api_test.automation.execute')" icon="el-icon-video-play" class="run-button"
@exec="execute(scope.row)" v-if="!scope.row.isStop && !trashEnable" style="margin-right: 10px;"/>
<el-tooltip :content="$t('report.stop_btn')" placement="top" :enterable="false" v-else>
<el-button v-if="!trashEnable" @click.once="stop(scope.row)" size="mini" style="color:white;padding: 0;width: 28px;height: 28px;margin-right: 10px;" class="stop-btn" circle>
<div style="transform: scale(0.72)">
<span style="margin-left: -3.5px;font-weight: bold">STOP</span>
</div>
</el-button>
</el-tooltip>
</template>
<template v-slot:opt-behind="scope"> <template v-slot:opt-behind="scope">
<ms-scenario-extend-buttons v-if="!trashEnable" style="display: contents" @openScenario="openScenario" :row="scope.row"/> <ms-scenario-extend-buttons v-if="!trashEnable" style="display: contents" @openScenario="openScenario" :row="scope.row"/>
</template> </template>
@ -245,6 +259,7 @@ import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOpe
import {API_SCENARIO_FILTERS} from "@/common/js/table-constants"; import {API_SCENARIO_FILTERS} from "@/common/js/table-constants";
import MsTableColumn from "@/business/components/common/components/table/MsTableColumn"; import MsTableColumn from "@/business/components/common/components/table/MsTableColumn";
import MsTable from "@/business/components/common/components/table/MsTable"; import MsTable from "@/business/components/common/components/table/MsTable";
import {scenario} from "@/business/components/track/plan/event-bus";
export default { export default {
name: "MsApiScenarioList", name: "MsApiScenarioList",
@ -348,6 +363,7 @@ export default {
userFilters: [], userFilters: [],
operators: [], operators: [],
selectRows: new Set(), selectRows: new Set(),
isStop: false,
trashOperators: [ trashOperators: [
{ {
tip: this.$t('commons.reduction'), tip: this.$t('commons.reduction'),
@ -364,13 +380,6 @@ export default {
}, },
], ],
unTrashOperators: [ unTrashOperators: [
{
tip: this.$t('api_test.automation.execute'),
icon: "el-icon-video-play",
exec: this.execute,
class: "run-button",
permissions: ['PROJECT_API_SCENARIO:READ+RUN']
},
{ {
tip: this.$t('commons.edit'), tip: this.$t('commons.edit'),
icon: "el-icon-edit", icon: "el-icon-edit",
@ -471,6 +480,9 @@ export default {
}; };
}, },
created() { created() {
scenario.$on('hide', id => {
this.hideStopBtn(id);
})
this.projectId = getCurrentProjectID(); this.projectId = getCurrentProjectID();
if (!this.projectName || this.projectName === "") { if (!this.projectName || this.projectName === "") {
this.getProjectName(); this.getProjectName();
@ -506,6 +518,9 @@ export default {
this.getPrincipalOptions([]); this.getPrincipalOptions([]);
}, },
beforeDestroy() {
scenario.$off("hide");
},
watch: { watch: {
selectNodeIds() { selectNodeIds() {
this.currentPage = 1; this.currentPage = 1;
@ -845,7 +860,10 @@ export default {
run.executeType = "Saved"; run.executeType = "Saved";
this.$post(url, run, response => { this.$post(url, run, response => {
this.runVisible = true; this.runVisible = true;
this.$set(row, "isStop", true);
this.reportId = run.id; this.reportId = run.id;
}, () => {
this.$set(row, "isStop", false);
}); });
}, },
copy(row) { copy(row) {
@ -1037,6 +1055,19 @@ export default {
} }
} }
return returnObj; return returnObj;
},
stop(row) {
let url = "/api/automation/stop/" + this.reportId;
this.$get(url, () => {
this.$set(row, "isStop", false);
});
},
hideStopBtn(scenarioId) {
for (let data of this.tableData) {
if (scenarioId && scenarioId === data.id) {
this.$set(data, "isStop", false);
}
}
} }
} }
}; };
@ -1058,4 +1089,10 @@ export default {
/deep/ .el-card__header { /deep/ .el-card__header {
padding: 10px; padding: 10px;
} }
.stop-btn {
background-color: #E62424;
border-color: #dd3636;
color: white;
}
</style> </style>

View File

@ -1,2 +1,3 @@
import Vue from 'vue'; import Vue from 'vue';
export const hub = new Vue(); export const hub = new Vue();
export const scenario = new Vue();