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

Merge branch 'main' of https://github.com/metersphere/metersphere

This commit is contained in:
liqiang-fit2cloud 2022-12-28 16:22:28 +08:00
parent 78c93b56aa 48c6b83d1f
commit 4babaa1834
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/frontend/src/business/definition/components/ApiVariable.vue
View File

@ -75,7 +75,7 @@
value-key="name" value-key="name"
highlight-first-item highlight-first-item
@select="change"> @select="change">
<i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(item)"></i> <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(scope.row)"></i>
</el-autocomplete> </el-autocomplete>
</div> </div>
<div v-else-if="isActive && scope.row.type === 'file'"> <div v-else-if="isActive && scope.row.type === 'file'">

1
api-test/frontend/src/business/definition/components/ApiVariableAdvance.vue
View File

@ -416,6 +416,7 @@ export default {
this.operatingElements = this.stepFilter.get('ALL'); this.operatingElements = this.stepFilter.get('ALL');
}, },
open() { open() {
this.itemValuePreview = null;
this.itemValue = null; this.itemValue = null;
if (this.scenarioDefinition != undefined) { if (this.scenarioDefinition != undefined) {
// 标识为场景编辑入口进入 // 标识为场景编辑入口进入

2
performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
View File

@ -115,7 +115,7 @@
project.id as projectId, project_version.name as version_name project.id as projectId, project_version.name as version_name
from load_test_report ltr from load_test_report ltr
left join load_test lt on ltr.test_id = lt.id left join load_test lt on ltr.test_id = lt.id
join user on ltr.user_id = user.id left join user on ltr.user_id = user.id
join project on project.id = ltr.project_id join project on project.id = ltr.project_id
JOIN project_version on project.id = project_version.project_id AND ltr.version_id = project_version.id JOIN project_version on project.id = project_version.project_id AND ltr.version_id = project_version.id
<where> <where>