diff --git a/src/api/xm/core/xmTestCase.js b/src/api/xm/core/xmTestCase.js index 300c6611..f2a77718 100644 --- a/src/api/xm/core/xmTestCase.js +++ b/src/api/xm/core/xmTestCase.js @@ -37,7 +37,7 @@ export const getXmTestCaseSort = params => { return axios.get(`${base}/xm/core/x /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ //初始化页面上的字典 export const initDicts = (that) => { - var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType','testType'];//在此添加要加载的字典 如['sex','grade','lvl'] + var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType','testType','autoTestAuthType','autoTestMethod','autoTestBodyType'];//在此添加要加载的字典 如['sex','grade','lvl'] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ Object.assign(that.dicts,res.data.data) diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index 17f0522a..9bc02f84 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -380,6 +380,24 @@ table tr.hover-row{ width:100%; padding:10px; } + + +.field-bar{ + display:none; +} +.field-text{ + display:inline; +} +.field:hover{ +cursor: pointer; +.field-bar{ + display: inline; +} +.field-text{ + display:none; +} +} + /*此处根据不同屏幕分配率显示不同的样式*/ /*手机端*/ @media only screen and (min-width: 0px) and (max-width: 768px) { diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index fc5d6690..7a9ed310 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -719,20 +719,5 @@ height:auto !important;; } -.field-bar{ - display:none; - } -.field-text{ - display:inline; - } -.field:hover{ - cursor: pointer; - .field-bar{ - display: inline; - } - .field-text{ - display:none; - } -} diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index 7727a8a9..4e99ec6a 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -21,6 +21,10 @@ {{editForm.menuName}}     {{editForm.menuName?'更改':'设置'}}    查看需求 + + + + @@ -79,7 +83,211 @@ - + + +
+ {{autoStep.url}} +
+
+ +
+ + + + + +
+ {{queryStrCpd||'暂无'}} +
+
+ +
+ + + + + + + + + + + + + + 保存 + + + + + + + + + + + + + + + + + + + 保存 + + + + + + + + + + + + + + + + 保存 + + + + + + + + + + + + + + + 保存 + + + + + + + + +
+ {{basicAuth.username}} +
+
+ +
+ + +
+ {{basicAuth.password||'暂无'}} +
+
+ +
+ + + + + +
+ {{bearerToken.bearerToken}} +
+
+ +
+ + + 保存 + + + 可使用的变量 res={config:{协议配置},data:{接口返回的业务数据对象} ,headers:{协议头,key-value型},status:状态码如200/201 } + + + + + if(res.status==200){
+   return true;
+ }else{
+   return false;
+ }
+ + @@ -147,6 +355,9 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 }, computed: { ...mapGetters([ 'userInfo' ]), + queryStrCpd(){ + return this.paramsList.filter(k=>k.id).map(k=>k.id+'='+k.value).join("&") + } }, props:['xmTestCase','visible','opType','xmTestCasedb','xmProduct','xmMenu'], @@ -162,13 +373,27 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 if(visible==true){ this.initData() } - } + }, + queryStr(){ + var paramsList=[] + this.queryStr.split("&").forEach(k=>{ + var k2=k.split("=") + var p={} + if(k2.length>1){ + p={id:k2[0],value:k2[1]} + }else{ + p={id:k2[0],value:''} + } + paramsList.push(p) + }) + this.paramsList=paramsList + } }, data() { return { currOpType:'add',//add/edit load:{ list: false, edit: false, del: false, add: false },//查询中... - dicts:{caseType:[]},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} + dicts:{caseType:[],autoTestMethod:[],autoTestBodyType:[],autoTestAuthType:[]},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} editFormRules: { caseName: [ { required: true, message: '测试用例名称不能为空', trigger: 'change' }, @@ -190,6 +415,46 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 funcVisible:false, activeTab:'1', testCasedbVisible:false, + + paramsList:[{id:'',value:''}],//[{id:'',value:''}] + queryStr:'', + + bodyList:[{id:'',value:''}],//[{id:'',value:''}] + bodyJson:'', + bodyXml:'', + + + cookieList:[{id:'',value:''}],//[{id:'',value:''}] + + headerList:[{id:'',value:''}],//[{id:'',value:''}] + authTypeList:[{id:'',value:''}],//[{id:'',value:''}] + bearerToken:{ + bearerToken:'' + }, + + basicAuth:{ + username:'', + password:'', + }, + expectResultSample:function(res){ + //其中res={config:{},data:{} ,headers:{},status:200 } + if(res.status==200){ + return true; + }else{ + return false; + } + }, + autoStep:{ + url:'', + method:'GET', + authType:'none', + bodyType:'json', + params:{}, + body:{}, + cookie:{}, + expectResult:'' + }, + }//end return },//end data methods: { @@ -228,6 +493,38 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' }); } }); + }, + initQueryStr(){ + this.queryStr=this.paramsList.map(k=>k.id+'='+k.value).join("&") + }, + addParamsRow(row,index){ + this.paramsList.splice(index+1,0,{id:'',value:''}) + }, + deleteParamsRow(row,index){ + this.paramsList.splice(index,1) + }, + addBodyRow(row,index){ + this.bodyList.splice(index+1,0,{id:'',value:''}) + }, + deleteBodyRow(row,index){ + this.bodyList.splice(index,1) + }, + + addCookieRow(row,index){ + this.cookieList.splice(index+1,0,{id:'',value:''}) + }, + deleteCookieRow(row,index){ + this.cookieList.splice(index,1) + }, + + addHeaderRow(row,index){ + this.headerList.splice(index+1,0,{id:'',value:''}) + }, + deleteHeaderRow(row,index){ + this.headerList.splice(index,1) + }, + saveAutoStep(){ + }, initData: function(){ this.editForm={...this.editFormInit} diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue index 7742f9d7..048d16a8 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -231,6 +231,7 @@ export default { } this.load.list = true; listXmTestCase(params).then((res) => { + debugger; var tips=res.data.tips; if(tips.isOk){ this.pageInfo.total = res.data.total;