fix: fix known problems

2024-07-16 00:14:24 +08:00
parent cf16c7bdde
commit 09fa2af23d
21 changed files with 242 additions and 697 deletions
--- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue
+++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue
@@ -272,9 +272,17 @@ const tabbarStyle = computed((): CSSProperties => {
  if (!isMixedNav.value) {
    width = '100%';
  } else if (sidebarEnable.value) {
+    const hoverWidth =
+      sidebarExpandOnHovering.value && !sidebarExpandOnHover.value
+        ? props.sidebarWidth
+        : getSideCollapseWidth.value;
+
+    const runtimeWidth = isMixedNav.value ? hoverWidth : props.sidebarWidth;
+
    marginLeft = sidebarCollapse.value
      ? getSideCollapseWidth.value
-      : props.sidebarWidth;
+      : runtimeWidth;
+
    width = `calc(100% - ${getSidebarWidth.value}px)`;
  } else {
    width = '100%';