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

frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue

@@ -275,7 +275,6 @@
             }
           }
         }
-
         this.request.active = true;
         this.loading = true;
         this.runData = [];
@@ -295,6 +294,7 @@
         this.request.requestResult = data;
         this.request.result = undefined;
         this.loading = false;
+        this.$emit('refReload',this.request,this.node);
       },
       reload() {
         this.loading = true

frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue

@@ -124,14 +124,14 @@
         this.$emit('copyRow', row, node);
 
       },
-      openScenario(data){
+      openScenario(data) {
         this.$emit('openScenario', data);
       },
       suggestClick(node) {
         this.$emit('suggestClick', node);
       },
-      refReload() {
-        this.$emit('refReload');
+      refReload(data, node) {
+        this.$emit('refReload', data, node);
       }
     }
   }

frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue

@@ -50,7 +50,7 @@
         </div>
       </ms-aside-container>
 
-      <ms-main-container>
+      <ms-main-container v-if="!loading">
         <!-- 第一层当前节点内容-->
         <ms-component-config
           :isMax="false"
@@ -235,6 +235,11 @@
       this.operatingElements = ELEMENTS.get("ALL");
       this.projectEnvMap = this.envMap;
     },
+    watch: {
+      envMap() {
+        this.projectEnvMap = this.envMap;
+      }
+    },
     directives: {OutsideClick},
     computed: {
       buttons() {
@@ -877,8 +882,7 @@
           this.currentScenario.apiScenarioModuleId = this.currentModule.id;
         }
         this.currentScenario.projectId = this.projectId;
-      }
-      ,
+      },
       runRefresh() {
         this.debugVisible = true;
         this.loading = false;
@@ -911,7 +915,9 @@
       setProjectEnvMap(projectEnvMap) {
         this.projectEnvMap = projectEnvMap;
       },
-      refReload() {
+      refReload(data,node) {
+        this.selectedTreeNode = data;
+        this.selectedNode = node;
         this.initProjectIds();
         this.reload();
       },