From 0c248627ba497b7b431bb11cee400785b4f09440 Mon Sep 17 00:00:00 2001
From: junhong <junhong.zhou@fit2cloud.com>
Date: Fri, 21 Jan 2022 17:31:49 +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=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=89=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009818 --user=周骏弘 【接口测试】场景，参数设置，参数显示有遮挡 https://www.tapd.cn/55049933/s/1095753
---
 .../components/ApiVariableAdvance.vue         | 77 +++++++++----------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
index 242a9ca3d1..f4f6879c0f 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
@@ -82,32 +82,6 @@
         </div>
       </el-tab-pane>
 
-      <el-tab-pane :label="$t('api_test.variable')">
-        <el-row>
-          <el-col :span="6" class="col-height">
-            <div v-if="environment">
-              <p>{{ $t('api_test.environment.environment') }}</p>
-              <el-tree :data="environmentParams" :props="treeProps" @node-click="selectVariable"></el-tree>
-            </div>
-            <div v-if="scenario">
-              <p>{{ $t('api_test.scenario.scenario') }}</p>
-              <el-tree :data="scenarioParams" :props="treeProps" @node-click="selectVariable"></el-tree>
-            </div>
-          </el-col>
-          <el-col :span="18" class="col-height">
-            <div>
-              <h1>{{ $t('api_test.request.jmeter_func') }}</h1>
-              <el-table border :data="jmeterFuncs" class="adjust-table table-content" height="400">
-                <el-table-column prop="type" label="Type" width="150"/>
-                <el-table-column prop="name" label="Functions" width="250"/>
-                <el-table-column prop="description" label="Description"/>
-              </el-table>
-            </div>
-          </el-col>
-        </el-row>
-      </el-tab-pane>
-
-
       <!--前置返回-->
       <el-tab-pane :label="$t('api_test.definition.request.pre_return')" v-if="scenarioDefinition != undefined">
         <ms-container :class="{'maximize-container': !asideHidden}" v-outside-click="outsideClick">
@@ -140,7 +114,6 @@
             </div>
           </ms-aside-container>
 
-
           <!--右边元素-->
           <ms-main-container>
             <div>
@@ -170,7 +143,6 @@
                 </div>
               </div>
             </div>
-
             <div v-if="scenarioPreRequestParams.length > 0" style="margin-bottom: 10px">
               <p>{{ $t('api_test.definition.request.extract_params') }}</p>
               <div v-for="(item, index) in scenarioPreRequestParams" :key="index" class="kv-row item">
@@ -187,25 +159,45 @@
           </ms-main-container>
         </ms-container>
       </el-tab-pane>
+
+      <el-tab-pane :label="$t('api_test.variable')">
+        <el-row>
+          <el-col :span="18" class="col-height">
+            <div>
+              <h1>{{ $t('api_test.request.jmeter_func') }}</h1>
+              <el-table border :data="jmeterFuncs"
+                        class="adjust-table table-content"
+                        height="400"
+                        @row-click="handleRowClick">
+                <el-table-column prop="type" label="Type" width="150"/>
+                <el-table-column prop="name" label="Functions" width="250"/>
+                <el-table-column prop="description" label="Description"/>
+              </el-table>
+            </div>
+          </el-col>
+        </el-row>
+      </el-tab-pane>
     </el-tabs>
     <div style="padding-top: 10px;">
       <el-row type="flex" align="bottom">
         <el-col :span="16">
-          <div style="position: fixed; bottom: 10px;">
-            <el-form>
+          <div style="position: fixed; bottom: 0px; z-index: 5;">
+            <el-form :inline="true" class="demo-form-inline">
               <el-form-item>
                 <el-input :placeholder="valueText" size="small" v-model="itemValue"/>
               </el-form-item>
+              <el-form-item>
+                <el-button size="small" type="primary" plain @click="saveAdvanced()">
+                  {{ $t('commons.save') }}
+                </el-button>
+                <el-button size="small" type="info" plain @click="addFunc()" v-if="currentTab === 0">
+                  {{ $t('api_test.request.parameters_advance_add_func') }}
+                </el-button>
+                <el-button size="small" type="success" plain @click="showPreview()" v-if="currentTab === 0">
+                  {{ $t('api_test.request.parameters_preview') }}
+                </el-button>
+              </el-form-item>
             </el-form>
-            <el-button size="small" type="primary" plain @click="saveAdvanced()">
-              {{ $t('commons.save') }}
-            </el-button>
-            <el-button size="small" type="info" plain @click="addFunc()" v-if="currentTab === 0">
-              {{ $t('api_test.request.parameters_advance_add_func') }}
-            </el-button>
-            <el-button size="small" type="success" plain @click="showPreview()" v-if="currentTab === 0">
-              {{ $t('api_test.request.parameters_preview') }}
-            </el-button>
           </div>
         </el-col>
       </el-row>
@@ -602,8 +594,11 @@
       savePreParams(data) {
         this.itemValue = '${' + data + '}';
       },
-
-
+      handleRowClick(row) {
+        if(row && row.name){
+          this.itemValue = row.name;
+        }
+      },
 
       // 前置返回
       nodeExpand(data) {