github_mirrors/gf-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/gf-vben-admin.git synced 2025-02-03 03:32:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(modal): ensure that the height is correct in the modal full screen state close #308

Browse Source
This commit is contained in:
Vben 2021-02-26 20:33:06 +08:00
parent ec7bef792b
commit 37508ca411
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/Modal/src/BasicModal.vue
View File

@ -32,7 +32,7 @@
ref="modalWrapperRef"
:loading="getProps.loading"
:minHeight="getProps.minHeight"
:height="getProps.height"
:height="getWrapperHeight"
:visible="visibleRef"
:modalFooterHeight="footer !== undefined && !footer ? 0 : undefined"
v-bind="omit(getProps.wrapperProps, 'visible', 'height')"
@ -136,8 +136,19 @@
}
);
const getBindValue = computed((): any => {
return { ...attrs, ...unref(getProps) };
const getBindValue = computed(
(): Recordable => {
const attr = { ...attrs, ...unref(getProps) };
if (unref(fullScreenRef)) {
return omit(attr, 'height');
}
return attr;
}
);
const getWrapperHeight = computed(() => {
if (unref(fullScreenRef)) return undefined;
return unref(getProps).height;
});
watchEffect(() => {
@ -217,6 +228,7 @@
handleExtHeight,
handleHeightChange,
handleTitleDbClick,
getWrapperHeight,
};
},
});