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

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

@@ -75,7 +75,7 @@
                     value-key="name"
                     highlight-first-item
                     @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>
                 </div>
                 <div v-else-if="isActive && scope.row.type === 'file'">

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

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

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

@@ -115,7 +115,7 @@
         project.id as projectId, project_version.name as version_name
         from load_test_report ltr
         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_version on project.id = project_version.project_id AND ltr.version_id = project_version.id
         <where>