提交 3090f109 编写于 作者: 泰斯特Test's avatar 泰斯特Test

feat: add testData entry

上级 edf07bc5
...@@ -90,6 +90,15 @@ ...@@ -90,6 +90,15 @@
<el-option v-for="(item,index) in Host" :key="index" :label="item.name" :value="item.host"></el-option> <el-option v-for="(item,index) in Host" :key="index" :label="item.name" :value="item.host"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="测试数据" prop="globalVarsId">
<el-select
v-model="editForm.globalVarsId"
@visible-change="checkActiveStorage"
clearable
auto-complete="off">
<el-option v-for="(item,index) in TestDataStorage" :key="index" :label="item.name" :value="item._id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="触发类型" prop="triggerType"> <el-form-item label="触发类型" prop="triggerType">
<el-select clearable v-model.trim="editForm.triggerType" @change="editFormTriggerTypeChange" auto-complete="off"> <el-select clearable v-model.trim="editForm.triggerType" @change="editFormTriggerTypeChange" auto-complete="off">
<el-option v-for="(item,index) in TriggerTypes" :key="index+''" :label="item.name" :value="item.value"></el-option> <el-option v-for="(item,index) in TriggerTypes" :key="index+''" :label="item.name" :value="item.value"></el-option>
...@@ -232,6 +241,15 @@ ...@@ -232,6 +241,15 @@
<el-option v-for="(item,index) in Host" :key="index" :label="item.name" :value="item.host"></el-option> <el-option v-for="(item,index) in Host" :key="index" :label="item.name" :value="item.host"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="测试数据" prop="globalVarsId">
<el-select
v-model="addForm.globalVarsId"
@visible-change="checkActiveStorage"
clearable
auto-complete="off">
<el-option v-for="(item,index) in TestDataStorage" :key="index" :label="item.name" :value="item._id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="触发类型" prop="triggerType"> <el-form-item label="触发类型" prop="triggerType">
<el-select clearable v-model.trim="addForm.triggerType" auto-complete="off" @change="addFormTriggerTypeChange"> <el-select clearable v-model.trim="addForm.triggerType" auto-complete="off" @change="addFormTriggerTypeChange">
<el-option v-for="(item,index) in TriggerTypes" :key="index+''" :label="item.name" :value="item.value"></el-option> <el-option v-for="(item,index) in TriggerTypes" :key="index+''" :label="item.name" :value="item.value"></el-option>
...@@ -370,6 +388,7 @@ ...@@ -370,6 +388,7 @@
import {getCaseSuiteList} from '../../../../api/caseSuite'; import {getCaseSuiteList} from '../../../../api/caseSuite';
import {getHosts} from "../../../../api/host"; import {getHosts} from "../../../../api/host";
import {getMails} from '../../../../api/mail'; import {getMails} from '../../../../api/mail';
import {getTestDataStorageList} from '../../../../api/testDataStorage';
import {getCrons, addCron, updateCron, pauseCron, resumeCron, delCron} from "../../../../api/cron"; import {getCrons, addCron, updateCron, pauseCron, resumeCron, delCron} from "../../../../api/cron";
import {getCookie} from "@/utils/cookie"; import {getCookie} from "@/utils/cookie";
export default { export default {
...@@ -400,6 +419,7 @@ ...@@ -400,6 +419,7 @@
order: 'descending', order: 'descending',
pageNum: 1, pageNum: 1,
totalNum: 0, totalNum: 0,
TestDataStorage:[],
sels: [],//列表选中列 sels: [],//列表选中列
delLoading: false, delLoading: false,
disDel: true, disDel: true,
...@@ -421,6 +441,9 @@ ...@@ -421,6 +441,9 @@
testDomain: [ testDomain: [
{ required: true, message: '请选择测试环境', trigger: 'blur' } { required: true, message: '请选择测试环境', trigger: 'blur' }
], ],
globalVarsId: [
{ required: false, message: '请选择测试数据', trigger: 'blur' }
],
alarmMailList: [ alarmMailList: [
{ required: false, message: '请选择告警邮箱', trigger: 'blur' } { required: false, message: '请选择告警邮箱', trigger: 'blur' }
], ],
...@@ -451,6 +474,7 @@ ...@@ -451,6 +474,7 @@
testCaseSuiteIdList: [], testCaseSuiteIdList: [],
isExecuteForbiddenedCase: false, isExecuteForbiddenedCase: false,
testDomain: '', testDomain: '',
globalVarsId: '',
alarmMailList: [], alarmMailList: [],
isDingDingNotify: false, isDingDingNotify: false,
dingdingNotifyStrategy: {success: false, fail: true}, dingdingNotifyStrategy: {success: false, fail: true},
...@@ -476,6 +500,9 @@ ...@@ -476,6 +500,9 @@
testDomain: [ testDomain: [
{ required: true, message: '请选择测试环境', trigger: 'blur' } { required: true, message: '请选择测试环境', trigger: 'blur' }
], ],
globalVarsId: [
{ required: false, message: '请选择测试数据', trigger: 'blur' }
],
alarmMailList: [ alarmMailList: [
{ required: false, message: '请选择告警邮箱', trigger: 'blur' } { required: false, message: '请选择告警邮箱', trigger: 'blur' }
], ],
...@@ -506,6 +533,7 @@ ...@@ -506,6 +533,7 @@
testCaseSuiteIdList: [], testCaseSuiteIdList: [],
isExecuteForbiddenedCase: false, isExecuteForbiddenedCase: false,
testDomain: '', testDomain: '',
globalVarsId: '',
alarmMailList: [], alarmMailList: [],
isDingDingNotify: false, isDingDingNotify: false,
dingdingNotifyStrategy: {success: false, fail: true}, dingdingNotifyStrategy: {success: false, fail: true},
...@@ -529,6 +557,28 @@ ...@@ -529,6 +557,28 @@
} }
}, },
methods: { methods: {
getTestDataStorage(){
let self = this;
let header = {};
let params = {status: true, projectId: self.$route.params.project_id};
getTestDataStorageList(self.$route.params.project_id, params, header).then((res) => {
let {status, data} = res
if (status === 'ok'){
self.TestDataStorage = data.rows
}
else{
self.$message.error({
message: data,
center: true,
})
}
}).catch((error) => {
self.$message.error({
message: '暂时无法获取 TestDataStorage,请稍后刷新重试~',
center: true,
});
})
},
getHost() { getHost() {
let self = this; let self = this;
let header = {}; let header = {};
...@@ -718,6 +768,7 @@ ...@@ -718,6 +768,7 @@
name: self.addForm.name, name: self.addForm.name,
testCaseSuiteIdList: self.addForm.testCaseSuiteIdList, testCaseSuiteIdList: self.addForm.testCaseSuiteIdList,
testDomain: self.addForm.testDomain, testDomain: self.addForm.testDomain,
globalVarsId: self.addForm.globalVarsId,
isExecuteForbiddenedCase: self.addForm.isExecuteForbiddenedCase, isExecuteForbiddenedCase: self.addForm.isExecuteForbiddenedCase,
triggerType: self.addForm.triggerType, triggerType: self.addForm.triggerType,
description: self.addForm.description, description: self.addForm.description,
...@@ -798,6 +849,7 @@ ...@@ -798,6 +849,7 @@
testCaseSuiteIdList: self.editForm.testCaseSuiteIdList, testCaseSuiteIdList: self.editForm.testCaseSuiteIdList,
isExecuteForbiddenedCase: self.editForm.isExecuteForbiddenedCase, isExecuteForbiddenedCase: self.editForm.isExecuteForbiddenedCase,
testDomain: self.editForm.testDomain, testDomain: self.editForm.testDomain,
globalVarsId: self.editForm.globalVarsId,
triggerType: self.editForm.triggerType, triggerType: self.editForm.triggerType,
next_run_time: self.editForm.next_run_time, // 用于判断是否要resume定时任务 next_run_time: self.editForm.next_run_time, // 用于判断是否要resume定时任务
description: self.editForm.description, description: self.editForm.description,
...@@ -1072,6 +1124,15 @@ ...@@ -1072,6 +1124,15 @@
}) })
} }
}, },
checkActiveStorage: function(){
let self = this;
if (self.TestDataStorage.length < 1){
self.$message.warning({
message: '未找到「启用的数据字典」哦, 请前往「数据仓库」进行设置',
center: true,
})
}
},
// 修改table tr行的背景色 // 修改table tr行的背景色
reportRowStyle({ row, rowIndex }){ reportRowStyle({ row, rowIndex }){
if (row.status === 'PAUSED') if (row.status === 'PAUSED')
...@@ -1087,6 +1148,7 @@ ...@@ -1087,6 +1148,7 @@
mounted() { mounted() {
this.getCaseSuites(); this.getCaseSuites();
this.getHost(); this.getHost();
this.getTestDataStorage();
this.getMail(); this.getMail();
this.getTask(); this.getTask();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册