Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

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>

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>