vxe-table 4.11.18 → 4.11.20

package/es/grid/src/grid.js

@@ -11,7 +11,7 @@ import { getSlotVNs } from '../../ui/src/vn';
 import { errLog } from '../../ui/src/log';
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableComponentProps);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [
     ...tableComponentEmits,
     'page-change',
@@ -417,6 +417,25 @@ export default defineComponent({
             }
             return null;
         };
+        const getConfigSlot = (slotConfigs) => {
+            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;
+        };
         /**
          * 渲染表单
          */
@@ -593,37 +612,21 @@ export default defineComponent({
             const { proxyConfig, pagerConfig } = props;
             const proxyOpts = computeProxyOpts.value;
             const pagerOpts = computePagerOpts.value;
+            const pagerSlot = slots.pager;
             if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
-                let slotVNs = [];
-                if (slots.pager) {
-                    slotVNs = slots.pager({ $grid: $xeGrid });
-                }
-                else {
-                    const pagerOptSlots = pagerOpts.slots;
-                    const pagerSlots = {};
-                    let leftSlot;
-                    let rightSlot;
-                    if (pagerOptSlots) {
-                        leftSlot = getFuncSlot(pagerOptSlots, 'left');
-                        rightSlot = getFuncSlot(pagerOptSlots, 'right');
-                        if (leftSlot) {
-                            pagerSlots.left = leftSlot;
-                        }
-                        if (rightSlot) {
-                            pagerSlots.right = rightSlot;
-                        }
-                    }
-                    if (VxeUIPagerComponent) {
-                        slotVNs.push(h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), pagerSlots));
-                    }
-                }
                 return h('div', {
                     ref: refPagerWrapper,
                     key: 'pager',
                     class: 'vxe-grid--pager-wrapper'
-                }, slotVNs);
+                }, pagerSlot
+                    ? pagerSlot({ $grid: $xeGrid })
+                    : [
+                        VxeUIPagerComponent
+                            ? h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), getConfigSlot(pagerOpts.slots))
+                            : renderEmptyElement($xeGrid)
+                    ]);
             }
-            return createCommentVNode();
+            return renderEmptyElement($xeGrid);
         };
         const renderChildLayout = (layoutKeys) => {
             const childVNs = [];
@@ -745,6 +748,9 @@ export default defineComponent({
         };
         const gridMethods = {
             dispatchEvent,
+            getEl() {
+                return refElem.value;
+            },
             /**
              * 提交指令，支持 code 或 button
              * @param {String/Object} code 字符串或对象
@@ -1174,18 +1180,23 @@ export default defineComponent({
             getExcludeHeight() {
                 const { isZMax } = reactData;
                 const el = refElem.value;
-                const formWrapper = refFormWrapper.value;
-                const toolbarWrapper = refToolbarWrapper.value;
-                const topWrapper = refTopWrapper.value;
-                const bottomWrapper = refBottomWrapper.value;
-                const pagerWrapper = refPagerWrapper.value;
-                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 = refFormWrapper.value;
+                    const toolbarWrapper = refToolbarWrapper.value;
+                    const topWrapper = refTopWrapper.value;
+                    const bottomWrapper = refBottomWrapper.value;
+                    const pagerWrapper = refPagerWrapper.value;
+                    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 el = refElem.value;
                 if (el) {
-                    return (reactData.isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle(el.parentNode).height)) - gridPrivateMethods.getExcludeHeight();
+                    const parentEl = el.parentElement;
+                    return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - gridPrivateMethods.getExcludeHeight();
                 }
                 return 0;
             },