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

packages/@core/composables/package.json

@@ -37,7 +37,7 @@
   "dependencies": {
     "@vben-core/shared": "workspace:*",
     "@vueuse/core": "^11.0.3",
-    "radix-vue": "^1.9.4",
+    "radix-vue": "^1.9.5",
     "sortablejs": "^1.15.2",
     "vue": "^3.4.38"
   },

packages/@core/ui-kit/layout-ui/src/vben-layout.vue

@@ -184,9 +184,6 @@ const headerFixed = computed(() => {
 });
 
 const showSidebar = computed(() => {
-  // if (isMixedNav.value && !props.sideHidden) {
-  //   return false;
-  // }
   return isSideMode.value && sidebarEnable.value;
 });
 

packages/@core/ui-kit/shadcn-ui/package.json

@@ -49,7 +49,7 @@
     "@vueuse/core": "^11.0.3",
     "class-variance-authority": "^0.7.0",
     "lucide-vue-next": "^0.436.0",
-    "radix-vue": "^1.9.4",
+    "radix-vue": "^1.9.5",
     "vue": "^3.4.38"
   }
 }

packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue

@@ -14,7 +14,7 @@ interface Props {
   contentClass?: any;
   contentStyle?: StyleValue;
   delayDuration?: number;
-  side: TooltipContentProps['side'];
+  side?: TooltipContentProps['side'];
 }
 
 withDefaults(defineProps<Props>(), {
@@ -33,7 +33,7 @@ withDefaults(defineProps<Props>(), {
         :class="contentClass"
         :side="side"
         :style="contentStyle"
-        class="side-content text-popover-foreground bg-popover"
+        class="side-content text-popover-foreground bg-accent rounded-md"
       >
         <slot></slot>
       </TooltipContent>