Merge branch 'master' of https://github.com/metersphere/metersphere
This commit is contained in:
commit
ab7c863acc
|
@ -211,6 +211,9 @@
|
|||
return true;
|
||||
}
|
||||
},
|
||||
showExecResult(data) {
|
||||
this.$emit('showExecResult', data);
|
||||
},
|
||||
getBodyUploadFiles(row) {
|
||||
let bodyUploadFiles = [];
|
||||
row.bodyUploadIds = [];
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
<api-case-item v-loading="singleLoading && singleRunId === item.id"
|
||||
@refresh="getApiTest"
|
||||
@singleRun="singleRun"
|
||||
@showExecResult="showExecResult"
|
||||
:is-case-edit="isCaseEdit"
|
||||
:api="api"
|
||||
:api-case="item" :index="index"/>
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
:total="total"/>
|
||||
</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"/>
|
||||
</div>
|
||||
|
@ -86,7 +86,7 @@
|
|||
import MsBottomContainer from "../BottomContainer";
|
||||
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
|
||||
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 ApiListContainer from "./ApiListContainer";
|
||||
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, this.condition);
|
||||
this.initTable();
|
||||
|
|
Loading…
Reference in New Issue