From ae5bd3afc502ae20a27405ef03e8e1cb603279e0 Mon Sep 17 00:00:00 2001 From: zoumingjun <846027729@qq.com> Date: Tue, 30 Jun 2026 09:36:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=A6=96=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=80=89=E9=A1=B9=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=97=B6=E6=98=BE=E7=A4=BA=E7=9C=81=E7=95=A5?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=B8=94=E5=A2=9E=E5=8A=A0=E8=81=9A=E7=84=A6?= =?UTF-8?q?=E6=97=B6=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/segmented/segmented.vue | 14 +++++++++++--- .../src/components/segmented/tabs-indicator.vue | 4 ++-- .../ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue | 2 +- .../shadcn-ui/src/ui/tooltip/TooltipContent.vue | 10 ++++++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue index 88985565d..b8f94f1fb 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue @@ -6,6 +6,7 @@ import { computed } from 'vue'; import { TabsTrigger } from 'reka-ui'; import { Tabs, TabsContent, TabsList } from '../../ui'; +import { VbenTooltip } from '../tooltip'; import TabsIndicator from './tabs-indicator.vue'; interface Props { @@ -45,16 +46,23 @@ function activeClass(tab: string): string[] { diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue index 8b5335b23..7d4cda1af 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue @@ -23,13 +23,13 @@ const forwardedProps = useForwardProps(delegatedProps); v-bind="forwardedProps" :class=" cn( - 'absolute bottom-0 left-0 z-10 h-full w-1/2 translate-x-(--reka-tabs-indicator-position) rounded-full px-0 py-1 pr-0.5 transition-[width,transform] duration-300', + 'absolute bottom-0 left-0 z-10 size-full translate-x-(--reka-tabs-indicator-position) rounded-full py-1 transition-[width,transform] duration-300', props.class, ) " >
diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue index 198b61b3d..9e2ebb425 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue @@ -21,7 +21,7 @@ const delegatedProps = reactiveOmit(props, 'class'); v-bind="delegatedProps" :class=" cn( - 'bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]', + 'bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-1 -mx-1', props.class, ) " diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue index 124b5ef5a..7b20c0a8b 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue @@ -5,7 +5,12 @@ import { computed } from 'vue'; import { cn } from '@vben-core/shared/utils'; -import { TooltipContent, TooltipPortal, useForwardPropsEmits } from 'reka-ui'; +import { + TooltipArrow, + TooltipContent, + TooltipPortal, + useForwardPropsEmits, +} from 'reka-ui'; defineOptions({ inheritAttrs: false, @@ -38,12 +43,13 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); data-slot="tooltip-content" :class=" cn( - 'bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-popup w-fit origin-(--reka-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance', + 'bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-popup w-fit origin-(--reka-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance border border-border', props.class, ) " > + From 5ed867eb955bfe139c112a7d4eef18d2eb40aca5 Mon Sep 17 00:00:00 2001 From: zoumingjun <846027729@qq.com> Date: Tue, 30 Jun 2026 09:39:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=BC=80=E5=85=B3=E7=BB=84=E4=BB=B6=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8Bhelp=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/src/widgets/preferences/blocks/switch-item.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/switch-item.vue b/packages/effects/layouts/src/widgets/preferences/blocks/switch-item.vue index d9726e692..7d0458ebf 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/switch-item.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/switch-item.vue @@ -36,7 +36,7 @@ function handleClick() {