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

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

@@ -84,7 +84,7 @@
     "@types/lodash.get": "catalog:",
     "@vue/shared": "catalog:",
     "clsx": "catalog:",
-    "dayjs": "^1.11.13",
+    "dayjs": "catalog:",
     "defu": "catalog:",
     "lodash.clonedeep": "catalog:",
     "lodash.get": "catalog:",

packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue

@@ -179,12 +179,6 @@ function handleFocusOutside(e: Event) {
         </div>
       </SheetHeader>
 
-      <template v-else>
-        <VisuallyHidden>
-          <SheetTitle />
-          <SheetDescription />
-        </VisuallyHidden>
-      </template>
       <div
         ref="wrapperRef"
         :class="

packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue

@@ -65,7 +65,7 @@ const tabsView = computed(() => {
     :style="style"
     class="tabs-chrome !flex h-full w-max overflow-y-hidden pr-6"
   >
-    <TransitionGroup name="slide-down">
+    <TransitionGroup name="slide-left">
       <div
         v-for="(tab, i) in tabsView"
         :key="tab.key"

packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue

@@ -67,9 +67,9 @@ const tabsView = computed(() => {
 <template>
   <div
     :class="contentClass"
-    class="relative !flex h-full w-max items-center overflow-y-hidden pr-6"
+    class="relative !flex h-full w-max items-center overflow-hidden pr-6"
   >
-    <TransitionGroup name="slide-down">
+    <TransitionGroup name="slide-left">
       <div
         v-for="(tab, i) in tabsView"
         :key="tab.key"

packages/effects/layouts/package.json

@@ -37,7 +37,7 @@
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
     "@vueuse/core": "catalog:",
-    "default-passive-events": "^2.0.0",
+    "default-passive-events": "catalog:",
     "vue": "catalog:",
     "vue-router": "catalog:"
   }

packages/effects/layouts/src/basic/layout.vue

@@ -29,6 +29,8 @@ import {
 } from './menu';
 import { LayoutTabbar } from './tabbar';
 
+import 'default-passive-events';
+
 defineOptions({ name: 'BasicLayout' });
 
 const emit = defineEmits<{ clearPreferencesAndLogout: [] }>();

packages/effects/layouts/src/index.ts

@@ -1,5 +1,3 @@
-import 'default-passive-events';
-
 export * from './authentication';
 export * from './basic';
 export * from './iframe';

packages/effects/plugins/src/vxe-table/theme.css

@@ -89,7 +89,12 @@
 }
 
 .vxe-toolbar {
-  padding-top: 0;
+  padding: 0;
+}
+
+.vxe-buttons--wrapper:not(:empty),
+.vxe-tools--wrapper:not(:empty) {
+  padding: 0.6em 0;
 }
 
 .vxe-tools--operate:not(:has(button)) {

packages/utils/package.json

@@ -13,8 +13,6 @@
   "sideEffects": [
     "**/*.css"
   ],
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
   "exports": {
     ".": {
       "types": "./src/index.ts",

pnpm-workspace.yaml

@@ -79,6 +79,7 @@ catalog:
   cz-git: ^1.11.0
   czg: ^1.11.0
   dayjs: ^1.11.13
+  default-passive-events: ^2.0.0
   defu: ^6.1.4
   depcheck: ^1.4.7
   dotenv: ^16.4.5
@@ -137,7 +138,7 @@ catalog:
   radix-vue: ^1.9.9
   resolve.exports: ^2.0.2
   rimraf: ^6.0.1
-  rollup: ^4.24.4
+  rollup: ^4.25.0
   rollup-plugin-visualizer: ^5.12.0
   sass: 1.80.6
   sortablejs: ^1.15.3
@@ -174,8 +175,8 @@ catalog:
   vue-i18n: ^10.0.4
   vue-router: ^4.4.5
   vue-tsc: ^2.1.10
-  vxe-pc-ui: ^4.2.46
-  vxe-table: ^4.8.8
+  vxe-pc-ui: ^4.2.49
+  vxe-table: ^4.8.9
   watermark-js-plus: ^1.5.7
   zod: ^3.23.8
   zod-defaults: ^0.1.3