diff --git a/packages/@core/uikit/layout-ui/src/components/widgets/sidebar-fixed-button.vue b/packages/@core/uikit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
index 33b5a3aea..fdff6bd80 100644
--- a/packages/@core/uikit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
+++ b/packages/@core/uikit/layout-ui/src/components/widgets/sidebar-fixed-button.vue
@@ -17,7 +17,7 @@ function toggleFixed() {
diff --git a/packages/@core/uikit/layout-ui/src/vben-layout.vue b/packages/@core/uikit/layout-ui/src/vben-layout.vue
index 3d74b369b..f6619ce78 100644
--- a/packages/@core/uikit/layout-ui/src/vben-layout.vue
+++ b/packages/@core/uikit/layout-ui/src/vben-layout.vue
@@ -30,7 +30,7 @@ const props = withDefaults(defineProps
(), {
// footerBackgroundColor: '#fff',
footerFixed: true,
footerHeight: 32,
- // headerBackgroundColor: 'hsl(var(--color-background))',
+ // headerBackgroundColor: 'hsl(var(--background))',
headerHeight: 50,
headerHeightOffset: 10,
headerHidden: false,
@@ -48,7 +48,7 @@ const props = withDefaults(defineProps(), {
sidebarTheme: 'dark',
sidebarWidth: 180,
tabbarEnable: true,
- // tabsBackgroundColor: 'hsl(var(--color-background))',
+ // tabsBackgroundColor: 'hsl(var(--background))',
tabsHeight: 36,
zIndex: 200,
});
@@ -213,17 +213,15 @@ const sidebarFace = computed(() => {
if (isDark) {
backgroundColor = isSidebarMixedNav.value
- ? 'hsl(var(--color-menu-dark-darken))'
- : 'hsl(var(--color-menu-dark))';
+ ? 'hsl(var(--menu-dark-darken))'
+ : 'hsl(var(--menu-dark))';
} else {
backgroundColor = isSidebarMixedNav.value
- ? 'hsl(var(--color-menu-darken))'
- : 'hsl(var(--color-menu))';
+ ? 'hsl(var(--menu-darken))'
+ : 'hsl(var(--menu))';
}
- extraBackgroundColor = isDark
- ? 'hsl(var(--color-menu-dark))'
- : 'hsl(var(--color-menu))';
+ extraBackgroundColor = isDark ? 'hsl(var(--menu-dark))' : 'hsl(var(--menu))';
return {
backgroundColor,
diff --git a/packages/@core/uikit/menu-ui/src/components/normal-menu/normal-menu.vue b/packages/@core/uikit/menu-ui/src/components/normal-menu/normal-menu.vue
index 9284e2034..7ccded816 100644
--- a/packages/@core/uikit/menu-ui/src/components/normal-menu/normal-menu.vue
+++ b/packages/@core/uikit/menu-ui/src/components/normal-menu/normal-menu.vue
@@ -78,7 +78,7 @@ function handleMouseenter(menu: MenuRecordRaw) {
@include is('dark') {
.#{$namespace}-normal-menu__item {
- color: hsl(var(--color-dark-foreground) / 80%);
+ color: hsl(var(--dark-foreground) / 80%);
}
}
@@ -92,7 +92,7 @@ function handleMouseenter(menu: MenuRecordRaw) {
// max-height: 64px;
padding: var(--menu-item-padding-y) var(--menu-item-padding-x);
margin: var(--menu-item-margin-y) var(--menu-item-margin-x);
- color: hsl(var(--color-foreground) / 90%);
+ color: hsl(var(--foreground) / 90%);
cursor: pointer;
border-radius: var(--menu-item-radius);
transition:
@@ -103,20 +103,20 @@ function handleMouseenter(menu: MenuRecordRaw) {
@include is('active') {
font-weight: 700;
- color: hsl(var(--color-primary-foreground));
- background-color: hsl(var(--color-primary));
+ color: hsl(var(--primary-foreground));
+ background-color: hsl(var(--primary));
.#{$namespace}-normal-menu__name {
- color: hsl(var(--color-primary-foreground));
+ color: hsl(var(--primary-foreground));
}
.#{$namespace}-normal-menu__icon {
- color: hsl(var(--color-primary-foreground));
+ color: hsl(var(--primary-foreground));
}
}
&:not(.is-active):hover {
- color: hsl(var(--color-foreground));
+ color: hsl(var(--foreground));
background-color: hsl(var(--menu-dark-background));
}
@@ -130,7 +130,7 @@ function handleMouseenter(menu: MenuRecordRaw) {
@include is('dark') {
.#{$namespace}-normal-menu__item {
&:not(.is-active):hover {
- color: hsl(var(--color-primary-foreground));
+ color: hsl(var(--primary-foreground));
background-color: hsl(var(--menu-dark-background));
}
}
diff --git a/packages/@core/uikit/menu-ui/src/styles/index.scss b/packages/@core/uikit/menu-ui/src/styles/index.scss
index d089f29c1..ed8384585 100644
--- a/packages/@core/uikit/menu-ui/src/styles/index.scss
+++ b/packages/@core/uikit/menu-ui/src/styles/index.scss
@@ -22,33 +22,33 @@
--menu-light-background: 192deg 1% 93%;
&.is-dark {
- --menu-background-color: hsl(var(--color-menu-dark));
- // --menu-submenu-opened-background-color: hsl(var(--color-menu-opened-dark));
+ --menu-background-color: hsl(var(--menu-dark));
+ // --menu-submenu-opened-background-color: hsl(var(--menu-opened-dark));
--menu-item-background-color: var(--menu-background-color);
- --menu-item-color: hsl(var(--color-dark-foreground) / 80%);
- --menu-item-hover-color: hsl(var(--color-primary-foreground));
+ --menu-item-color: hsl(var(--dark-foreground) / 80%);
+ --menu-item-hover-color: hsl(var(--primary-foreground));
--menu-item-hover-background-color: hsl(var(--menu-dark-background));
- --menu-item-active-color: hsl(var(--color-primary-foreground));
- --menu-item-active-background-color: hsl(var(--color-primary));
- --menu-submenu-hover-color: hsl(var(--color-dark-foreground));
+ --menu-item-active-color: hsl(var(--primary-foreground));
+ --menu-item-active-background-color: hsl(var(--primary));
+ --menu-submenu-hover-color: hsl(var(--dark-foreground));
--menu-submenu-hover-background-color: hsl(var(--menu-dark-background));
- --menu-submenu-active-color: hsl(var(--color-dark-foreground));
+ --menu-submenu-active-color: hsl(var(--dark-foreground));
--menu-submenu-active-background-color: transparent;
--menu-submenu-background-color: var(--menu-background-color);
}
&.is-light {
- --menu-background-color: hsl(var(--color-menu));
- // --menu-submenu-opened-background-color: hsl(var(--color-menu-opened));
+ --menu-background-color: hsl(var(--menu));
+ // --menu-submenu-opened-background-color: hsl(var(--menu-opened));
--menu-item-background-color: var(--menu-background-color);
- --menu-item-color: hsl(var(--color-foreground));
+ --menu-item-color: hsl(var(--foreground));
--menu-item-hover-color: var(--menu-item-color);
--menu-item-hover-background-color: hsl(var(--menu-light-background));
- --menu-item-active-color: hsl(var(--color-primary-foreground));
- --menu-item-active-background-color: hsl(var(--color-primary));
- --menu-submenu-hover-color: hsl(var(--color-primary));
+ --menu-item-active-color: hsl(var(--primary-foreground));
+ --menu-item-active-background-color: hsl(var(--primary));
+ --menu-submenu-hover-color: hsl(var(--primary));
--menu-submenu-hover-background-color: hsl(var(--menu-light-background));
- --menu-submenu-active-color: hsl(var(--color-primary));
+ --menu-submenu-active-color: hsl(var(--primary));
--menu-submenu-active-background-color: transparent;
--menu-submenu-background-color: var(--menu-background-color);
}
@@ -79,24 +79,24 @@
--menu-background-color: transparent;
&.is-dark {
- --menu-item-hover-color: var(--color-foreground);
+ --menu-item-hover-color: var(--foreground);
--menu-item-hover-background-color: hsl(var(--menu-dark-background));
- --menu-item-active-color: hsl(var(--color-foreground));
+ --menu-item-active-color: hsl(var(--foreground));
--menu-item-active-background-color: hsl(var(--menu-dark-background));
- --menu-submenu-active-color: hsl(var(--color-foreground));
+ --menu-submenu-active-color: hsl(var(--foreground));
--menu-submenu-active-background-color: hsl(var(--menu-dark-background));
- --menu-submenu-hover-color: hsl(var(--color-foreground));
+ --menu-submenu-hover-color: hsl(var(--foreground));
--menu-submenu-hover-background-color: hsl(var(--menu-dark-background));
}
&.is-light {
- --menu-item-active-color: hsl(var(--color-foreground));
+ --menu-item-active-color: hsl(var(--foreground));
--menu-item-active-background-color: hsl(var(--menu-light-background));
--menu-item-hover-background-color: hsl(var(--menu-light-background));
- --menu-item-hover-color: hsl(var(--color-primary));
- --menu-submenu-hover-color: hsl(var(--color-primary));
+ --menu-item-hover-color: hsl(var(--primary));
+ --menu-submenu-hover-color: hsl(var(--primary));
--menu-submenu-hover-background-color: hsl(var(--menu-light-background));
- --menu-submenu-active-color: hsl(var(--color-foreground));
+ --menu-submenu-active-color: hsl(var(--foreground));
--menu-submenu-active-background-color: hsl(var(--menu-light-background));
}
}
@@ -316,7 +316,7 @@
.#{$namespace}-sub-menu-content,
.#{$namespace}-menu-item {
&.is-active {
- color: hsl(var(--color-primary-foreground)) !important;
+ color: hsl(var(--primary-foreground)) !important;
background: var(--menu-item-active-background-color) !important;
}
}
diff --git a/packages/@core/uikit/shadcn-ui/package.json b/packages/@core/uikit/shadcn-ui/package.json
index c341c4de7..d96623ce1 100644
--- a/packages/@core/uikit/shadcn-ui/package.json
+++ b/packages/@core/uikit/shadcn-ui/package.json
@@ -48,7 +48,7 @@
"@vben-core/typings": "workspace:*",
"@vueuse/core": "^10.11.0",
"class-variance-authority": "^0.7.0",
- "radix-vue": "^1.8.4",
+ "radix-vue": "^1.8.5",
"vue": "^3.4.30",
"vue-sonner": "^1.1.3"
}
diff --git a/packages/@core/uikit/shadcn-ui/src/components/logo/logo.vue b/packages/@core/uikit/shadcn-ui/src/components/logo/logo.vue
index d09564a40..aa2cfbdb2 100644
--- a/packages/@core/uikit/shadcn-ui/src/components/logo/logo.vue
+++ b/packages/@core/uikit/shadcn-ui/src/components/logo/logo.vue
@@ -66,7 +66,7 @@ const logoClass = computed(() => {
/>
{{ text }}
diff --git a/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue b/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue
index dcb430d4c..84a672209 100644
--- a/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue
+++ b/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue
@@ -22,6 +22,8 @@ const props = withDefaults(defineProps(), {
tabs: () => [],
});
+const activeTab = defineModel();
+
const getDefaultValue = computed(() => {
return props.defaultValue || props.tabs[0]?.value;
});
@@ -40,7 +42,7 @@ const tabsIndicatorStyle = computed(() => {
-
+
diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/sonner/Sonner.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/sonner/Sonner.vue
index 2976460d4..7029fab9f 100644
--- a/packages/@core/uikit/shadcn-ui/src/components/ui/sonner/Sonner.vue
+++ b/packages/@core/uikit/shadcn-ui/src/components/ui/sonner/Sonner.vue
@@ -33,7 +33,7 @@ const props = withDefaults(defineProps(), {