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

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

This commit is contained in:
chenjianxing 2021-03-24 22:13:10 +08:00
parent 6a79dcba08 51e820d697
commit 6dd49752fc
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -62,14 +62,14 @@
</el-row>
<el-row>
<!-- <el-col :span="7">-->
<!-- <el-form-item label="评审状态" :label-width="formLabelWidth" prop="reviewStatus">-->
<!-- <el-select size="small" v-model="form.reviewStatus" class="ms-case-input">-->
<!-- <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="7">-->
<!-- <el-form-item label="评审状态" :label-width="formLabelWidth" prop="reviewStatus">-->
<!-- <el-select size="small" v-model="form.reviewStatus" class="ms-case-input">-->
<!-- <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="7">
<el-form-item :label="$t('commons.tag')" :label-width="formLabelWidth" prop="tag">
<ms-input-tag :currentScenario="form" v-if="showInputTag" ref="tag" class="ms-case-input"/>
@ -463,6 +463,9 @@ export default {
} else if (this.form.type === 'performance' || this.form.type === 'api') {
url = '/' + this.form.type + '/list/' + this.projectId
}
if (!url) {
return;
}
return new Promise((resolve, reject) => {
this.$get(url).then(res => {
console.log(res.data.data)
@ -475,7 +478,7 @@ export default {
}).catch((err) => {
reject(err)
})
})
});
},
/* lazyLoad(node, resolve){
const { level } = node;
@ -769,7 +772,7 @@ export default {
if (this.form.tags instanceof Array) {
this.form.tags = JSON.stringify(this.form.tags);
}
param.testId=JSON.stringify(this.form.selected)
param.testId = JSON.stringify(this.form.selected)
param.tags = this.form.tags;
param.type = 'functional'
return param;

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

@ -206,7 +206,6 @@ import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-compon
import ShowMoreBtn from "./ShowMoreBtn";
import BatchEdit from "./BatchEdit";
import {PROJECT_NAME, TEST_CASE_LIST, WORKSPACE_ID} from "@/common/js/constants";
import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
import TestCaseDetail from "./TestCaseDetail";
import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
@ -500,8 +499,6 @@ export default {
this.selectRows.clear();
this.$emit("refresh");
this.$success(this.$t('commons.delete_success'));
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
});
}
}
@ -512,8 +509,6 @@ export default {
this.$post('/test/case/delete/' + testCaseId, {}, () => {
this.initTableData();
this.$success(this.$t('commons.delete_success'));
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
});
},
refresh() {
@ -607,8 +602,6 @@ export default {
this.$post('/test/case/batch/edit', param, () => {
this.$success(this.$t('commons.save_success'));
this.refresh();
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
});
},
filter(filters) {
@ -660,8 +653,6 @@ export default {
this.result = this.$post('/test/case/batch/edit', param, () => {
this.$success(this.$t('commons.save_success'));
this.$refs.testBatchMove.close();
// 发送广播，刷新 head 上的最新列表
TrackEvent.$emit(LIST_CHANGE);
this.refresh();
});
}