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' into master 

# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
This commit is contained in:
Captain.B 2020-12-18 13:25:07 +08:00
parent 2cebe9763e 2ff9cdde0c
commit 59f8f5106e
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -201,6 +201,7 @@ public class ApiDefinitionService {
test.setName(request.getName());
test.setPath(request.getPath());
test.setProjectId(request.getProjectId());
request.getRequest().setId(request.getId());
test.setRequest(JSONObject.toJSONString(request.getRequest()));
test.setUpdateTime(System.currentTimeMillis());
test.setStatus(request.getStatus());
@ -227,6 +228,7 @@ public class ApiDefinitionService {
test.setPath(request.getPath());
test.setModuleId(request.getModuleId());
test.setProjectId(request.getProjectId());
request.getRequest().setId(request.getId());
test.setRequest(JSONObject.toJSONString(request.getRequest()));
test.setCreateTime(System.currentTimeMillis());
test.setUpdateTime(System.currentTimeMillis());

2
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -552,7 +552,7 @@
remove(row, node) {
const parent = node.parent
const hashTree = parent.data.hashTree || parent.data;
const index = hashTree.findIndex(d => d.id != undefined && row.id != undefined && d.id === row.id)
const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
hashTree.splice(index, 1);
this.sort();
this.reload();

1
frontend/src/business/components/api/router.js
View File

@ -3,7 +3,6 @@ import MsProject from "@/business/components/settings/project/MsProject";
export default {
path: "/api",
name: "api",
redirect: "/api/home",
components: {
content: () => import('@/business/components/api/ApiTest')
},

21
frontend/src/business/components/common/head/HeaderTopMenus.vue
View File

@ -9,17 +9,17 @@
router>
<el-menu-item index="/track" v-permission="['test_manager','test_user','test_viewer']">
{{$t('test_track.test_track')}}
{{ $t('test_track.test_track') }}
</el-menu-item>
<el-menu-item index="/api" v-permission="['test_manager','test_user','test_viewer']">
{{$t('commons.api')}}
<el-menu-item index="/api" @click="active()" v-permission="['test_manager','test_user','test_viewer']">
{{ $t('commons.api') }}
</el-menu-item>
<el-menu-item index="/performance" onselectstart="return false"
v-permission="['test_manager','test_user','test_viewer']">
{{$t('commons.performance')}}
{{ $t('commons.performance') }}
</el-menu-item>
<el-menu-item index="/setting" onselectstart="return false">
{{$t('commons.system_setting')}}
{{ $t('commons.system_setting') }}
</el-menu-item>
</el-menu>
</template>
@ -47,7 +47,18 @@
},
methods: {
handleSelect(index) {
console.log(index)
this.activeIndex = index
},
active() {
if (this.activeIndex === '/api') {
if (this.$store.state.switch.value == 'new') {
window.location.href = "/#/api/home";
} else if (this.$store.state.switch.value == 'old') {
window.location.href = "/#/api/home_obsolete";
}
}
}
}
}

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit d39dafaf84b9c7a56cb51f2caf67dd7dfde5938c
Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433