vxe-table 3.24.3 → 3.25.0-beta.0

package/es/grid/src/grid.js

@@ -1,13 +1,13 @@
 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';
 import { tableProps } from '../../table/src/props';
-import VxeTableComponent from '../../table/src/table';
-import VxeToolbarComponent from '../../toolbar/src/toolbar';
+import VxeTableComponent from '../../table';
+import VxeToolbarComponent from '../../toolbar';
 const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, globalEvents, globalMixins, createEvent, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableMethods = {};
@@ -123,6 +123,11 @@ export default {
             const props = $xeGrid;
             return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
         },
+        computePagerProps() {
+            const $xeGrid = this;
+            const pagerOpts = $xeGrid.computePagerOpts;
+            return Object.assign({}, pagerOpts, { enabled: undefined, slots: undefined });
+        },
         formOpts() {
             const $xeGrid = this;
             return $xeGrid.computeFormOpts;
@@ -392,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;
@@ -1142,7 +1160,7 @@ export default {
             if ($form) {
                 return $form.validate();
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         validateFormField(field) {
             const $xeGrid = this;
@@ -1150,7 +1168,7 @@ export default {
             if ($form) {
                 return $form.validateField(field);
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         clearFormValidate(field) {
             const $xeGrid = this;
@@ -1749,6 +1767,7 @@ export default {
             const { proxyConfig, pagerConfig } = props;
             const proxyOpts = $xeGrid.computeProxyOpts;
             const pagerOpts = $xeGrid.computePagerOpts;
+            const pagerProps = $xeGrid.computePagerProps;
             const pagerSlot = slots.pager;
             if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
                 return h('div', {
@@ -1761,7 +1780,7 @@ export default {
                         VxeUIPagerComponent
                             ? h(VxeUIPagerComponent, {
                                 ref: 'refPager',
-                                props: Object.assign(Object.assign({}, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
+                                props: Object.assign(Object.assign({}, pagerProps), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
                                 on: {
                                     'page-change': $xeGrid.pageChangeEvent
                                 },