From 6c3c22a2b3db54b05c1af48695b7f38e48d43582 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Tue, 13 May 2025 22:35:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8E=E5=AD=97=E5=85=B8=E5=9C=A8=E6=95=B0=E6=8D=AE=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=AE=8C=E6=88=90=E5=89=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue |  8 ++++++--
 src/views/system/user/index.vue | 11 +++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 1a526a45..10f5b617 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import type { TreeOption } from 'naive-ui';
 import { NDivider, NTooltip } from 'naive-ui';
 import { useBoolean, useLoading } from '@sa/hooks';
@@ -301,6 +301,10 @@ async function handleDeleteType(dictType: Api.System.DictType) {
 async function handleExportType() {
   download('/system/dict/type/export', searchParams, `字典类型_${new Date().getTime()}.xlsx`);
 }
+
+const selectable = computed(() => {
+  return !loading.value;
+});
 </script>
 
 <template>
@@ -337,7 +341,6 @@ async function handleExportType() {
           block-node
           show-line
           :data="dictData as []"
-          :default-expanded-keys="dictData?.length ? [dictData[0].dictType!] : []"
           :show-irrelevant-nodes="false"
           :pattern="dictPattern"
           :filter="dictFilter"
@@ -345,6 +348,7 @@ async function handleExportType() {
           key-field="dictType"
           label-field="dictName"
           virtual-scroll
+          :selectable="selectable"
           :render-label="renderLabel"
           :render-suffix="renderSuffix"
           @update:selected-keys="handleClickTree"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8c34912d..b8574a98 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { NButton, NDivider } from 'naive-ui';
 import { useBoolean, useLoading } from '@sa/hooks';
 import { fetchBatchDeleteUser, fetchGetDeptTree, fetchGetUserList, fetchUpdateUserStatus } from '@/service/api/system';
@@ -243,6 +243,12 @@ async function handleStatusChange(
 function handleExport() {
   download('/system/user/export', searchParams, `${$t('page.system.user.title')}_${new Date().getTime()}.xlsx`);
 }
+
+const expandedKeys = ref<CommonType.IdType[]>([100]);
+
+const selectable = computed(() => {
+  return !loading.value;
+});
 </script>
 
 <template>
@@ -258,16 +264,17 @@ function handleExport() {
       <NInput v-model:value="deptPattern" clearable :placeholder="$t('common.keywordSearch')" />
       <NSpin class="dept-tree" :show="treeLoading">
         <NTree
+          v-model:expanded-keys="expandedKeys"
           block-node
           show-line
           :data="deptData as []"
-          :default-expanded-keys="deptData?.length ? [deptData[0].id!] : []"
           :show-irrelevant-nodes="false"
           :pattern="deptPattern"
           class="infinite-scroll h-full min-h-200px py-3"
           key-field="id"
           label-field="label"
           virtual-scroll
+          :selectable="selectable"
           @update:selected-keys="handleClickTree"
         >
           <template #empty>