vxe-table 3.13.20 → 3.13.22

package/es/grid/src/grid.js

@@ -75,6 +75,26 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
     }
     return null;
 }
+const getConfigSlot = ($xeGrid, slotConfigs) => {
+    const slots = $xeGrid.$scopedSlots;
+    const slotConf = {};
+    XEUtils.objectMap(slotConfigs, (slotFunc, slotKey) => {
+        if (slotFunc) {
+            if (XEUtils.isString(slotFunc)) {
+                if (slots[slotFunc]) {
+                    slotConf[slotKey] = slots[slotFunc];
+                }
+                else {
+                    errLog('vxe.error.notSlot', [slotFunc]);
+                }
+            }
+            else {
+                slotConf[slotKey] = slotFunc;
+            }
+        }
+    });
+    return slotConf;
+};
 function getToolbarSlots(_vm) {
     const { $scopedSlots, toolbarOpts } = _vm;
     const toolbarOptSlots = toolbarOpts.slots;
@@ -101,24 +121,6 @@ function getToolbarSlots(_vm) {
     }
     return slots;
 }
-function getPagerSlots(_vm) {
-    const { pagerOpts } = _vm;
-    const pagerOptSlots = pagerOpts.slots;
-    const slots = {};
-    let leftSlot;
-    let rightSlot;
-    if (pagerOptSlots) {
-        leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left');
-        rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right');
-        if (leftSlot) {
-            slots.left = leftSlot;
-        }
-        if (rightSlot) {
-            slots.right = rightSlot;
-        }
-    }
-    return slots;
-}
 function getTableOns(_vm) {
     const { $listeners, proxyConfig, proxyOpts } = _vm;
     const ons = {};
@@ -137,6 +139,22 @@ function getTableOns(_vm) {
     }
     return ons;
 }
+function pageChangeEvent($xeGrid, params) {
+    const props = $xeGrid;
+    const reactData = $xeGrid;
+    const { proxyConfig } = props;
+    const { tablePage } = reactData;
+    const { $event, currentPage, pageSize } = params;
+    const proxyOpts = $xeGrid.computeProxyOpts;
+    tablePage.currentPage = currentPage;
+    tablePage.pageSize = pageSize;
+    $xeGrid.dispatchEvent('page-change', params, $event);
+    if (proxyConfig && isEnableConf(proxyOpts)) {
+        $xeGrid.commitProxy('query').then((rest) => {
+            $xeGrid.dispatchEvent('proxy-query', rest, $event);
+        });
+    }
+}
 /**
  * 渲染表单
  */
@@ -248,25 +266,30 @@ function renderBottom(h, _vm) {
 function renderPager(h, $xeGrid) {
     const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
     const props = $xeGrid;
-    const { pagerConfig, proxyConfig } = props;
-    const { $scopedSlots, tablePage } = $xeGrid;
-    const pagerSlot = $scopedSlots.pager;
-    const hasPager = !!(pagerSlot || isEnableConf(pagerConfig));
-    if (hasPager) {
+    const slots = $xeGrid.$scopedSlots;
+    const reactData = $xeGrid;
+    const { proxyConfig, pagerConfig } = props;
+    const proxyOpts = $xeGrid.computeProxyOpts;
+    const pagerOpts = $xeGrid.computePagerOpts;
+    const pagerSlot = slots.pager;
+    if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
         return h('div', {
-            key: 'pager',
             ref: 'refPagerWrapper',
+            key: 'pager',
             class: 'vxe-grid--pager-wrapper'
         }, pagerSlot
-            ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
+            ? pagerSlot.call($xeGrid, { $grid: $xeGrid })
             : [
                 VxeUIPagerComponent
                     ? h(VxeUIPagerComponent, {
-                        props: Object.assign(Object.assign({}, $xeGrid.pagerOpts), (proxyConfig ? tablePage : {})),
+                        ref: 'refPager',
+                        props: Object.assign(Object.assign({}, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
                         on: {
-                            'page-change': $xeGrid.pageChangeEvent
+                            'page-change'(params) {
+                                pageChangeEvent($xeGrid, params);
+                            }
                         },
-                        scopedSlots: getPagerSlots($xeGrid)
+                        scopedSlots: getConfigSlot($xeGrid, pagerOpts.slots)
                     })
                     : renderEmptyElement($xeGrid)
             ]);
@@ -606,20 +629,25 @@ export default {
             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);
+            if (el) {
+                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 parentEl = el.parentElement;
+                const parentPaddingSize = isZMax ? 0 : (parentEl ? getPaddingTopBottomSize(parentEl) : 0);
+                return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+            }
+            return 0;
         },
         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();
+                const parentEl = el.parentElement;
+                return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - $xeGrid.getExcludeHeight();
             }
             return 0;
         },
@@ -1090,18 +1118,6 @@ export default {
                 }
             }
         },
-        pageChangeEvent(params) {
-            const { proxyConfig, tablePage } = this;
-            const { currentPage, pageSize } = params;
-            tablePage.currentPage = currentPage;
-            tablePage.pageSize = pageSize;
-            this.$emit('page-change', Object.assign({ $grid: this }, params));
-            if (proxyConfig) {
-                this.commitProxy('query').then((rest) => {
-                    this.$emit('proxy-query', Object.assign(Object.assign({}, rest), { $grid: this, $event: params.$event }));
-                });
-            }
-        },
         sortChangeEvent(params) {
             const { $table, column, sortList } = params;
             const isRemote = XEUtils.isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote;