vxe-table 3.13.16 → 3.13.17

package/es/grid/src/grid.js

@@ -149,7 +149,7 @@ function renderForm(h, _vm) {
     if (hasForm) {
         return h('div', {
             key: 'form',
-            ref: 'formWrapper',
+            ref: 'refFormWrapper',
             class: 'vxe-grid--form-wrapper'
         }, formSlot ? formSlot.call(_vm, { $grid: _vm }, h) : renderDefaultForm(h, _vm));
     }
@@ -165,7 +165,7 @@ function renderToolbar(h, _vm) {
     if (hasToolbar) {
         return h('div', {
             key: 'toolbar',
-            ref: 'toolbarWrapper',
+            ref: 'refToolbarWrapper',
             class: 'vxe-grid--toolbar-wrapper'
         }, toolbarSlot
             ? toolbarSlot.call(_vm, { $grid: _vm }, h)
@@ -188,7 +188,7 @@ function renderTop(h, _vm) {
     return topSlot
         ? h('div', {
             key: 'top',
-            ref: 'topWrapper',
+            ref: 'refTopWrapper',
             class: 'vxe-grid--top-wrapper'
         }, topSlot.call(_vm, { $grid: _vm }, h))
         : _e();
@@ -239,7 +239,7 @@ function renderBottom(h, _vm) {
     return bottomSlot
         ? h('div', {
             key: 'bottom',
-            ref: 'bottomWrapper',
+            ref: 'refBottomWrapper',
             class: 'vxe-grid--bottom-wrapper'
         }, bottomSlot.call(_vm, { $grid: _vm }, h))
         : _e();
@@ -257,7 +257,7 @@ function renderPager(h, $xeGrid) {
     if (hasPager) {
         return h('div', {
             key: 'pager',
-            ref: 'pagerWrapper',
+            ref: 'refPagerWrapper',
             class: 'vxe-grid--pager-wrapper'
         }, pagerSlot
             ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
@@ -577,6 +577,7 @@ export default {
         const vSize = $xeGrid.computeSize;
         const styles = $xeGrid.computeStyles;
         return h('div', {
+            ref: 'refElem',
             class: ['vxe-grid', {
                     [`size--${vSize}`]: vSize,
                     'is--animat': !!this.animat,
@@ -599,18 +600,30 @@ export default {
             }
             return [];
         },
-        getParentHeight() {
-            const { $el, isZMax } = this;
-            return (isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
-        },
         /**
          * 获取需要排除的高度
          */
         getExcludeHeight() {
-            const { $refs, $el, isZMax, height } = this;
-            const { formWrapper, toolbarWrapper, topWrapper, bottomWrapper, pagerWrapper } = $refs;
-            const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize($el.parentNode);
-            return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+            const $xeGrid = this;
+            const reactData = $xeGrid;
+            const { isZMax } = reactData;
+            const el = $xeGrid.$refs.refElem;
+            const formWrapper = $xeGrid.$refs.refFormWrapper;
+            const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
+            const topWrapper = $xeGrid.$refs.refTopWrapper;
+            const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
+            const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
+            const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
+            return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+        },
+        getParentHeight() {
+            const $xeGrid = this;
+            const reactData = $xeGrid;
+            const el = $xeGrid.$refs.refElem;
+            if (el) {
+                return (reactData.isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
+            }
+            return 0;
         },
         initToolbar() {
             this.$nextTick(() => {