From adbf793e79898e7e0b5d4ac791d9d58b344c6648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=9E=83=E8=9F=B9?=
 <52234099+pangxie231@users.noreply.github.com>
Date: Mon, 25 Aug 2025 11:03:54 +0800
Subject: [PATCH 1/3] fix(@vben/web-ele): the main color tone for switching
 between dark and light themes has been reset (#6678)

---
 .../src/widgets/preferences/blocks/theme/builtin.vue        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue b/packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue
index 27dfd28a..d70bb232 100644
--- a/packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue
+++ b/packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue
@@ -104,7 +104,7 @@ function selectColor() {
 
 watch(
   () => [modelValue.value, props.isDark] as [BuiltinThemeType, boolean],
-  ([themeType, isDark]) => {
+  ([themeType, isDark], [_, isDarkPrev]) => {
     const theme = builtinThemePresets.value.find(
       (item) => item.type === themeType,
     );
@@ -113,7 +113,9 @@ watch(
         ? theme.darkPrimaryColor || theme.primaryColor
         : theme.primaryColor;
 
-      themeColorPrimary.value = primaryColor || theme.color;
+      if (!(theme.type === 'custom' && isDark !== isDarkPrev)) {
+        themeColorPrimary.value = primaryColor || theme.color;
+      }
     }
   },
 );

From 566d3bdf7c5abaf1562c03b5ca8d96a37fdf838c Mon Sep 17 00:00:00 2001
From: LinaBell <15891557205@163.com>
Date: Mon, 25 Aug 2025 21:25:29 +0800
Subject: [PATCH 2/3] fix: appendToMain warning (#6684)

---
 packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue | 2 +-
 packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
index 719df032..ae656b97 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
@@ -82,7 +82,7 @@ defineExpose({
 </script>
 
 <template>
-  <Teleport :to="appendTo">
+  <Teleport defer :to="appendTo">
     <Transition name="fade">
       <DialogOverlay
         v-if="open && modal"
diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
index d067f70a..cab9c5a5 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
@@ -73,7 +73,7 @@ function onAnimationEnd(event: AnimationEvent) {
 </script>
 
 <template>
-  <Teleport :to="appendTo">
+  <Teleport defer :to="appendTo">
     <Transition name="fade">
       <SheetOverlay
         v-if="open && modal"

From b0d7b177be0515ba1a58dc8b6e9d0e60a59d5071 Mon Sep 17 00:00:00 2001
From: Ken Hai <wobunengmeiyou_ni@163.com>
Date: Mon, 25 Aug 2025 21:32:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=88=E6=9D=83=E7=9A=84=E6=A0=91=E5=BD=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E5=8F=B6?=
 =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9=EF=BC=8C=E7=88=B6=E7=BA=A7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF=20(#6680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: haiyinlong <haiyinlong@uhigame.com>
---
 .../ui-kit/shadcn-ui/src/ui/tree/tree.vue     | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

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 c6c4df7d..3e497c51 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
@@ -103,10 +103,15 @@ function updateTreeValue() {
     treeValue.value = undefined;
   } else {
     if (Array.isArray(val)) {
-      const filteredValues = val.filter((v) => {
+      let filteredValues = val.filter((v) => {
         const item = getItemByValue(v);
         return item && !get(item, props.disabledField);
       });
+
+      if (!props.checkStrictly && props.autoCheckParent) {
+        filteredValues = processParentSelection(filteredValues);
+      }
+
       treeValue.value = filteredValues.map((v) => getItemByValue(v));
 
       if (filteredValues.length !== val.length) {
@@ -123,7 +128,35 @@ function updateTreeValue() {
     }
   }
 }
+function processParentSelection(
+  selectedValues: Array<number | string>,
+): Array<number | string> {
+  if (props.checkStrictly) return selectedValues;
+
+  const result = [...selectedValues];
+
+  for (let i = result.length - 1; i >= 0; i--) {
+    const currentValue = result[i];
+    if (currentValue === undefined) continue;
+    const currentItem = getItemByValue(currentValue);
+
+    if (!currentItem) continue;
+
+    const children = get(currentItem, props.childrenField);
+    if (Array.isArray(children) && children.length > 0) {
+      const hasSelectedChildren = children.some((child) => {
+        const childValue = get(child, props.valueField);
+        return result.includes(childValue);
+      });
 
+      if (!hasSelectedChildren) {
+        result.splice(i, 1);
+      }
+    }
+  }
+
+  return result;
+}
 function updateModelValue(val: Arrayable<Recordable<any>>) {
   if (Array.isArray(val)) {
     const filteredVal = val.filter((v) => !get(v, props.disabledField));