vxe-table 3.24.4 → 3.25.0-beta.0

package/es/grid/src/grid.js

@@ -1,7 +1,7 @@
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
-import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit } from '../../ui/src/dom';
+import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit, hasClass } from '../../ui/src/dom';
 import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
@@ -397,12 +397,25 @@ export default {
             }
             return 0;
         },
+        getParentElem() {
+            const $xeGrid = this;
+            const el = $xeGrid.$refs.refElem;
+            if (!el) {
+                return null;
+            }
+            let parentEl = el.parentElement;
+            // 如果是虚拟滚动条
+            if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
+                parentEl = parentEl.parentElement;
+            }
+            return parentEl;
+        },
         getParentHeight() {
             const $xeGrid = this;
             const reactData = $xeGrid.reactData;
             const el = $xeGrid.$refs.refElem;
             if (el) {
-                const parentEl = el.parentElement;
+                const parentEl = $xeGrid.getParentElem();
                 return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - $xeGrid.getExcludeHeight();
             }
             return 0;