From 4613732cd1116c8d060eb357ee5606729d51c922 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Mon, 9 Jun 2025 13:55:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8vben=E8=87=AA?=
 =?UTF-8?q?=E5=B8=A6=E7=9A=84spin=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/assign-data-permission-form.vue   |  3 +--
 .../system/role/modules/assign-menu-form.vue  |  3 +--
 .../views/system/user/modules/dept-tree.vue   | 27 +++++++++----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
index 2ac46dbd7..2d160ea25 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
@@ -135,12 +135,12 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <!-- <Spin :spinning="deptLoading"> -->
         <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
         <VbenTree
           :tree-data="deptTree"
           multiple
           bordered
+          :spinning="deptLoading"
           :expanded="expandedKeys"
           v-bind="slotProps"
           value-field="id"
@@ -148,7 +148,6 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
           :auto-check-parent="false"
           :check-strictly="!isCheckStrictly"
         />
-        <!-- </Spin> -->
       </template>
     </Form>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index 3ee79e857..b4a07b98a 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -127,9 +127,9 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <!-- <Spin :spinning="menuLoading" class="w-full"> -->
         <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
         <VbenTree
+          :spinning="menuLoading"
           :tree-data="menuTree"
           multiple
           bordered
@@ -138,7 +138,6 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
           value-field="id"
           label-field="name"
         />
-        <!-- </Spin> -->
       </template>
     </Form>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/system/user/modules/dept-tree.vue b/apps/web-antd/src/views/system/user/modules/dept-tree.vue
index 8e6641777..e8f3202ec 100644
--- a/apps/web-antd/src/views/system/user/modules/dept-tree.vue
+++ b/apps/web-antd/src/views/system/user/modules/dept-tree.vue
@@ -6,7 +6,7 @@ import { onMounted, ref } from 'vue';
 import { Search } from '@vben/icons';
 import { handleTree } from '@vben/utils';
 
-import { Input, Spin, Tree } from 'ant-design-vue';
+import { Input, Tree } from 'ant-design-vue';
 
 import { getSimpleDeptList } from '#/api/system/dept';
 
@@ -66,18 +66,17 @@ onMounted(async () => {
         </template>
       </Input>
     </div>
-    <Spin :spinning="loading">
-      <Tree
-        class="pt-2"
-        v-if="deptTree.length > 0"
-        :tree-data="deptTree"
-        :field-names="{ title: 'name', key: 'id', children: 'children' }"
-        @select="handleSelect"
-        :default-expand-all="true"
-      />
-      <div v-else-if="!loading" class="py-4 text-center text-gray-500">
-        暂无数据
-      </div>
-    </Spin>
+    <Tree
+      :spinning="loading"
+      class="pt-2"
+      v-if="deptTree.length > 0"
+      :tree-data="deptTree"
+      :field-names="{ title: 'name', key: 'id', children: 'children' }"
+      @select="handleSelect"
+      :default-expand-all="true"
+    />
+    <div v-else-if="!loading" class="py-4 text-center text-gray-500">
+      暂无数据
+    </div>
   </div>
 </template>