canrd-outside / order-erp-front · Commits

Commit b45f8c5021a4225026ed698c083a1af42a08faff

Authored by vben
1 parent ca4f1a8f

fix(modal): fullscreen height calculation error #203

Inline Side-by-side
Showing 1 changed file with 6 additions and 3 deletions
src/components/Modal/src/components/ModalWrapper.vue
  View file @b45f8c5
... ... @@ -36,8 +36,8 @@
36 36 props: {
37 37 loading: propTypes.bool,
38 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 41 minHeight: propTypes.number.def(200),
42 42 height: propTypes.number,
43 43 footerOffset: propTypes.number.def(0),
... ... @@ -137,7 +137,7 @@
137 137  
138 138 if (props.fullScreen) {
139 139 realHeightRef.value =
140   - window.innerHeight - props.modalFooterHeight - props.modalHeaderHeight;
  140 + window.innerHeight - props.modalFooterHeight - props.modalHeaderHeight - 28;
141 141 } else {
142 142 realHeightRef.value = props.height
143 143 ? props.height
... ... @@ -145,6 +145,9 @@
145 145 ? maxHeight
146 146 : realHeight;
147 147 }
  148 + console.log('======================');
  149 + console.log(realHeightRef.value, props);
  150 + console.log('======================');
148 151 emit('height-change', unref(realHeightRef));
149 152 } catch (error) {
150 153 console.log(error);
... ...