From 8ed1c4ed594348e96c4b8e42dce056fe29f33238 Mon Sep 17 00:00:00 2001 From: warmthsea <2586244885@qq.com> Date: Fri, 3 Jan 2025 09:38:06 +0800 Subject: [PATCH] fix: change drawer and modal zIndex to 2000 compatible with element-plus --- docs/src/components/common-ui/vben-drawer.md | 2 +- docs/src/components/common-ui/vben-modal.md | 2 +- packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue | 2 +- packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue | 2 +- .../ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue | 2 +- packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/components/common-ui/vben-drawer.md b/docs/src/components/common-ui/vben-drawer.md index e2409daa438..236aa610d58 100644 --- a/docs/src/components/common-ui/vben-drawer.md +++ b/docs/src/components/common-ui/vben-drawer.md @@ -100,7 +100,7 @@ const [Drawer, drawerApi] = useVbenDrawer({ | contentClass | modal内容区域的class | `string` | - | | footerClass | modal底部区域的class | `string` | - | | headerClass | modal顶部区域的class | `string` | - | -| zIndex | 抽屉的ZIndex层级 | `number` | `1000` | +| zIndex | 抽屉的ZIndex层级 | `number` | `2000` | ::: info appendToMain diff --git a/docs/src/components/common-ui/vben-modal.md b/docs/src/components/common-ui/vben-modal.md index 9e422d1829e..8e63d1f1d8f 100644 --- a/docs/src/components/common-ui/vben-modal.md +++ b/docs/src/components/common-ui/vben-modal.md @@ -110,7 +110,7 @@ const [Modal, modalApi] = useVbenModal({ | footerClass | modal底部区域的class | `string` | - | | headerClass | modal顶部区域的class | `string` | - | | bordered | 是否显示border | `boolean` | `false` | -| zIndex | 弹窗的ZIndex层级 | `number` | `1000` | +| zIndex | 弹窗的ZIndex层级 | `number` | `2000` | ::: info appendToMain diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue b/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue index 30687bd34b7..80c1390c82a 100644 --- a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue +++ b/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue @@ -36,7 +36,7 @@ const props = withDefaults(defineProps(), { appendToMain: false, closeIconPlacement: 'right', drawerApi: undefined, - zIndex: 1000, + zIndex: 2000, }); const components = globalShareState.getComponents(); diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue index 67bf64a688d..92ae2c4f559 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue @@ -29,7 +29,7 @@ const props = withDefaults( zIndex?: number; } >(), - { appendTo: 'body', showClose: true, zIndex: 1000 }, + { appendTo: 'body', showClose: true, zIndex: 2000 }, ); const emits = defineEmits< DialogContentEmits & { close: []; closed: []; opened: [] } diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue index 95908abe598..080c25aa913 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue @@ -16,7 +16,7 @@ import { const props = withDefaults( defineProps(), - { zIndex: 1000 }, + { zIndex: 2000 }, ); const emits = defineEmits(); diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue index f8e22168c65..6b370492fb8 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue @@ -27,7 +27,7 @@ defineOptions({ const props = withDefaults(defineProps(), { appendTo: 'body', - zIndex: 1000, + zIndex: 2000, }); const emits = defineEmits<