From 486e74980c29a9afc16628ef9e849f9ea1b62db1 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 2 Jul 2024 10:03:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20API?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90query=E4=B8=AD=E5=A4=9A=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAkey=EF=BC=8C=E4=B8=94=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/datasource/form/ApiHttpRequestDraw.vue | 4 ++--
 .../views/visualized/data/datasource/form/ApiKeyValue.vue  | 1 -
 .../views/visualized/data/datasource/form/ApiVariable.vue  | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
index 7d3fadd353..ecbece4965 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
@@ -155,7 +155,7 @@ const rule = reactive<FormRules>({
     }
   ]
 })
-const activeName = ref('third')
+const activeName = ref('table')
 provide('api-active-name', activeName)
 const initApiItem = (val: ApiItem, from, name) => {
   activeName.value = name
@@ -469,7 +469,7 @@ defineExpose({
                 {{ active <= 1 ? '2' : '' }}
               </span>
               <span class="title">{{
-                activeName === 'third' ? t('datasource.api_step_2') : '提取参数'
+                activeName === 'table' ? t('datasource.api_step_2') : '提取参数'
               }}</span>
             </div>
           </template>
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
index 3dd5aaa69f..f5463ab4cc 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
@@ -82,7 +82,6 @@ const options = [
     value: 'fixed'
   }
 ]
-const value = ref('')
 </script>
 
 <template>
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
index cd20f02212..0119c82010 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
-import { computed, onBeforeMount, PropType, toRefs } from 'vue'
+import { computed, onBeforeMount, PropType, toRefs, inject } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { KeyValue } from './ApiTestModel.js'
 import { guid } from '@/views/visualized/data/dataset/form/util'
@@ -91,6 +91,7 @@ const createFilter = (queryString: string) => {
     return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
   }
 }
+const activeName = inject('api-active-name')
 </script>
 
 <template>
@@ -149,7 +150,7 @@ const createFilter = (queryString: string) => {
               />
             </el-col>
 
-            <el-col :span="5">
+            <el-col :span="activeName === 'params' ? 10 : 5">
               <el-input
                 v-model="element.description"
                 maxlength="200"
@@ -157,7 +158,7 @@ const createFilter = (queryString: string) => {
                 show-word-limit
               />
             </el-col>
-            <el-col :span="5">
+            <el-col v-if="activeName !== 'params'" :span="5">
               <el-autocomplete
                 v-if="suggestions"
                 v-model="element.name"