Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: drawer header is missing #4846

Merged
merged 1 commit into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@core/base/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down
1 change: 1 addition & 0 deletions packages/@core/ui-kit/popup-ui/src/drawer/drawer-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class DrawerApi {
confirmLoading: false,
contentClass: '',
footer: true,
header: true,
isOpen: false,
loading: false,
modal: true,
Expand Down
6 changes: 0 additions & 6 deletions packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,6 @@ function handleFocusOutside(e: Event) {
</div>
</SheetHeader>

<template v-else>
<VisuallyHidden>
<SheetTitle />
<SheetDescription />
</VisuallyHidden>
</template>
<div
ref="wrapperRef"
:class="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/@core/ui-kit/tabs-ui/src/components/tabs/tabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/effects/layouts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
}
Expand Down
2 changes: 2 additions & 0 deletions packages/effects/layouts/src/basic/layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import {
} from './menu';
import { LayoutTabbar } from './tabbar';

import 'default-passive-events';

defineOptions({ name: 'BasicLayout' });

const emit = defineEmits<{ clearPreferencesAndLogout: [] }>();
Expand Down
2 changes: 0 additions & 2 deletions packages/effects/layouts/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'default-passive-events';

export * from './authentication';
export * from './basic';
export * from './iframe';
Expand Down
7 changes: 6 additions & 1 deletion packages/effects/plugins/src/vxe-table/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 0 additions & 2 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
"sideEffects": [
"**/*.css"
],
"main": "./dist/index.mjs",
"module": "./dist/index.mjs",
"exports": {
".": {
"types": "./src/index.ts",
Expand Down
Loading