From 24e0ffe23547fadd8021fbf55273155ce31bc09d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 3 Jun 2024 16:20:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E6=98=8E=E6=96=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E4=BB=8D=E7=84=B6=E6=98=AF=E6=98=8E=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/ExportExcel.vue     | 8 ++++----
 .../src/views/visualized/data/datasource/form/index.vue   | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index cf28672629..33f5139ec7 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -348,7 +348,7 @@ defineExpose({
       <el-tab-pane v-for="tab in tabList" :key="tab.name" :label="tab.label" :name="tab.name" />
     </el-tabs>
     <el-button
-      v-show="activeName === 'SUCCESS' && multipleSelection.length === 0"
+      v-if="activeName === 'SUCCESS' && multipleSelection.length === 0"
       secondary
       @click="downLoadAll"
     >
@@ -358,15 +358,15 @@ defineExpose({
       {{ $t('data_export.download_all') }}
     </el-button>
     <el-button
-      v-show="activeName === 'SUCCESS' && multipleSelection.length !== 0"
+      v-if="activeName === 'SUCCESS' && multipleSelection.length !== 0"
       secondary
       @click="downLoadAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('data_export.download') }}
     </el-button>
-    <el-button v-show="multipleSelection.length === 0" secondary @click="delAll"
+    <el-button v-if="multipleSelection.length === 0" secondary @click="delAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('data_export.del_all') }}
     </el-button>
-    <el-button v-show="multipleSelection.length !== 0" secondary @click="delAll"
+    <el-button v-if="multipleSelection.length !== 0" secondary @click="delAll"
       ><template #icon> <Icon name="de-delete"></Icon> </template>{{ $t('commons.delete') }}
     </el-button>
     <div class="table-container" :class="!tableData.length && 'hidden-bottom'">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 7b5e7db117..4f6bd7cf52 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -73,8 +73,8 @@ const selectDsType = (type: string) => {
   currentDsType.value = type
   activeStep.value = 1
   activeApiStep.value = 1
-  detail.value.initForm(type)
   nextTick(() => {
+    detail.value.initForm(type)
     if (!dsTree.value) return
     currentTypeList.value
       .map(ele => ele.dbList)
@@ -493,7 +493,9 @@ const init = (nodeInfo: Form | Param, id?: string, res?: object) => {
           excel.value.appendReplaceExcel(res)
         })
       }
-      detail.value.clearForm()
+      nextTick(() => {
+        detail.value.clearForm()
+      })
     })
   }
 }
@@ -653,7 +655,7 @@ defineExpose({
             :form="form"
             :editDs="editDs"
             :active-step="activeApiStep"
-            v-show="activeStep !== 0 && currentDsType && currentDsType !== 'Excel'"
+            v-if="activeStep !== 0 && currentDsType && currentDsType !== 'Excel' && visible"
           ></editor-detail>
           <template v-if="activeStep !== 0 && currentDsType == 'Excel'">
             <excel-detail :editDs="editDs" ref="excel" :param="form2"></excel-detail>