diff --git a/src/components/Modal/src/components/ModalWrapper.vue b/src/components/Modal/src/components/ModalWrapper.vue index 2810b76e1451910a9ba949d438799150d6f274b6..f1f9b8d4aa79e5ee7b583e9b3ed4fcfc14d6e7e6 100644 --- a/src/components/Modal/src/components/ModalWrapper.vue +++ b/src/components/Modal/src/components/ModalWrapper.vue @@ -60,15 +60,13 @@ redoModalHeight: setModalHeight, }); - const spinStyle = computed( - (): CSSProperties => { - return { - minHeight: `${props.minHeight}px`, - // padding 28 - height: `${unref(realHeightRef)}px`, - }; - } - ); + const spinStyle = computed((): CSSProperties => { + return { + minHeight: `${props.minHeight}px`, + // padding 28 + maxHeight: `${unref(realHeightRef)}px`, + }; + }); watchEffect(() => { props.useWrapper && setModalHeight(); diff --git a/src/views/demo/comp/modal/Modal1.vue b/src/views/demo/comp/modal/Modal1.vue index 04cc9fc6e35f260dca7606d0b1c81607ef6a8139..c824de13e06bb647d768b66639ae25ba38eff16e 100644 --- a/src/views/demo/comp/modal/Modal1.vue +++ b/src/views/demo/comp/modal/Modal1.vue @@ -7,6 +7,9 @@ :helpMessage="['提示1', '提示2']" @visible-change="handleShow" > + @@ -18,7 +21,7 @@