Commit b45f8c5021a4225026ed698c083a1af42a08faff

Authored by vben
1 parent ca4f1a8f

fix(modal): fullscreen height calculation error #203

src/components/Modal/src/components/ModalWrapper.vue
@@ -36,8 +36,8 @@ @@ -36,8 +36,8 @@
36 props: { 36 props: {
37 loading: propTypes.bool, 37 loading: propTypes.bool,
38 useWrapper: propTypes.bool.def(true), 38 useWrapper: propTypes.bool.def(true),
39 - modalHeaderHeight: propTypes.number.def(50),  
40 - modalFooterHeight: propTypes.number.def(54), 39 + modalHeaderHeight: propTypes.number.def(57),
  40 + modalFooterHeight: propTypes.number.def(74),
41 minHeight: propTypes.number.def(200), 41 minHeight: propTypes.number.def(200),
42 height: propTypes.number, 42 height: propTypes.number,
43 footerOffset: propTypes.number.def(0), 43 footerOffset: propTypes.number.def(0),
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 137
138 if (props.fullScreen) { 138 if (props.fullScreen) {
139 realHeightRef.value = 139 realHeightRef.value =
140 - window.innerHeight - props.modalFooterHeight - props.modalHeaderHeight; 140 + window.innerHeight - props.modalFooterHeight - props.modalHeaderHeight - 28;
141 } else { 141 } else {
142 realHeightRef.value = props.height 142 realHeightRef.value = props.height
143 ? props.height 143 ? props.height
@@ -145,6 +145,9 @@ @@ -145,6 +145,9 @@
145 ? maxHeight 145 ? maxHeight
146 : realHeight; 146 : realHeight;
147 } 147 }
  148 + console.log('======================');
  149 + console.log(realHeightRef.value, props);
  150 + console.log('======================');
148 emit('height-change', unref(realHeightRef)); 151 emit('height-change', unref(realHeightRef));
149 } catch (error) { 152 } catch (error) {
150 console.log(error); 153 console.log(error);