by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dap 2024-12-19 07:49:46 +08:00
commit 0a9e85bb58
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
View File

@ -38,7 +38,7 @@ const delegatedProps = computed(() => {
> >
<ScrollAreaViewport <ScrollAreaViewport
as-child as-child
class="h-full w-full rounded-[inherit]" class="h-full w-full rounded-[inherit] focus:outline-none"
@scroll="onScroll" @scroll="onScroll"
> >
<slot></slot> <slot></slot>

2
packages/effects/common-ui/src/components/page/page.vue
View File

@ -100,7 +100,7 @@ onMounted(() => {
</div> </div>
</div> </div>
<div :class="contentClass" :style="contentStyle" class="h-full p-4"> <div :class="cn('h-full p-4', contentClass)" :style="contentStyle">
<slot></slot> <slot></slot>
</div> </div>