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

fix(接口定义): 修复步骤中的结果显示错误 

refactor: 优化项目创建相关代码
This commit is contained in:
fit2-zhao 2021-06-07 11:34:00 +08:00 committed by fit2-zhao
parent 09d957ddae
commit 3182e52b4f
4 changed files with 2343 additions and 2345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
frontend/src/business/components/api/automation/report/ApiReportDetail.vue
View File

@ -30,19 +30,19 @@
<script> <script>
import MsRequestResult from "./components/RequestResult"; import MsRequestResult from "./components/RequestResult";
import MsRequestResultTail from "./components/RequestResultTail"; import MsRequestResultTail from "./components/RequestResultTail";
import MsScenarioResult from "./components/ScenarioResult"; import MsScenarioResult from "./components/ScenarioResult";
import MsMetricChart from "./components/MetricChart"; import MsMetricChart from "./components/MetricChart";
import MsScenarioResults from "./components/ScenarioResults"; import MsScenarioResults from "./components/ScenarioResults";
import MsContainer from "@/business/components/common/components/MsContainer"; import MsContainer from "@/business/components/common/components/MsContainer";
import MsMainContainer from "@/business/components/common/components/MsMainContainer"; import MsMainContainer from "@/business/components/common/components/MsMainContainer";
import MsApiReportExport from "./ApiReportExport"; import MsApiReportExport from "./ApiReportExport";
import MsApiReportViewHeader from "./ApiReportViewHeader"; import MsApiReportViewHeader from "./ApiReportViewHeader";
import {RequestFactory} from "../../definition/model/ApiTestModel"; import {RequestFactory} from "../../definition/model/ApiTestModel";
import {windowPrint, getUUID, getCurrentProjectID} from "@/common/js/utils"; import {windowPrint, getUUID, getCurrentProjectID} from "@/common/js/utils";
export default { export default {
name: "MsApiReport", name: "MsApiReport",
components: { components: {
MsApiReportViewHeader, MsApiReportViewHeader,
@ -106,8 +106,8 @@
res.scenarios.forEach(item => { res.scenarios.forEach(item => {
if (item && item.requestResults) { if (item && item.requestResults) {
item.requestResults.forEach(req => { item.requestResults.forEach(req => {
resMap.set(req.id, req); resMap.set(req.id + req.name, req);
req.name = item.name + "^@~@^" + req.name+ "UUID="+getUUID(); req.name = item.name + "^@~@^" + req.name + "UUID=" + getUUID();
array.push(req); array.push(req);
}) })
} }
@ -126,15 +126,15 @@
//运行场景中如果连续将1个场景引入多次，会出现运行结果合并的情况。 //运行场景中如果连续将1个场景引入多次，会出现运行结果合并的情况。
//为了解决这种问题，在转hashTree的时候给场景放了个新ID，前台加载解析的时候也要做处理 //为了解决这种问题，在转hashTree的时候给场景放了个新ID，前台加载解析的时候也要做处理
let scenarioId = ""; let scenarioId = "";
if(item.scenario !== null){ if (item.scenario !== null) {
let scenarioArr = JSON.parse(item.scenario); let scenarioArr = JSON.parse(item.scenario);
if(scenarioArr.length>1){ if (scenarioArr.length > 1) {
let scenarioIdArr = scenarioArr[0].split("_"); let scenarioIdArr = scenarioArr[0].split("_");
scenarioId = scenarioIdArr[0]; scenarioId = scenarioIdArr[0];
} }
} }
// 循环构建子节点 // 循环构建子节点
for (let i = 0;i < nodeArray.length;i++) { for (let i = 0; i < nodeArray.length; i++) {
if (!nodeArray[i]) { if (!nodeArray[i]) {
continue; continue;
} }
@ -157,23 +157,23 @@
let idIsPath = true; let idIsPath = true;
//判断ID是否匹配 目前发现问题的只有重复场景，而重复场景是在第二个节点开始合并的。所以这里暂时只判断第二个场景问题。 //判断ID是否匹配 目前发现问题的只有重复场景，而重复场景是在第二个节点开始合并的。所以这里暂时只判断第二个场景问题。
//如果出现了其他问题，则需要检查其他问题的数据结构。暂时采用具体问题具体分析的策略 //如果出现了其他问题，则需要检查其他问题的数据结构。暂时采用具体问题具体分析的策略
if(i === nodeArray.length-2){ if (i === nodeArray.length - 2) {
idIsPath = false; idIsPath = false;
let childId = ""; let childId = "";
if(children[j].value != null && children[j].value.scenario !== null){ if (children[j].value != null && children[j].value.scenario !== null) {
let scenarioArr = JSON.parse(children[j].value.scenario); let scenarioArr = JSON.parse(children[j].value.scenario);
if(scenarioArr.length>1){ if (scenarioArr.length > 1) {
let childArr = scenarioArr[0].split("_"); let childArr = scenarioArr[0].split("_");
childId = childArr[0]; childId = childArr[0];
} }
} }
if(scenarioId === ""){ if (scenarioId === "") {
idIsPath = true; idIsPath = true;
}else if(scenarioId === childId){ } else if (scenarioId === childId) {
idIsPath = true; idIsPath = true;
} }
} }
if(idIsPath){ if (idIsPath) {
if (i !== nodeArray.length - 1 && !children[j].children) { if (i !== nodeArray.length - 1 && !children[j].children) {
children[j].children = []; children[j].children = [];
} }
@ -346,49 +346,49 @@
return getCurrentProjectID(); return getCurrentProjectID();
}, },
} }
} }
</script> </script>
<style> <style>
.report-container .el-tabs__header { .report-container .el-tabs__header {
margin-bottom: 1px; margin-bottom: 1px;
} }
</style> </style>
<style scoped> <style scoped>
.report-container { .report-container {
height: calc(100vh - 155px); height: calc(100vh - 155px);
min-height: 600px; min-height: 600px;
overflow-y: auto; overflow-y: auto;
} }
.report-header { .report-header {
font-size: 15px; font-size: 15px;
} }
.report-header a { .report-header a {
text-decoration: none; text-decoration: none;
} }
.report-header .time { .report-header .time {
color: #909399; color: #909399;
margin-left: 10px; margin-left: 10px;
} }
.report-container .fail { .report-container .fail {
color: #F56C6C; color: #F56C6C;
} }
.report-container .is-active .fail { .report-container .is-active .fail {
color: inherit; color: inherit;
} }
.export-button { .export-button {
float: right; float: right;
} }
.scenario-result .icon.is-active { .scenario-result .icon.is-active {
transform: rotate(90deg); transform: rotate(90deg);
} }
</style> </style>

217
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -5,7 +5,7 @@
<!--操作按钮--> <!--操作按钮-->
<div class="ms-opt-btn"> <div class="ms-opt-btn">
<el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="path === '/api/automation/update'">{{$t('operating_log.change_history')}}</el-link> <el-link type="primary" style="margin-right: 20px" @click="openHis" v-if="path === '/api/automation/update'">{{ $t('operating_log.change_history') }}</el-link>
<el-button id="inputDelay" type="primary" size="small" v-prevent-re-click @click="editScenario" <el-button id="inputDelay" type="primary" size="small" v-prevent-re-click @click="editScenario"
title="ctrl + s"> title="ctrl + s">
@ -118,7 +118,7 @@
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="3" class="ms-col-one ms-font"> <el-col :span="3" class="ms-col-one ms-font">
{{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}} {{ $t('api_test.automation.step_total') }}：{{ scenarioDefinition.length }}
</el-col> </el-col>
<el-col :span="3" class="ms-col-one ms-font"> <el-col :span="3" class="ms-col-one ms-font">
<el-link class="head" @click="showScenarioParameters">{{ $t('api_test.automation.scenario_total') }} <el-link class="head" @click="showScenarioParameters">{{ $t('api_test.automation.scenario_total') }}
@ -148,10 +148,10 @@
<!-- 场景步骤内容 --> <!-- 场景步骤内容 -->
<div> <div>
<el-button class="el-icon-files ms-open-btn ms-open-btn-left" size="mini" v-prevent-re-click @click="openExpansion"> <el-button class="el-icon-files ms-open-btn ms-open-btn-left" size="mini" v-prevent-re-click @click="openExpansion">
{{$t('api_test.automation.open_expansion')}} {{ $t('api_test.automation.open_expansion') }}
</el-button> </el-button>
<el-button class=" el-icon-notebook-1 ms-open-btn" size="mini" @click="closeExpansion"> <el-button class=" el-icon-notebook-1 ms-open-btn" size="mini" @click="closeExpansion">
{{$t('api_test.automation.close_expansion')}} {{ $t('api_test.automation.close_expansion') }}
</el-button> </el-button>
<el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree" <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree"
:default-expanded-keys="expandedNode" :default-expanded-keys="expandedNode"
@ -239,9 +239,9 @@
</template> </template>
<script> <script>
import {API_STATUS, PRIORITY} from "../../definition/model/JsonData"; import {API_STATUS, PRIORITY} from "../../definition/model/JsonData";
import {WORKSPACE_ID} from '@/common/js/constants'; import {WORKSPACE_ID} from '@/common/js/constants';
import { import {
Assertions, Assertions,
ConstantTimer, ConstantTimer,
Extract, Extract,
@ -249,32 +249,32 @@
JSR223Processor, JSR223Processor,
LoopController, LoopController,
TransactionController TransactionController
} from "../../definition/model/ApiTestModel"; } from "../../definition/model/ApiTestModel";
import {parseEnvironment} from "../../definition/model/EnvironmentModel"; import {parseEnvironment} from "../../definition/model/EnvironmentModel";
import {ELEMENT_TYPE, ELEMENTS} from "./Setting"; import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
import MsApiCustomize from "./ApiCustomize"; import MsApiCustomize from "./ApiCustomize";
import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent, getCurrentProjectID} from "@/common/js/utils"; import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent, getCurrentProjectID} from "@/common/js/utils";
import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
import MsInputTag from "./MsInputTag"; import MsInputTag from "./MsInputTag";
import MsRun from "./DebugRun"; import MsRun from "./DebugRun";
import MsApiReportDetail from "../report/ApiReportDetail"; import MsApiReportDetail from "../report/ApiReportDetail";
import MsVariableList from "./variable/VariableList"; import MsVariableList from "./variable/VariableList";
import ApiImport from "../../definition/components/import/ApiImport"; import ApiImport from "../../definition/components/import/ApiImport";
import "@/common/css/material-icons.css" import "@/common/css/material-icons.css"
import OutsideClick from "@/common/js/outside-click"; import OutsideClick from "@/common/js/outside-click";
import ScenarioApiRelevance from "./api/ApiRelevance"; import ScenarioApiRelevance from "./api/ApiRelevance";
import ScenarioRelevance from "./api/ScenarioRelevance"; import ScenarioRelevance from "./api/ScenarioRelevance";
import MsComponentConfig from "./component/ComponentConfig"; import MsComponentConfig from "./component/ComponentConfig";
import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover"; import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
import MaximizeScenario from "./maximize/MaximizeScenario"; import MaximizeScenario from "./maximize/MaximizeScenario";
import ScenarioHeader from "./maximize/ScenarioHeader"; import ScenarioHeader from "./maximize/ScenarioHeader";
import MsDrawer from "../../../common/components/MsDrawer"; import MsDrawer from "../../../common/components/MsDrawer";
import MsSelectTree from "../../../common/select-tree/SelectTree"; import MsSelectTree from "../../../common/select-tree/SelectTree";
import {saveScenario} from "@/business/components/api/automation/api-automation"; import {saveScenario} from "@/business/components/api/automation/api-automation";
import MsChangeHistory from "../../../history/ChangeHistory"; import MsChangeHistory from "../../../history/ChangeHistory";
let jsonPath = require('jsonpath'); let jsonPath = require('jsonpath');
export default { export default {
name: "EditApiScenario", name: "EditApiScenario",
props: { props: {
moduleOptions: Array, moduleOptions: Array,
@ -667,12 +667,12 @@
} }
} }
if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) { if (arr[i].hashTree !== undefined && arr[i].hashTree.length > 0) {
this.recursiveSorting(arr[i].hashTree, arr[i].projectId); this.recursiveSorting(arr[i].hashTree, arr[i].projectId);
} }
// 添加debug结果 // 添加debug结果
if (this.debugResult && this.debugResult.get(arr[i].id)) { if (this.debugResult && this.debugResult.get(arr[i].id + arr[i].name)) {
arr[i].requestResult = this.debugResult.get(arr[i].id); arr[i].requestResult = this.debugResult.get(arr[i].id + arr[i].name);
} }
} }
}, },
@ -698,19 +698,19 @@
} }
} }
if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) { if (this.scenarioDefinition[i].hashTree !== undefined && this.scenarioDefinition[i].hashTree.length > 0) {
this.recursiveSorting(this.scenarioDefinition[i].hashTree, this.scenarioDefinition[i].projectId); this.recursiveSorting(this.scenarioDefinition[i].hashTree, this.scenarioDefinition[i].projectId);
} }
// 添加debug结果 // 添加debug结果
if (this.debugResult && this.debugResult.get(this.scenarioDefinition[i].id)) { if (this.debugResult && this.debugResult.get(this.scenarioDefinition[i].id + this.scenarioDefinition[i].name)) {
this.scenarioDefinition[i].requestResult = this.debugResult.get(this.scenarioDefinition[i].id); this.scenarioDefinition[i].requestResult = this.debugResult.get(this.scenarioDefinition[i].id + this.scenarioDefinition[i].name);
} }
} }
}, },
addCustomizeApi(request) { addCustomizeApi(request) {
this.customizeVisible = false; this.customizeVisible = false;
request.enable === undefined ? request.enable = true : request.enable; request.enable === undefined ? request.enable = true : request.enable;
if (this.selectedTreeNode != undefined) { if (this.selectedTreeNode !== undefined) {
this.selectedTreeNode.hashTree.push(request); this.selectedTreeNode.hashTree.push(request);
} else { } else {
this.scenarioDefinition.push(request); this.scenarioDefinition.push(request);
@ -730,7 +730,7 @@
item.hashTree = []; item.hashTree = [];
} }
item.enable === undefined ? item.enable = true : item.enable; item.enable === undefined ? item.enable = true : item.enable;
if (this.selectedTreeNode != undefined) { if (this.selectedTreeNode !== undefined) {
this.selectedTreeNode.hashTree.push(item); this.selectedTreeNode.hashTree.push(item);
} else { } else {
this.scenarioDefinition.push(item); this.scenarioDefinition.push(item);
@ -768,7 +768,7 @@
if (referenced === 'REF' || !request.hashTree) { if (referenced === 'REF' || !request.hashTree) {
request.hashTree = []; request.hashTree = [];
} }
if (this.selectedTreeNode != undefined) { if (this.selectedTreeNode !== undefined) {
this.selectedTreeNode.hashTree.push(request); this.selectedTreeNode.hashTree.push(request);
} else { } else {
this.scenarioDefinition.push(request); this.scenarioDefinition.push(request);
@ -783,7 +783,7 @@
this.reload(); this.reload();
}, },
getMaintainerOptions() { getMaintainerOptions() {
this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()},response => { this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
this.maintainerOptions = response.data; this.maintainerOptions = response.data;
}); });
}, },
@ -802,7 +802,7 @@
if (action === 'confirm') { if (action === 'confirm') {
const parent = node.parent const parent = node.parent
const hashTree = parent.data.hashTree || parent.data; const hashTree = parent.data.hashTree || parent.data;
const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId) const index = hashTree.findIndex(d => d.resourceId !== undefined && row.resourceId !== undefined && d.resourceId === row.resourceId)
hashTree.splice(index, 1); hashTree.splice(index, 1);
this.sort(); this.sort();
this.reload(); this.reload();
@ -820,7 +820,7 @@
obj.name = obj.name + '_copy'; obj.name = obj.name + '_copy';
} }
const index = hashTree.findIndex(d => d.resourceId === row.resourceId); const index = hashTree.findIndex(d => d.resourceId === row.resourceId);
if (index != -1) { if (index !== -1) {
hashTree.splice(index + 1, 0, obj); hashTree.splice(index + 1, 0, obj);
} else { } else {
hashTree.push(obj); hashTree.push(obj);
@ -912,8 +912,7 @@
allowDrop(draggingNode, dropNode, dropType) { allowDrop(draggingNode, dropNode, dropType) {
if (dropType != "inner") { if (dropType != "inner") {
return true; return true;
} } else if (dropType === "inner" && dropNode.data.referenced !== 'REF' && dropNode.data.referenced !== 'Deleted'
else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
&& ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) { && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
return true; return true;
} }
@ -1167,155 +1166,155 @@
this.reload(); this.reload();
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.card-content { .card-content {
height: calc(100vh - 196px); height: calc(100vh - 196px);
overflow-y: auto; overflow-y: auto;
} }
.ms-scenario-input { .ms-scenario-input {
width: 100%; width: 100%;
} }
.ms-main-div { .ms-main-div {
background-color: white; background-color: white;
} }
.ms-debug-div { .ms-debug-div {
border: 1px #DCDFE6 solid; border: 1px #DCDFE6 solid;
border-radius: 4px; border-radius: 4px;
margin-right: 20px; margin-right: 20px;
} }
.ms-scenario-button { .ms-scenario-button {
margin-left: 20px; margin-left: 20px;
padding: 7px; padding: 7px;
} }
.tip { .tip {
padding: 3px 5px; padding: 3px 5px;
font-size: 16px; font-size: 16px;
border-radius: 4px; border-radius: 4px;
border-left: 4px solid #783887; border-left: 4px solid #783887;
} }
.ms-api-col { .ms-api-col {
background-color: #7C3985; background-color: #7C3985;
border-color: #7C3985; border-color: #7C3985;
margin-right: 10px; margin-right: 10px;
color: white; color: white;
} }
.ms-font { .ms-font {
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
} }
.ms-col-one { .ms-col-one {
margin-top: 5px; margin-top: 5px;
} }
#fab { #fab {
right: 90px; right: 90px;
z-index: 5; z-index: 5;
} }
/deep/ .el-tree-node__content { /deep/ .el-tree-node__content {
height: 100%; height: 100%;
margin-top: 3px; margin-top: 3px;
vertical-align: center; vertical-align: center;
} }
/deep/ .el-card__body { /deep/ .el-card__body {
padding: 10px; padding: 10px;
} }
/deep/ .el-drawer__body { /deep/ .el-drawer__body {
overflow: auto; overflow: auto;
} }
/deep/ .el-step__icon.is-text { /deep/ .el-step__icon.is-text {
border: 1px solid; border: 1px solid;
} }
/deep/ .el-drawer__header { /deep/ .el-drawer__header {
margin-bottom: 0px; margin-bottom: 0px;
} }
/deep/ .el-link { /deep/ .el-link {
font-weight: normal; font-weight: normal;
} }
/deep/ .el-checkbox { /deep/ .el-checkbox {
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
} }
/deep/ .el-checkbox__label { /deep/ .el-checkbox__label {
padding-left: 5px; padding-left: 5px;
} }
.head { .head {
border-bottom: 1px solid #303133; border-bottom: 1px solid #303133;
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
} }
.ms-opt-btn { .ms-opt-btn {
position: fixed; position: fixed;
right: 50px; right: 50px;
z-index: 1; z-index: 1;
} }
.ms-tree >>> .el-tree-node__expand-icon.expanded { .ms-tree >>> .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
.ms-tree >>> .el-icon-caret-right:before { .ms-tree >>> .el-icon-caret-right:before {
content: '\e723'; content: '\e723';
font-size: 20px; font-size: 20px;
} }
.ms-tree >>> .el-tree-node__expand-icon.is-leaf { .ms-tree >>> .el-tree-node__expand-icon.is-leaf {
color: transparent; color: transparent;
} }
.ms-tree >>> .el-tree-node__expand-icon { .ms-tree >>> .el-tree-node__expand-icon {
color: #7C3985; color: #7C3985;
} }
.ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before { .ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
color: #7C3985; color: #7C3985;
content: "\e722"; content: "\e722";
font-size: 20px; font-size: 20px;
} }
.ms-sc-variable-header >>> .el-dialog__body { .ms-sc-variable-header >>> .el-dialog__body {
padding: 0px 20px; padding: 0px 20px;
} }
.alt-ico { .alt-ico {
font-size: 15px; font-size: 15px;
margin: 5px 10px 0px; margin: 5px 10px 0px;
float: right; float: right;
color: #8c939d; color: #8c939d;
} }
.alt-ico:hover { .alt-ico:hover {
color: black; color: black;
cursor: pointer; cursor: pointer;
font-size: 18px; font-size: 18px;
} }
.scenario-name { .scenario-name {
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
overflow-x: hidden; overflow-x: hidden;
@ -1324,16 +1323,16 @@
vertical-align: middle; vertical-align: middle;
white-space: nowrap; white-space: nowrap;
width: 200px; width: 200px;
} }
.ms-open-btn { .ms-open-btn {
margin: 5px 5px 0px; margin: 5px 5px 0px;
font-size: 10px; font-size: 10px;
background-color: #F2F9EE; background-color: #F2F9EE;
color: #67C23A; color: #67C23A;
} }
.ms-open-btn-left { .ms-open-btn-left {
margin-left: 30px; margin-left: 30px;
} }
</style> </style>

4
frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
View File

@ -336,10 +336,10 @@ export default {
if (this.node) { if (this.node) {
this.node.expanded = this.request.active; this.node.expanded = this.request.active;
} }
if (this.node.expanded && this.expandedNode.indexOf(this.request.resourceId) === -1) { if (this.node.expanded && this.expandedNode && this.expandedNode.indexOf(this.request.resourceId) === -1) {
this.expandedNode.push(this.request.resourceId); this.expandedNode.push(this.request.resourceId);
} else { } else {
if (this.expandedNode.indexOf(this.request.resourceId) !== -1) { if (this.expandedNode && this.expandedNode.indexOf(this.request.resourceId) !== -1) {
this.expandedNode.splice(this.expandedNode.indexOf(this.request.resourceId), 1); this.expandedNode.splice(this.expandedNode.indexOf(this.request.resourceId), 1);
} }
} }

207
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -6,10 +6,10 @@
<!-- 场景步骤内容 --> <!-- 场景步骤内容 -->
<div v-loading="loading"> <div v-loading="loading">
<el-button class="el-icon-files ms-open-btn ms-open-btn-left" size="mini" @click="openExpansion"> <el-button class="el-icon-files ms-open-btn ms-open-btn-left" size="mini" @click="openExpansion">
{{$t('api_test.automation.open_expansion')}} {{ $t('api_test.automation.open_expansion') }}
</el-button> </el-button>
<el-button class="el-icon-notebook-1 ms-open-btn" size="mini" @click="closeExpansion"> <el-button class="el-icon-notebook-1 ms-open-btn" size="mini" @click="closeExpansion">
{{$t('api_test.automation.close_expansion')}} {{ $t('api_test.automation.close_expansion') }}
</el-button> </el-button>
<el-tree node-key="resourceId" <el-tree node-key="resourceId"
:props="props" :props="props"
@ -130,40 +130,40 @@
</template> </template>
<script> <script>
import {API_STATUS, PRIORITY} from "../../../definition/model/JsonData"; import {API_STATUS, PRIORITY} from "../../../definition/model/JsonData";
import {WORKSPACE_ID} from '@/common/js/constants'; import {WORKSPACE_ID} from '@/common/js/constants';
import { import {
Assertions, Assertions,
ConstantTimer, ConstantTimer,
Extract, Extract,
IfController, IfController,
JSR223Processor, JSR223Processor,
LoopController LoopController
} from "../../../definition/model/ApiTestModel"; } from "../../../definition/model/ApiTestModel";
import {parseEnvironment} from "../../../definition/model/EnvironmentModel"; import {parseEnvironment} from "../../../definition/model/EnvironmentModel";
import {ELEMENT_TYPE, ELEMENTS} from "../Setting"; import {ELEMENT_TYPE, ELEMENTS} from "../Setting";
import MsApiCustomize from "../ApiCustomize"; import MsApiCustomize from "../ApiCustomize";
import {getCurrentProjectID, getUUID, strMapToObj} from "@/common/js/utils"; import {getCurrentProjectID, getUUID, strMapToObj} from "@/common/js/utils";
import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
import MsInputTag from "../MsInputTag"; import MsInputTag from "../MsInputTag";
import MsRun from "../DebugRun"; import MsRun from "../DebugRun";
import MsApiReportDetail from "../../report/ApiReportDetail"; import MsApiReportDetail from "../../report/ApiReportDetail";
import MsVariableList from "../variable/VariableList"; import MsVariableList from "../variable/VariableList";
import ApiImport from "../../../definition/components/import/ApiImport"; import ApiImport from "../../../definition/components/import/ApiImport";
import "@/common/css/material-icons.css" import "@/common/css/material-icons.css"
import OutsideClick from "@/common/js/outside-click"; import OutsideClick from "@/common/js/outside-click";
import ScenarioApiRelevance from "../api/ApiRelevance"; import ScenarioApiRelevance from "../api/ApiRelevance";
import ScenarioRelevance from "../api/ScenarioRelevance"; import ScenarioRelevance from "../api/ScenarioRelevance";
import MsComponentConfig from "../component/ComponentConfig"; import MsComponentConfig from "../component/ComponentConfig";
import {handleCtrlSEvent} from "../../../../../../common/js/utils"; import {handleCtrlSEvent} from "../../../../../../common/js/utils";
import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover"; import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
import MsContainer from "../../../../common/components/MsContainer"; import MsContainer from "../../../../common/components/MsContainer";
import MsMainContainer from "../../../../common/components/MsMainContainer"; import MsMainContainer from "../../../../common/components/MsMainContainer";
import MsAsideContainer from "./MsLeftContainer"; import MsAsideContainer from "./MsLeftContainer";
import {saveScenario} from "@/business/components/api/automation/api-automation"; import {saveScenario} from "@/business/components/api/automation/api-automation";
let jsonPath = require('jsonpath'); let jsonPath = require('jsonpath');
export default { export default {
name: "MaximizeScenario", name: "MaximizeScenario",
props: { props: {
moduleOptions: Array, moduleOptions: Array,
@ -516,8 +516,8 @@
this.recursiveSorting(arr[i].hashTree, arr[i].projectId); this.recursiveSorting(arr[i].hashTree, arr[i].projectId);
} }
// 添加debug结果 // 添加debug结果
if (this.debugResult && this.debugResult.get(arr[i].id)) { if (this.debugResult && this.debugResult.get(arr[i].id + arr[i].name)) {
arr[i].requestResult = this.debugResult.get(arr[i].id); arr[i].requestResult = this.debugResult.get(arr[i].id + arr[i].name);
} }
} }
}, },
@ -539,8 +539,8 @@
this.recursiveSorting(this.scenarioDefinition[i].hashTree, this.scenarioDefinition[i].projectId); this.recursiveSorting(this.scenarioDefinition[i].hashTree, this.scenarioDefinition[i].projectId);
} }
// 添加debug结果 // 添加debug结果
if (this.debugResult && this.debugResult.get(this.scenarioDefinition[i].id)) { if (this.debugResult && this.debugResult.get(this.scenarioDefinition[i].id + this.scenarioDefinition[i].name)) {
this.scenarioDefinition[i].requestResult = this.debugResult.get(this.scenarioDefinition[i].id); this.scenarioDefinition[i].requestResult = this.debugResult.get(this.scenarioDefinition[i].id + this.scenarioDefinition[i].name);
} }
} }
}, },
@ -740,8 +740,7 @@
allowDrop(draggingNode, dropNode, dropType) { allowDrop(draggingNode, dropNode, dropType) {
if (dropType != "inner") { if (dropType != "inner") {
return true; return true;
} } else if (dropType === "inner" && dropNode.data.referenced !== 'REF' && dropNode.data.referenced !== 'Deleted'
else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
&& ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) { && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
return true; return true;
} }
@ -960,184 +959,184 @@
this.reload(); this.reload();
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.card-content { .card-content {
height: calc(100vh - 196px); height: calc(100vh - 196px);
overflow-y: auto; overflow-y: auto;
} }
.ms-scenario-input { .ms-scenario-input {
width: 100%; width: 100%;
} }
.ms-main-div { .ms-main-div {
background-color: white; background-color: white;
} }
.ms-debug-div { .ms-debug-div {
border: 1px #DCDFE6 solid; border: 1px #DCDFE6 solid;
border-radius: 4px; border-radius: 4px;
margin-right: 20px; margin-right: 20px;
} }
.ms-scenario-button { .ms-scenario-button {
margin-left: 20px; margin-left: 20px;
padding: 7px; padding: 7px;
} }
.tip { .tip {
padding: 3px 5px; padding: 3px 5px;
font-size: 16px; font-size: 16px;
border-radius: 4px; border-radius: 4px;
border-left: 4px solid #783887; border-left: 4px solid #783887;
} }
.ms-api-col { .ms-api-col {
background-color: #7C3985; background-color: #7C3985;
border-color: #7C3985; border-color: #7C3985;
margin-right: 10px; margin-right: 10px;
color: white; color: white;
} }
.ms-font { .ms-font {
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
} }
.ms-col-one { .ms-col-one {
margin-top: 10px; margin-top: 10px;
} }
#fab { #fab {
left: 100px; left: 100px;
z-index: 5; z-index: 5;
} }
/deep/ .el-tree-node__content { /deep/ .el-tree-node__content {
height: 100%; height: 100%;
margin-top: 8px; margin-top: 8px;
vertical-align: center; vertical-align: center;
} }
/deep/ .el-card__body { /deep/ .el-card__body {
padding: 5px; padding: 5px;
} }
/deep/ .el-drawer__body { /deep/ .el-drawer__body {
overflow: auto; overflow: auto;
} }
/deep/ .el-step__icon.is-text { /deep/ .el-step__icon.is-text {
border: 1px solid; border: 1px solid;
} }
/deep/ .el-drawer__header { /deep/ .el-drawer__header {
margin-bottom: 0px; margin-bottom: 0px;
} }
/deep/ .el-link { /deep/ .el-link {
font-weight: normal; font-weight: normal;
} }
/deep/ .el-checkbox { /deep/ .el-checkbox {
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
} }
/deep/ .el-checkbox__label { /deep/ .el-checkbox__label {
padding-left: 5px; padding-left: 5px;
} }
.head { .head {
border-bottom: 1px solid #303133; border-bottom: 1px solid #303133;
color: #303133; color: #303133;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
font-size: 13px; font-size: 13px;
} }
.ms-opt-btn { .ms-opt-btn {
position: fixed; position: fixed;
right: 50px; right: 50px;
z-index: 1; z-index: 1;
} }
.ms-tree >>> .el-tree-node__expand-icon.expanded { .ms-tree >>> .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
.ms-tree >>> .el-icon-caret-right:before { .ms-tree >>> .el-icon-caret-right:before {
content: '\e723'; content: '\e723';
font-size: 20px; font-size: 20px;
} }
.ms-tree >>> .el-tree-node__expand-icon.is-leaf { .ms-tree >>> .el-tree-node__expand-icon.is-leaf {
color: transparent; color: transparent;
} }
.ms-tree >>> .el-tree-node__expand-icon { .ms-tree >>> .el-tree-node__expand-icon {
color: #7C3985; color: #7C3985;
} }
.ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before { .ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
color: #7C3985; color: #7C3985;
content: "\e722"; content: "\e722";
font-size: 20px; font-size: 20px;
} }
.ms-sc-variable-header >>> .el-dialog__body { .ms-sc-variable-header >>> .el-dialog__body {
padding: 0px 20px; padding: 0px 20px;
} }
.custom-tree-node { .custom-tree-node {
width: 1000px; width: 1000px;
} }
.father .child { .father .child {
display: none; display: none;
} }
.scenario-aside { .scenario-aside {
min-width: 400px; min-width: 400px;
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
border: 1px solid #EBEEF5; border: 1px solid #EBEEF5;
box-sizing: border-box; box-sizing: border-box;
} }
.scenario-main { .scenario-main {
position: relative; position: relative;
margin-left: 20px; margin-left: 20px;
border: 1px solid #EBEEF5; border: 1px solid #EBEEF5;
} }
.scenario-list { .scenario-list {
overflow-y: auto; overflow-y: auto;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 28px; bottom: 28px;
} }
.father:hover .child { .father:hover .child {
display: block; display: block;
} }
.ms-open-btn { .ms-open-btn {
margin: 5px 5px 0px; margin: 5px 5px 0px;
font-size: 10px; font-size: 10px;
background-color: #F2F9EE; background-color: #F2F9EE;
color: #67C23A; color: #67C23A;
} }
.ms-open-btn-left { .ms-open-btn-left {
margin-left: 30px; margin-left: 30px;
} }
</style> </style>