From c5774bb1b2bc31731177ba0468340b9578d56393 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Sat, 26 Apr 2025 13:34:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89spin,=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E5=8D=A0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/assign-data-permission-form.vue   | 39 +++++++++++--------
 .../system/role/modules/assign-menu-form.vue  | 28 ++++++-------
 2 files changed, 37 insertions(+), 30 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 ec72f53f0..6fd2b2c95 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
@@ -7,7 +7,7 @@ import { ref } from 'vue';
 import { useVbenModal, VbenTree } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
-import { Checkbox, message, Spin } from 'ant-design-vue';
+import { Checkbox, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getDeptList } from '#/api/system/dept';
@@ -28,6 +28,13 @@ const isCheckStrictly = ref(true); // 父子联动状态
 const expandedKeys = ref<number[]>([]); // 展开的节点
 
 const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 80,
+  },
   layout: 'horizontal',
   schema: useAssignDataPermissionFormSchema(),
   showDefaultActions: false,
@@ -128,23 +135,23 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
 </script>
 
 <template>
-  <Modal title="数据权限">
+  <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <Spin :spinning="deptLoading" class="w-full">
-          <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
-          <VbenTree
-            :tree-data="deptTree"
-            multiple
-            bordered
-            :expanded="expandedKeys"
-            v-bind="slotProps"
-            value-field="id"
-            label-field="name"
-            :auto-check-parent="false"
-            :check-strictly="!isCheckStrictly"
-          />
-        </Spin>
+        <!-- <Spin :spinning="deptLoading"> -->
+        <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
+        <VbenTree
+          :tree-data="deptTree"
+          multiple
+          bordered
+          :expanded="expandedKeys"
+          v-bind="slotProps"
+          value-field="id"
+          label-field="name"
+          :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 b49a4b10f..da26b7131 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
@@ -7,7 +7,7 @@ import { ref } from 'vue';
 import { useVbenModal, VbenTree } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
-import { Checkbox, message, Spin } from 'ant-design-vue';
+import { Checkbox, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getMenuList } from '#/api/system/menu';
@@ -120,21 +120,21 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
 </script>
 
 <template>
-  <Modal title="数据权限">
+  <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <Spin :spinning="menuLoading" class="w-full">
-          <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
-          <VbenTree
-            :tree-data="menuTree"
-            multiple
-            bordered
-            :expanded="expandedKeys"
-            v-bind="slotProps"
-            value-field="id"
-            label-field="name"
-          />
-        </Spin>
+        <!-- <Spin :spinning="menuLoading" class="w-full"> -->
+        <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
+        <VbenTree
+          :tree-data="menuTree"
+          multiple
+          bordered
+          :expanded="expandedKeys"
+          v-bind="slotProps"
+          value-field="id"
+          label-field="name"
+        />
+        <!-- </Spin> -->
       </template>
     </Form>
     <template #prepend-footer>