test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-04 21:19:52 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/metersphere

Browse Source
This commit is contained in:
shiziyuan9527 2020-12-17 15:37:49 +08:00
commit ab7c863acc
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
View File

@ -211,6 +211,9 @@
return true; return true;
} }
}, },
showExecResult(data) {
this.$emit('showExecResult', data);
},
getBodyUploadFiles(row) { getBodyUploadFiles(row) {
let bodyUploadFiles = []; let bodyUploadFiles = [];
row.bodyUploadIds = []; row.bodyUploadIds = [];

1
frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
View File

@ -23,6 +23,7 @@
<api-case-item v-loading="singleLoading && singleRunId === item.id" <api-case-item v-loading="singleLoading && singleRunId === item.id"
@refresh="getApiTest" @refresh="getApiTest"
@singleRun="singleRun" @singleRun="singleRun"
@showExecResult="showExecResult"
:is-case-edit="isCaseEdit" :is-case-edit="isCaseEdit"
:api="api" :api="api"
:api-case="item" :index="index"/> :api-case="item" :index="index"/>

8
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -65,7 +65,7 @@
:total="total"/> :total="total"/>
</api-list-container> </api-list-container>
<api-case-list @refresh="initTable" :currentApi="selectCase" ref="caseList"/> <api-case-list @showExecResult="showExecResult" @refresh="initTable" :currentApi="selectCase" ref="caseList"/>
<!--批量编辑--> <!--批量编辑-->
<ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/> <ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
</div> </div>
@ -86,7 +86,7 @@
import MsBottomContainer from "../BottomContainer"; import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn"; import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit"; import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, REQ_METHOD, API_STATUS, CASE_PRIORITY} from "../../model/JsonData"; import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../model/JsonData";
import {getCurrentProjectID} from "@/common/js/utils"; import {getCurrentProjectID} from "@/common/js/utils";
import ApiListContainer from "./ApiListContainer"; import ApiListContainer from "./ApiListContainer";
import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem"; import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
@ -223,6 +223,10 @@
}) })
} }
}, },
showExecResult(row) {
this.visible = false;
this.$emit('showExecResult', row);
},
filter(filters) { filter(filters) {
_filter(filters, this.condition); _filter(filters, this.condition);
this.initTable(); this.initTable();