From 10b3a16f794c4ae0bc53357e5ff64ddb7bb2c7c5 Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Wed, 18 Dec 2024 22:52:40 +0800
Subject: [PATCH 1/2] fix: sidebar style on focus (#5178)

---
 .../@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
index 94dfcadb..88538489 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
@@ -38,7 +38,7 @@ const delegatedProps = computed(() => {
   >
     <ScrollAreaViewport
       as-child
-      class="h-full w-full rounded-[inherit]"
+      class="h-full w-full rounded-[inherit] focus:outline-none"
       @scroll="onScroll"
     >
       <slot></slot>

From db5b727300c966354fbfd89271f648c866c7b61c Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Wed, 18 Dec 2024 22:53:05 +0800
Subject: [PATCH 2/2] feat: page content class override (#5179)

---
 packages/effects/common-ui/src/components/page/page.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/effects/common-ui/src/components/page/page.vue b/packages/effects/common-ui/src/components/page/page.vue
index 90e00080..78f0ed4c 100644
--- a/packages/effects/common-ui/src/components/page/page.vue
+++ b/packages/effects/common-ui/src/components/page/page.vue
@@ -100,7 +100,7 @@ onMounted(() => {
       </div>
     </div>
 
-    <div :class="contentClass" :style="contentStyle" class="h-full p-4">
+    <div :class="cn('h-full p-4', contentClass)" :style="contentStyle">
       <slot></slot>
     </div>