From 2f55bca2e45182b22104f81fe452ca9e77592ddf Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Fri, 19 Sep 2025 16:08:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8Tree=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89VbenTree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/role/modules/assign-data-permission-form.vue    | 4 ++--
 .../src/views/system/role/modules/assign-menu-form.vue     | 6 +++---
 .../src/views/system/tenantPackage/modules/form.vue        | 4 ++--
 .../system/role/modules/assign-data-permission-form.vue    | 4 ++--
 .../src/views/system/role/modules/assign-menu-form.vue     | 6 +++---
 .../src/views/system/tenantPackage/modules/form.vue        | 4 ++--
 .../system/role/modules/assign-data-permission-form.vue    | 7 ++-----
 .../src/views/system/role/modules/assign-menu-form.vue     | 7 ++-----
 .../src/views/system/tenantPackage/modules/form.vue        | 5 ++---
 9 files changed, 20 insertions(+), 27 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 08e2407d..681f9df4 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
@@ -4,7 +4,7 @@ import type { SystemRoleApi } from '#/api/system/role';
 
 import { ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemDataScopeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
@@ -134,7 +134,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-2/5">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <VbenTree
+        <Tree
           :tree-data="deptTree"
           multiple
           bordered
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 8cdd1d10..10a1e98b 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
@@ -4,9 +4,9 @@ import type { Recordable } from '@vben/types';
 import type { SystemMenuApi } from '#/api/system/menu';
 import type { SystemRoleApi } from '#/api/system/role';
 
-import {nextTick, ref} from 'vue';
+import { nextTick, ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemMenuTypeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
@@ -142,7 +142,7 @@ function getNodeClass(node: Recordable<any>) {
   <Modal title="数据权限" class="w-2/5">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <VbenTree
+        <Tree
           :spinning="menuLoading"
           :tree-data="menuTree"
           multiple
diff --git a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
index 43d27d19..716da194 100644
--- a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
@@ -4,7 +4,7 @@ import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
 import { computed, ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import { Checkbox, message } from 'ant-design-vue';
@@ -134,7 +134,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-6">
       <template #menuIds="slotProps">
-        <VbenTree
+        <Tree
           class="max-h-96 overflow-y-auto"
           :loading="menuLoading"
           :tree-data="menuTree"
diff --git a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
index 1949179d..eff05d32 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
@@ -4,7 +4,7 @@ import type { SystemRoleApi } from '#/api/system/role';
 
 import { ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemDataScopeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
@@ -134,7 +134,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-2/5">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <VbenTree
+        <Tree
           :tree-data="deptTree"
           multiple
           bordered
diff --git a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
index d1ef291a..546d19dc 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
@@ -4,9 +4,9 @@ import type { Recordable } from '@vben-core/typings';
 import type { SystemMenuApi } from '#/api/system/menu';
 import type { SystemRoleApi } from '#/api/system/role';
 
-import {nextTick, ref} from 'vue';
+import { nextTick, ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemMenuTypeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
@@ -142,7 +142,7 @@ function getNodeClass(node: Recordable<any>) {
   <Modal title="数据权限" class="w-2/5">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <VbenTree
+        <Tree
           :spinning="menuLoading"
           :tree-data="menuTree"
           multiple
diff --git a/apps/web-ele/src/views/system/tenantPackage/modules/form.vue b/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
index 23626cdf..b54d0a21 100644
--- a/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
@@ -4,7 +4,7 @@ import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
 import { computed, ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import { ElCheckbox, ElMessage } from 'element-plus';
@@ -134,7 +134,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-6">
       <template #menuIds="slotProps">
-        <VbenTree
+        <Tree
           class="max-h-96 overflow-y-auto"
           :loading="menuLoading"
           :tree-data="menuTree"
diff --git a/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
index 21ac3d9f..2d885ac0 100644
--- a/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
@@ -4,7 +4,7 @@ import type { SystemRoleApi } from '#/api/system/role';
 
 import { ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import { NCheckbox } from 'naive-ui';
@@ -136,9 +136,7 @@ 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
           :tree-data="deptTree"
           multiple
           bordered
@@ -149,7 +147,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-naive/src/views/system/role/modules/assign-menu-form.vue b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
index c451f291..60272869 100644
--- a/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
@@ -4,7 +4,7 @@ import type { SystemRoleApi } from '#/api/system/role';
 
 import { ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import { NCheckbox } from 'naive-ui';
@@ -127,9 +127,7 @@ 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
+        <Tree
           :tree-data="menuTree"
           multiple
           bordered
@@ -138,7 +136,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-naive/src/views/system/tenantPackage/modules/form.vue b/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
index 6168f439..11833f0d 100644
--- a/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-naive/src/views/system/tenantPackage/modules/form.vue
@@ -4,7 +4,7 @@ import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
 import { computed, ref } from 'vue';
 
-import { useVbenModal, VbenTree } from '@vben/common-ui';
+import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import { NCheckbox } from 'naive-ui';
@@ -135,8 +135,7 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal :title="getTitle" class="w-[40%]">
     <Form class="mx-6">
       <template #menuIds="slotProps">
-        <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
-        <VbenTree
+        <Tree
           class="max-h-[400px] overflow-y-auto"
           :loading="menuLoading"
           :tree-data="menuTree"