From 53d998827b197cab98c4a658edda8f52f3424f55 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Sun, 11 May 2025 16:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=B1=95=E5=BC=80=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=97=B6=20=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=20=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=B8=B2=E6=9F=93=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/tree/index.vue                          | 5 ++---
 src/views/tool/gen/modules/gen-table-import-drawer.vue | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 5947ac63..ac748e67 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -179,7 +179,6 @@ function handleExport() {
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
     <TreeSearch v-model:model="searchParams" :tree-list="data" @reset="resetSearchParams" @search="getData" />
-    {{ expandedRowKeys }}
     <NCard title="测试树列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
         <TableHeaderOperation
@@ -195,13 +194,13 @@ function handleExport() {
           @refresh="getData"
         >
           <template #prefix>
-            <NButton v-if="!isCollapse" :disabled="!expandedRowKeys.length" size="small" @click="expandAll">
+            <NButton v-if="!isCollapse" :disabled="!data.length" size="small" @click="expandAll">
               <template #icon>
                 <icon-quill:expand />
               </template>
               全部展开
             </NButton>
-            <NButton v-if="isCollapse" :disabled="!expandedRowKeys.length" size="small" @click="collapseAll">
+            <NButton v-if="isCollapse" :disabled="!data.length" size="small" @click="collapseAll">
               <template #icon>
                 <icon-quill:collapse />
               </template>
diff --git a/src/views/tool/gen/modules/gen-table-import-drawer.vue b/src/views/tool/gen/modules/gen-table-import-drawer.vue
index 4764e14b..2305c58e 100644
--- a/src/views/tool/gen/modules/gen-table-import-drawer.vue
+++ b/src/views/tool/gen/modules/gen-table-import-drawer.vue
@@ -84,15 +84,16 @@ async function getDataNames() {
   const { error, data: dataNames } = await fetchGetGenDataNames();
   if (error) return;
   dataNameOptions.value = dataNames.map(item => ({ label: item, value: item }));
+
+  resetSearchParams();
+  searchParams.dataName = dataNameOptions.value.length ? dataNameOptions.value[0].value : null;
+  data.value = [];
+  checkedRowKeys.value = [];
 }
 
 watch(visible, () => {
   if (visible.value) {
     getDataNames();
-    resetSearchParams();
-    searchParams.dataName = dataNameOptions.value.length ? dataNameOptions.value[0].value : null;
-    data.value = [];
-    checkedRowKeys.value = [];
   }
 });
 </script>