From dfa2ac34352519bf3a7f0278daba4a7585df3513 Mon Sep 17 00:00:00 2001
From: zouawen <846027729@qq.com>
Date: Thu, 11 Sep 2025 18:16:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E9=80=89=E6=97=B6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4disabled=E7=9A=84=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui-kit/shadcn-ui/src/ui/tree/tree.vue     | 22 ++++++++++---------
 .../ui-kit/shadcn-ui/src/ui/tree/types.ts     |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue
index 5f50d2df..c50a79d2 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue
@@ -159,19 +159,21 @@ function collapseAll() {
 }
 
 function checkAll() {
-  if (props.multiple) {
-    modelValue.value = flattenData.value.map((item) =>
-      get(item.value, props.valueField),
-    );
-    updateTreeValue();
-  }
+  if (!props.multiple) return;
+  modelValue.value = [
+    ...new Set(
+      flattenData.value
+        .filter((item) => !get(item.value, props.disabledField))
+        .map((item) => get(item.value, props.valueField)),
+    ),
+  ];
+  updateTreeValue();
 }
 
 function unCheckAll() {
-  if (props.multiple) {
-    modelValue.value = [];
-    updateTreeValue();
-  }
+  if (!props.multiple) return;
+  modelValue.value = [];
+  updateTreeValue();
 }
 
 function isNodeDisabled(item: FlattenedItem<Recordable<any>>) {
diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts
index 72dc19c4..bf2d6ece 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts
@@ -51,7 +51,6 @@ export function treePropsDefaults() {
     defaultExpandedLevel: 0,
     disabled: false,
     disabledField: 'disabled',
-    expanded: () => [],
     iconField: 'icon',
     labelField: 'label',
     multiple: false,