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

packages/@core/base/icons/package.json

@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@iconify/vue": "^4.1.2",
-    "lucide-vue-next": "^0.441.0",
-    "vue": "^3.5.6"
+    "@iconify/vue": "catalog:",
+    "lucide-vue-next": "catalog:",
+    "vue": "catalog:"
   }
 }

packages/@core/base/shared/package.json

@@ -69,19 +69,19 @@
     }
   },
   "dependencies": {
-    "@ctrl/tinycolor": "^4.1.0",
-    "@tanstack/vue-store": "^0.5.5",
-    "@vue/reactivity": "^3.5.6",
-    "@vue/shared": "^3.5.6",
-    "clsx": "^2.1.1",
-    "defu": "^6.1.4",
-    "lodash.clonedeep": "^4.5.0",
-    "nprogress": "^0.2.0",
-    "tailwind-merge": "^2.5.2",
-    "theme-colors": "^0.1.0"
+    "@ctrl/tinycolor": "catalog:",
+    "@tanstack/vue-store": "catalog:",
+    "@vue/reactivity": "catalog:",
+    "@vue/shared": "catalog:",
+    "clsx": "catalog:",
+    "defu": "catalog:",
+    "lodash.clonedeep": "catalog:",
+    "nprogress": "catalog:",
+    "tailwind-merge": "catalog:",
+    "theme-colors": "catalog:"
   },
   "devDependencies": {
-    "@types/lodash.clonedeep": "^4.5.9",
-    "@types/nprogress": "^0.2.3"
+    "@types/lodash.clonedeep": "catalog:",
+    "@types/nprogress": "catalog:"
   }
 }

packages/@core/base/shared/src/utils/dom.ts

@@ -69,3 +69,19 @@ export function getScrollbarWidth() {
   scrollDiv.remove();
   return scrollbarWidth;
 }
+
+export function needsScrollbar() {
+  const doc = document.documentElement;
+  const body = document.body;
+
+  // 检查 body 的 overflow-y 样式
+  const overflowY = window.getComputedStyle(body).overflowY;
+
+  // 如果明确设置了需要滚动条的样式
+  if (overflowY === 'scroll' || overflowY === 'auto') {
+    return doc.scrollHeight > window.innerHeight;
+  }
+
+  // 在其他情况下，根据 scrollHeight 和 innerHeight 比较判断
+  return doc.scrollHeight > window.innerHeight;
+}

packages/@core/base/typings/package.json

@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "vue": "^3.5.6",
-    "vue-router": "^4.4.5"
+    "vue": "catalog:",
+    "vue-router": "catalog:"
   }
 }