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

backend/src/main/resources/db/migration/V78__v1.8_release.sql

@@ -239,10 +239,7 @@ insert into system_header (type, props)
 values ('test_case_list',
         '[{"id":"tags","label":"标签"},{"id":"nodePath","label":"所属模块"},{"id":"updateTime","label":"更新时间"},{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"priority","label":"用例等级"},{"id":"reviewStatus","label":"评审状态"}]');
 insert into system_header (type, props)
-values ('test_case_list',
-        '[{"id":"tags","label":"标签"},{"id":"nodePath","label":"所属模块"},{"id":"updateTime","label":"更新时间"},{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"priority","label":"用例等级"},{"id":"reviewStatus","label":"评审状态"}]');
-insert into system_header (type, props)
 values ('test_plan_scenario_case',
         '[{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"level","label":"用例等级"},{"id":"tagNames","label":"标签"},{"id":"userId","label":"创建人"},{"id":"updateTime","label":"最后更新时间"},{"id":"stepTotal","label":"通过"},{"id":"lastResult","label":"失败"},{"id":"passRate","label":"通过率"}]');
 
-
+alter table system_header add primary key(type);

frontend/src/business/components/performance/test/EditPerformanceTest.vue

@@ -127,7 +127,9 @@ export default {
       if (apiTest && apiTest.name) {
         this.$set(this.test, "name", apiTest.name);
         let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"});
-        let file = new File([blob], apiTest.jmx.name);
+        let suffixIndex = apiTest.jmx.name.lastIndexOf(".jmx");
+        let jmxName = apiTest.jmx.name.substring(0, suffixIndex) + "_" + new Date().getTime() + ".jmx";
+        let file = new File([blob], jmxName); // 保证每次从接口测试都能创建新的性能测试
         this.$refs.basicConfig.beforeUploadJmx(file);
         this.$refs.basicConfig.handleUpload({file: file});
         if (JSON.stringify(apiTest.jmx.attachFiles) != "{}") {

frontend/src/business/components/performance/test/components/ExistScenarios.vue

@@ -132,12 +132,13 @@ export default {
       this.projectLoadingResult = this.$post('api/automation/export/jmx', condition, response => {
         let data = response.data;
         data.forEach(d => {
-          let threadGroups = findThreadGroup(d.jmx, d.name + ".jmx")
+          let jmxName = d.name + "_" + new Date().getTime() + ".jmx";
+          let threadGroups = findThreadGroup(d.jmx, jmxName)
           threadGroups.forEach(tg => {
             tg.options = {};
             this.scenarios.push(tg);
           });
-          let file = new File([d.jmx], d.name + ".jmx");
+          let file = new File([d.jmx], jmxName);
           this.uploadList.push(file);
           this.tableData.push({
             name: file.name,

frontend/src/business/components/performance/test/components/ResourceFiles.vue

@@ -34,6 +34,7 @@
       </el-table-column>
       <el-table-column
         prop="type"
+        width="100"
         :label="$t('load_test.file_type')">
       </el-table-column>
       <el-table-column

frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue

@@ -313,10 +313,17 @@ export default {
           this.$post("/test/case/review/projects", {reviewId: this.reviewId}, res => {
             let data = res.data;
             if (data) {
-              this.currentProject = data[0];
               this.projects = data;
-              this.projectId = data[0].id;
+              const index = data.findIndex(d => d.id === this.$store.state.projectId);
-              this.projectName = data[0].name;
+              if (index !== -1) {
+                this.projectId = data[index].id;
+                this.projectName = data[index].name;
+                this.currentProject = data[index];
+              } else {
+                this.projectId = data[0].id;
+                this.projectName = data[0].name;
+                this.currentProject = data[0];
+              }
             }
           })
         }