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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
song.tianyang 2021-01-27 15:16:56 +08:00
parent e95632b94a 79705a36f9
commit bc8bb6ecfe
3 changed files with 10 additions and 4 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

@ -212,7 +212,8 @@
this.$emit('singleRun', data); this.$emit('singleRun', data);
}, },
copyCase(data) { copyCase(data) {
let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request}; let uuid = getUUID();
let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request, uuid: uuid};
this.$emit('copyCase', obj); this.$emit('copyCase', obj);
}, },
selectTestCase(item, $event) { selectTestCase(item, $event) {

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

@ -20,7 +20,7 @@
<el-container v-loading="result.loading"> <el-container v-loading="result.loading">
<el-main> <el-main>
<div v-for="(item,index) in apiCaseList" :key="index"> <div v-for="(item,index) in apiCaseList" :key="item.id ? item.id : item.uuid">
<api-case-item v-loading="singleLoading && singleRunId === item.id || batchLoadingIds.indexOf(item.id) > -1" <api-case-item v-loading="singleLoading && singleRunId === item.id || batchLoadingIds.indexOf(item.id) > -1"
@refresh="refresh" @refresh="refresh"
@singleRun="singleRun" @singleRun="singleRun"
@ -243,7 +243,8 @@
if (!request.hashTree) { if (!request.hashTree) {
request.hashTree = []; request.hashTree = [];
} }
let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: []}; let uuid = getUUID();
let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: [], uuid: uuid};
obj.request = request; obj.request = request;
this.apiCaseList.unshift(obj); this.apiCaseList.unshift(obj);
} }

6
frontend/src/business/components/api/definition/components/import/ApiImport.vue
View File

@ -50,8 +50,9 @@
<el-switch <el-switch
v-model="swaggerSynchronization" v-model="swaggerSynchronization"
@click.native="scheduleEdit" @click.native="scheduleEdit"
:active-text="$t('api_test.api_import.timing_synchronization')"> >
</el-switch> </el-switch>
<span style="color: #6C317C;cursor: pointer;font-weight: bold;margin-left: 10px" @click="scheduleEditByText">{{$t('api_test.api_import.timing_synchronization')}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" <el-col :span="12"
@ -188,6 +189,9 @@ export default {
} }
} }
}, },
scheduleEditByText(){
this.$refs.scheduleEdit.open(this.buildParam());
},
open(module) { open(module) {
this.currentModule = module; this.currentModule = module;
this.visible = true; this.visible = true;