From 046c9d70be01f39ccbc0a9aff7dc61bc96001c0f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 1 Apr 2021 17:47:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=A2=9E=E5=8A=A0=E5=9C=BA=E6=99=AF=E5=B1=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EditApiScenario.vue       | 11 ++++++++---
 frontend/src/business/main.js                         |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 48fc69aa8..3dfae6b8f 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -119,18 +119,21 @@
                 <el-col :span="3" class="ms-col-one ms-font">
                   <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="5">
                   <env-popover :env-map="projectEnvMap" :project-ids="projectIds" @setProjectEnvMap="setProjectEnvMap"
                                :project-list="projectList" ref="envPopover"/>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="4">
                   <el-button :disabled="scenarioDefinition.length < 1" size="mini" type="primary" v-prevent-re-click @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+                  <el-tooltip class="item" effect="dark" :content="$t('commons.refresh')" placement="right-start">
+                    <el-button :disabled="scenarioDefinition.length < 1" size="mini"  icon ="el-icon-refresh" v-prevent-re-click @click="getApiScenario"></el-button>
+                  </el-tooltip>
                   <font-awesome-icon class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
                 </el-col>
               </el-row>
             </div>
             <!-- 场景步骤内容 -->
-            <div v-loading="loading">
+            <div>
               <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree"
                        :default-expanded-keys="expandedNode"
                        :expand-on-click-node="false"
@@ -959,6 +962,7 @@
         });
       },
       getApiScenario() {
+        this.loading = true;
         if (this.currentScenario.tags != undefined && !(this.currentScenario.tags instanceof Array)) {
           this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
         }
@@ -1009,6 +1013,7 @@
                 this.path = "/api/automation/create";
               }
             }
+            this.loading = false;
             this.sort();
             this.initProjectIds();
             // this.getEnvironments();
diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js
index 4fe1c4f6c..33a221940 100644
--- a/frontend/src/business/main.js
+++ b/frontend/src/business/main.js
@@ -67,7 +67,7 @@ Vue.directive('preventReClick', {
         el.disabled = true
         setTimeout(() => {
           el.disabled = false
-        }, binding.value || 2000)
+        }, binding.value || 3000)
       }
     })
   }
-- 
GitLab