Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8

frontend/src/business/components/api/automation/scenario/EnvSelect.vue

@@ -54,20 +54,23 @@
     methods: {
       init() {
         this.projectIds.forEach(id => {
-          let item = {id: id, envs: [], selectEnv: ""};
-          this.data.push(item);
-          this.result = this.$get('/api/environment/list/' + id, res => {
-            let envs = res.data;
-            envs.forEach(environment => {
-              parseEnvironment(environment);
-            });
-            // 固定环境列表渲染顺序
-            let temp = this.data.find(dt => dt.id === id);
-            temp.envs = envs;
-            let envId = this.envMap.get(id);
-            // 选中环境是否存在
-            temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId;
-          })
+          const project = this.projectList.find(p => p.id === id);
+          if (project) {
+            let item = {id: id, envs: [], selectEnv: ""};
+            this.data.push(item);
+            this.result = this.$get('/api/environment/list/' + id, res => {
+              let envs = res.data;
+              envs.forEach(environment => {
+                parseEnvironment(environment);
+              });
+              // 固定环境列表渲染顺序
+              let temp = this.data.find(dt => dt.id === id);
+              temp.envs = envs;
+              let envId = this.envMap.get(id);
+              // 选中环境是否存在
+              temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId;
+            })
+          }
         })
       },
       open() {

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

@@ -173,11 +173,12 @@ export default {
           updateTime: row.lastModified,
         });
       }
+      //
+      rows.forEach(row => {
+        this.fileList.push(row);
+      })
 
       if (this.loadType === 'resource') {
-        rows.forEach(row => {
-          this.fileList.push(row);
-        })
         this.$success(this.$t('test_track.case.import.success'));
         this.close();
         return;
@@ -197,8 +198,6 @@ export default {
             tg.options = {};
             this.scenarios.push(tg);
           });
-          let file = new File([d.jmx], d.name);
-          this.uploadList.push(file);
         });
 
         this.$emit('fileChange', this.scenarios);

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit a37e6bb56ffaa7ecc4ee128640e9415304ad41b6