bichangxiong/ruoyi-plus-vben5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dap
2024-10-14 17:19:16 +08:00
parent 8f6a2a6c23 ea962e75d0
commit 47a817f73c
71 changed files with 970 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import {
VbenLoading,
VisuallyHidden,
} from '@vben-core/shadcn-ui';
import { globalShareState } from '@vben-core/shared/global-state';
import { cn } from '@vben-core/shared/utils';
interface Props extends DrawerProps {
@@ -33,6 +34,8 @@ const props = withDefaults(defineProps<Props>(), {
drawerApi: undefined,
});
const components = globalShareState.getComponents();
const id = useId();
provide('DISMISSABLE_DRAWER_ID', id);
@@ -187,7 +190,8 @@ function handleFocusOutside(e: Event) {
>
<slot name="prepend-footer"></slot>
<slot name="footer">
<VbenButton
<component
:is="components.DefaultButton || VbenButton"
v-if="showCancelButton"
variant="ghost"
@click="() => drawerApi?.onCancel()"
@@ -195,8 +199,10 @@ function handleFocusOutside(e: Event) {
<slot name="cancelText">
{{ cancelText || $t('cancel') }}
</slot>
</VbenButton>
<VbenButton
</component>
<component
:is="components.PrimaryButton || VbenButton"
v-if="showConfirmButton"
:loading="confirmLoading"
@click="() => drawerApi?.onConfirm()"
@@ -204,7 +210,7 @@ function handleFocusOutside(e: Event) {
<slot name="confirmText">
{{ confirmText || $t('confirm') }}
</slot>
</VbenButton>
</component>
</slot>
<slot name="append-footer"></slot>
</SheetFooter>

14
packages/@core/ui-kit/popup-ui/src/modal/modal.vue
View File

@@ -22,6 +22,7 @@ import {
VbenLoading,
VisuallyHidden,
} from '@vben-core/shadcn-ui';
import { globalShareState } from '@vben-core/shared/global-state';
import { cn } from '@vben-core/shared/utils';
import { useModalDraggable } from './use-modal-draggable';
@@ -34,6 +35,8 @@ const props = withDefaults(defineProps<Props>(), {
modalApi: undefined,
});
const components = globalShareState.getComponents();
const contentRef = ref();
const wrapperRef = ref<HTMLElement>();
const dialogRef = ref();
@@ -256,7 +259,8 @@ function handleFocusOutside(e: Event) {
>
<slot name="prepend-footer"></slot>
<slot name="footer">
<VbenButton
<component
:is="components.DefaultButton || VbenButton"
v-if="showCancelButton"
variant="ghost"
@click="() => modalApi?.onCancel()"
@@ -264,8 +268,10 @@ function handleFocusOutside(e: Event) {
<slot name="cancelText">
{{ cancelText || $t('cancel') }}
</slot>
</VbenButton>
<VbenButton
</component>
<component
:is="components.PrimaryButton || VbenButton"
v-if="showConfirmButton"
:loading="confirmLoading"
@click="() => modalApi?.onConfirm()"
@@ -273,7 +279,7 @@ function handleFocusOutside(e: Event) {
<slot name="confirmText">
{{ confirmText || $t('confirm') }}
</slot>
</VbenButton>
</component>
</slot>
<slot name="append-footer"></slot>
</DialogFooter>