public/ruoyi-plus-vben5
1
0
Fork 0
mirror of https://gitee.com/dapppp/ruoyi-plus-vben5.git synced 2026-03-28 05:43:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
dap
2025-11-06 09:38:42 +08:00
parent 4c39bef181 7268824612
commit 8c42c8cc70
44 changed files with 783 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
View File

@@ -31,7 +31,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
v-bind="forwarded"
:class="
cn(
'focus-visible:ring-ring data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground border-border peer h-4 w-4 shrink-0 rounded-sm border transition focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50',
'focus-visible:ring-ring data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground border-border hover:border-primary peer h-4 w-4 shrink-0 rounded-sm border transition focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50',
props.class,
)
"

10
packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue
View File

@@ -1,11 +1,13 @@
<script setup lang="ts">
import type { TabsListProps } from 'radix-vue';
import { cn } from '@vben-core/shared/utils';
import { TabsList } from 'radix-vue';
import { computed } from 'vue';
const props = defineProps<{ class?: any } & TabsListProps>();
import { cn } from '@vben-core/shared/utils';
import { TabsList } from 'radix-vue';
const props = defineProps<TabsListProps & { class?: any }>();
const delegatedProps = computed(() => {
const { class: _, ...delegated } = props;
@@ -19,7 +21,7 @@ const delegatedProps = computed(() => {
v-bind="delegatedProps"
:class="
cn(
'bg-muted text-muted-foreground inline-flex h-9 items-center justify-center rounded-lg p-1',
'bg-muted text-muted-foreground inline-flex h-9 items-center justify-center rounded-md p-1',
props.class,
)
"