From 56393743aa80ebee36655b83e0440e96b0165b72 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 21 May 2021 15:17:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E6=9D=A1=E4=BB=B6=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/environment/EnvironmentHttpConfig.vue  |  3 ++-
 .../components/common/select-tree/SelectTree.vue      | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
index 3d44180db9..0cfc6b7b83 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
@@ -46,7 +46,7 @@
       </el-form-item>
     </div>
     <div class="ms-border">
-      <el-table :data="httpConfig.conditions" highlight-current-row @current-change="selectRow" v-if="!loading">
+      <el-table :data="httpConfig.conditions" highlight-current-row @current-change="selectRow">
         <el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
           <template v-slot:default="{row}">
             {{getUrl(row)}}
@@ -203,6 +203,7 @@
           }
         }
         this.beforeCondition = JSON.parse(JSON.stringify(this.condition));
+        this.reload();
       },
       typeChange() {
         if (this.condition.type === "NONE" && this.condition.id  &&  this.checkNode(this.condition.id)) {
diff --git a/frontend/src/business/components/common/select-tree/SelectTree.vue b/frontend/src/business/components/common/select-tree/SelectTree.vue
index c971151fea..456345e796 100644
--- a/frontend/src/business/components/common/select-tree/SelectTree.vue
+++ b/frontend/src/business/components/common/select-tree/SelectTree.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="mask" v-show="isShowSelect"></div>
     <el-popover placement="bottom-start" :width="popoverWidth" trigger="manual" v-model="isShowSelect" @hide="popoverHide" v-outside-click="outsideClick">
       <el-input
@@ -145,6 +145,7 @@
         returnDatas: [],//返回给父组件数组对象
         returnDataKeys: [],//返回父组件数组主键值
         filterText: "",
+        loading:false,
       };
     },
     computed: {
@@ -256,6 +257,7 @@
         thisKeys.map((item) => {//设置option选项
           let node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
           t.push(node.data);
+          this.options.push({label: node.label, value: node.key});
           return {label: node.label, value: node.key};
         });
         this.returnDatas = t;
@@ -338,7 +340,14 @@
         }
         return false;
       },
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        });
+      },
     },
+
     watch: {
       // eslint-disable-next-line no-unused-vars
       isShowSelect(val) {