fix: drawer header is missing (#4846)

vbenjs · Nov 9, 2024 · 5e44aa9 · 5e44aa9
1 parent 26bec42
commit 5e44aa9
Show file tree

Hide file tree

Showing 12 changed files with 282 additions and 62 deletions.
diff --git a/packages/@core/base/shared/package.json b/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:",

diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts b/packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts
@@ -36,6 +36,7 @@ export class DrawerApi {
       confirmLoading: false,
       contentClass: '',
       footer: true,
+      header: true,
       isOpen: false,
       loading: false,
       modal: true,

diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue b/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="

diff --git a/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue b/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"

diff --git a/packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue b/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"

diff --git a/packages/effects/layouts/package.json b/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:"
   }

diff --git a/packages/effects/layouts/src/basic/layout.vue b/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: [] }>();

diff --git a/packages/effects/layouts/src/index.ts b/packages/effects/layouts/src/index.ts
@@ -1,5 +1,3 @@
-import 'default-passive-events';
-
 export * from './authentication';
 export * from './basic';
 export * from './iframe';

diff --git a/packages/effects/plugins/src/vxe-table/theme.css b/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)) {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -13,8 +13,6 @@
   "sideEffects": [
     "**/*.css"
   ],
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
   "exports": {
     ".": {
       "types": "./src/index.ts",