diff --git a/.vscode/settings.json b/.vscode/settings.json index cc8dcc17..d5a75333 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -91,6 +91,7 @@ "**/.gitignore": true, "**/.svn": true, "**/.DS_Store": true, + "**/.vitepress/cache": true, "**/.idea": true, "**/.vscode": false, "**/.yarn": true, diff --git a/packages/@vben-core/uikit/layout-ui/src/vben-layout.vue b/packages/@vben-core/uikit/layout-ui/src/vben-layout.vue index 964607b2..07e8f4c1 100644 --- a/packages/@vben-core/uikit/layout-ui/src/vben-layout.vue +++ b/packages/@vben-core/uikit/layout-ui/src/vben-layout.vue @@ -317,6 +317,7 @@ const contentStyle = computed((): CSSProperties => { (!isHeaderAuto.value || scrollY.value < headerWrapperHeight.value) ? `${headerWrapperHeight.value}px` : 0, + paddingBottom: `${props.footerVisible ? props.footerHeight : 0}px`, }; }); diff --git a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue index 38453d83..f1cce77a 100644 --- a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue +++ b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue @@ -90,7 +90,7 @@ li a::after { } li a::before { - @apply -left-7 z-[-1] border-l-transparent; + @apply -left-7 z-10 border-l-transparent; } li a::after { diff --git a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue index be05dd8c..894d6f0e 100644 --- a/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue +++ b/packages/@vben-core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue @@ -45,7 +45,7 @@ function handleClick(path?: string) { diff --git a/packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue b/packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue index f8deb67e..b7677580 100644 --- a/packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue +++ b/packages/@vben-core/uikit/shadcn-ui/src/components/button/icon-button.vue @@ -25,7 +25,7 @@ const props = withDefaults(defineProps(), { const slots = useSlots(); -const showTooltip = computed(() => !!slots.tooltip || props.tooltip); +const showTooltip = computed(() => !!slots.tooltip || !!props.tooltip);