Skip to content

Commit 53706ca

Browse files
wowChengkagol
authored andcommitted
fix(modal): 修复两个弹窗定位互相干扰问题
1 parent bbc299d commit 53706ca

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

packages/devui-vue/devui/modal/src/composables/use-draggable.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ function addUnit(value?: string | number, defaultUnit = 'px'): string {
1313
}
1414
}
1515

16-
export const modalPosition = ref('translate(-50%, -50%)');
17-
1816
interface Draggable {
1917
clearPosition: () => void;
18+
modalPosition: Ref<string>;
2019
}
2120

2221
export const useDraggable = (
2322
targetRef: Ref<HTMLElement | undefined>,
2423
dragRef: Ref<HTMLElement | undefined>,
2524
draggable: ComputedRef<boolean>
2625
): Draggable => {
26+
const modalPosition = ref('translate(-50%, -50%)');
27+
2728
let transform = {
2829
offsetX: 0,
2930
offsetY: 0,
@@ -103,5 +104,6 @@ export const useDraggable = (
103104

104105
return {
105106
clearPosition,
107+
modalPosition,
106108
};
107109
};

packages/devui-vue/devui/modal/src/modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { modalProps, ModalProps, ModalType } from './modal-types';
33
import { Icon } from '../../icon';
44
import { FixedOverlay } from '../../overlay';
55
import { useModal, useModalRender } from './composables/use-modal';
6-
import { useDraggable, modalPosition } from './composables/use-draggable';
6+
import { useDraggable } from './composables/use-draggable';
77
import DModalHeader from './components/header';
88
import DModalBody from './components/body';
99
import { useNamespace } from '../../shared/hooks/use-namespace';
@@ -28,7 +28,7 @@ export default defineComponent({
2828
const dialogRef = ref<HTMLElement>();
2929
const headerRef = ref<HTMLElement>();
3030
const draggable = computed(() => props.draggable);
31-
const { clearPosition } = useDraggable(dialogRef, headerRef, draggable);
31+
const { clearPosition, modalPosition } = useDraggable(dialogRef, headerRef, draggable);
3232

3333
watch(modelValue, (val) => {
3434
if (val && !keepLast.value) {

0 commit comments

Comments
 (0)