vxe-table 4.11.18 → 4.11.20

package/lib/index.umd.js

@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.18";
+const version = "4.11.20";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.18"}`;
+const log_version = `table v${"4.11.20"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3962,16 +3962,17 @@ function getRowkey($xeTable) {
   const {
     computeRowOpts
   } = $xeTable.getComputeMaps();
-  const {
-    rowId
-  } = props;
   const rowOpts = computeRowOpts.value;
-  return rowId || rowOpts.keyField || '_X_ROW_KEY';
+  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
 function getRowid($xeTable, row) {
   const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xeTable));
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
+  return encodeRowid(rowid);
+}
+// 编码行主键
+function encodeRowid(rowVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
 }
 const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
   if (fieldOrColumn) {
@@ -3979,6 +3980,13 @@ const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
   }
   return null;
 };
+const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+  if (rowidOrRow) {
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowidOrRow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+    return $xeTable.getRowById(rowid);
+  }
+  return null;
+};
 function getPaddingLeftRightSize(elem) {
   if (elem) {
     const computedStyle = getComputedStyle(elem);
@@ -6375,6 +6383,7 @@ const renderType = 'body';
       tdOns.onDblclick = evnt => {
         $xeTable.triggerCellDblclickEvent(evnt, cellParams);
       };
+      let isMergeCell = false;
       // 合并行或列
       if (mergeList.length) {
         const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -6387,9 +6396,11 @@ const renderType = 'body';
             return null;
           }
           if (rowspan > 1) {
+            isMergeCell = true;
             tdAttrs.rowspan = rowspan;
           }
           if (colspan > 1) {
+            isMergeCell = true;
             tdAttrs.colspan = colspan;
           }
         }
@@ -6424,11 +6435,13 @@ const renderType = 'body';
       const isLastColumn = $columnIndex === columns.length - 1;
       const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
       let isVNPreEmptyStatus = false;
-      if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-        if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-          isVNPreEmptyStatus = true;
-        } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-          isVNPreEmptyStatus = true;
+      if (!isMergeCell) {
+        if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+          if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+            isVNPreEmptyStatus = true;
+          } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+            isVNPreEmptyStatus = true;
+          }
         }
       }
       const tcStyle = {};
@@ -7618,6 +7631,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             cell: evnt.currentTarget
           }, cellParams), evnt);
         };
+        let isMergeCell = false;
         // 合并行或列
         if (mergeFooterList.length) {
           const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -7630,9 +7644,11 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
               return null;
             }
             if (rowspan > 1) {
+              isMergeCell = true;
               attrs.rowspan = rowspan;
             }
             if (colspan > 1) {
+              isMergeCell = true;
               attrs.colspan = colspan;
             }
           }
@@ -7655,8 +7671,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         const isLastColumn = $columnIndex === tableColumn.length - 1;
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-          isVNPreEmptyStatus = true;
+        if (!isMergeCell) {
+          if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+            isVNPreEmptyStatus = true;
+          }
         }
         const tcStyle = {};
         if (hasEllipsis) {
@@ -14168,6 +14186,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     tableMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 重置表格的一切数据状态
        */
@@ -14531,6 +14552,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           keepSource,
           treeConfig
         } = props;
+        const {
+          editStore
+        } = reactData;
         const {
           fullAllDataRowIdData,
           fullDataRowIdData,
@@ -14539,6 +14563,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           tableFullData,
           afterFullData
         } = internalData;
+        const removeTempMaps = {
+          ...editStore.removeMaps
+        };
         const treeOpts = computeTreeOpts.value;
         const {
           transform
@@ -14573,6 +14600,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
                   }
                   if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    delete removeTempMaps[rowid];
                     tableFullData.unshift(row);
                     afterFullData.unshift(row);
                     reDelFlag = true;
@@ -14584,6 +14612,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         if (rows) {
           if (reDelFlag) {
+            editStore.removeMaps = removeTempMaps;
             $xeTable.updateFooter();
             $xeTable.cacheRowMap(false);
             $xeTable.handleTableData(treeConfig && transform);
@@ -14753,10 +14782,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       /**
        * 检查行或列数据是否发生改变
-       * @param {Row} row 行对象
+       * @param {Row} rowOrId 行对象
        * @param {String} field 字段名
        */
-      isUpdateByRow(row, field) {
+      isUpdateByRow(rowOrId, field) {
         const {
           keepSource
         } = props;
@@ -14766,11 +14795,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           sourceDataRowIdData
         } = internalData;
         if (keepSource) {
-          const rowid = getRowid($xeTable, row);
+          const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+          const rowRest = fullDataRowIdData[rowid];
           // 新增的数据不需要检测
-          if (!fullDataRowIdData[rowid]) {
+          if (!rowRest) {
             return false;
           }
+          const row = rowRest.row;
           const oRow = sourceDataRowIdData[rowid];
           if (oRow) {
             if (arguments.length > 1) {
@@ -14834,6 +14865,108 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           tableColumn: reactData.tableColumn.slice(0)
         };
       },
+      /**
+       * 移动列到指定列的位置
+       * @param fieldOrColumn
+       * @param targetFieldOrColumn
+       * @param options
+       */
+      moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+        const {
+          fullColumnIdData,
+          visibleColumn
+        } = internalData;
+        const {
+          dragToChild,
+          dragPos,
+          isCrossDrag
+        } = Object.assign({}, options);
+        const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+        let prevDragCol = null;
+        const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+        let defPos = 'left';
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetFieldOrColumn)) {
+          if (colRest && targetFieldOrColumn) {
+            let currList = colRest.items;
+            let offsetIndex = colRest._index + targetFieldOrColumn;
+            if (isCrossDrag) {
+              currList = visibleColumn;
+              offsetIndex = colRest._index + targetFieldOrColumn;
+            }
+            if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+              prevDragCol = currList[offsetIndex];
+            }
+            if (targetFieldOrColumn > 0) {
+              defPos = 'right';
+            }
+          }
+        } else {
+          prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+          const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+          if (colRest && targetColRest) {
+            if (targetColRest._index > colRest._index) {
+              defPos = 'right';
+            }
+          }
+        }
+        return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+      },
+      /**
+       * 移动行到指定行的位置
+       * @param rowidOrRow
+       * @param targetRowidOrRow
+       * @param options
+       */
+      moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+        const {
+          treeConfig
+        } = props;
+        const {
+          fullAllDataRowIdData,
+          afterFullData
+        } = internalData;
+        const {
+          dragToChild,
+          dragPos,
+          isCrossDrag
+        } = Object.assign({}, options);
+        const treeOpts = computeTreeOpts.value;
+        const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+        let prevDragRow = null;
+        let defPos = 'top';
+        const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowidOrRow)) {
+          if (rowRest && targetRowidOrRow) {
+            let currList = afterFullData;
+            let offsetIndex = rowRest._index + targetRowidOrRow;
+            if (treeConfig) {
+              currList = rowRest.items;
+              if (treeOpts.transform) {
+                offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+                if (isCrossDrag) {
+                  currList = afterFullData;
+                  offsetIndex = rowRest._index + targetRowidOrRow;
+                }
+              }
+            }
+            if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+              prevDragRow = currList[offsetIndex];
+            }
+            if (targetRowidOrRow > 0) {
+              defPos = 'bottom';
+            }
+          }
+        } else {
+          prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+          const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+          if (rowRest && targetRowRest) {
+            if (targetRowRest._index > rowRest._index) {
+              defPos = 'bottom';
+            }
+          }
+        }
+        return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+      },
       /**
        * 获取表格的全量列
        */
@@ -17312,8 +17445,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               // 如果按下了方向键
               if (selected.row && selected.column) {
                 $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                // 当前行按键上下移动
+              }
+              // 当前行按键上下移动
+              if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                 $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
               }
             }
@@ -19603,6 +19737,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -19617,7 +19754,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
             return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
               if (!status) {
-                return;
+                return errRest;
               }
               let oafIndex = -1;
               let nafIndex = -1;
@@ -19648,11 +19785,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                       if (isPeerDrag && !isCrossDrag) {
                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                           // 非同级
-                          return;
+                          return errRest;
                         }
                       } else {
                         if (!isCrossDrag) {
-                          return;
+                          return errRest;
                         }
                         if (oldAllMaps[newRowid]) {
                           isSelfToChildStatus = true;
@@ -19663,19 +19800,19 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                                 content: table_getI18n('vxe.error.treeDragChild')
                               });
                             }
-                            return;
+                            return errRest;
                           }
                         }
                       }
                     } else if (oldLevel) {
                       // 子到根
                       if (!isCrossDrag) {
-                        return;
+                        return errRest;
                       }
                     } else if (newLevel) {
                       // 根到子
                       if (!isCrossDrag) {
-                        return;
+                        return errRest;
                       }
                       if (oldAllMaps[newRowid]) {
                         isSelfToChildStatus = true;
@@ -19686,7 +19823,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                               content: table_getI18n('vxe.error.treeDragChild')
                             });
                           }
-                          return;
+                          return errRest;
                         }
                       }
                     } else {
@@ -19744,26 +19881,34 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               if (reactData.scrollYLoad) {
                 $xeTable.updateScrollYSpace();
               }
-              (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+              if (evnt) {
+                dispatchEvent('row-dragend', {
+                  oldRow: dragRow,
+                  newRow: prevDragRow,
+                  dragRow,
+                  dragPos: prevDragPos,
+                  dragToChild: isDragToChildFlag,
+                  offsetIndex: dragOffsetIndex,
+                  _index: {
+                    newIndex: nafIndex,
+                    oldIndex: oafIndex
+                  }
+                }, evnt);
+              }
+              return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
                 $xeTable.updateCellAreas();
                 $xeTable.recalculate();
+              }).then(() => {
+                return {
+                  status: true
+                };
               });
-              dispatchEvent('row-dragend', {
-                oldRow: dragRow,
-                newRow: prevDragRow,
-                dragRow,
-                dragPos: prevDragPos,
-                dragToChild: isDragToChildFlag,
-                offsetIndex: dragOffsetIndex,
-                _index: {
-                  newIndex: nafIndex,
-                  oldIndex: oafIndex
-                }
-              }, evnt);
-            }).catch(() => {});
+            }).catch(() => {
+              return errRest;
+            });
           }
         }
-        return Promise.resolve();
+        return Promise.resolve(errRest);
       },
       handleRowDragDragendEvent(evnt) {
         const {
@@ -19931,6 +20076,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           collectColumn
         } = internalData;
         const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragCol && dragCol) {
           // 判断是否有拖动
           if (prevDragCol !== dragCol) {
@@ -19947,7 +20095,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
             return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
               if (!status) {
-                return;
+                return errRest;
               }
               let oafIndex = -1;
               let nafIndex = -1;
@@ -19961,11 +20109,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 if (isPeerDrag && !isCrossDrag) {
                   if (dragColumn.parentId !== newColumn.parentId) {
                     // 非同级
-                    return;
+                    return errRest;
                   }
                 } else {
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newColumn.id]) {
                     isSelfToChildStatus = true;
@@ -19976,19 +20124,19 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                           content: table_getI18n('vxe.error.treeDragChild')
                         });
                       }
-                      return;
+                      return errRest;
                     }
                   }
                 }
               } else if (dragColumn.parentId) {
                 // 子到根
                 if (!isCrossDrag) {
-                  return;
+                  return errRest;
                 }
               } else if (newColumn.parentId) {
                 // 根到子
                 if (!isCrossDrag) {
-                  return;
+                  return errRest;
                 }
                 if (oldAllMaps[newColumn.id]) {
                   isSelfToChildStatus = true;
@@ -19999,7 +20147,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                         content: table_getI18n('vxe.error.treeDragChild')
                       });
                     }
-                    return;
+                    return errRest;
                   }
                 }
               } else {
@@ -20068,25 +20216,32 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                   $xeTable.clearCopyCellArea();
                 }
               }
-              dispatchEvent('column-dragend', {
-                oldColumn: dragColumn,
-                newColumn,
-                dragColumn,
-                dragPos: prevDragPos,
-                dragToChild: isDragToChildFlag,
-                offsetIndex: dragOffsetIndex,
-                _index: {
-                  newIndex: nafIndex,
-                  oldIndex: oafIndex
-                }
-              }, evnt);
+              if (evnt) {
+                dispatchEvent('column-dragend', {
+                  oldColumn: dragColumn,
+                  newColumn,
+                  dragColumn,
+                  dragPos: prevDragPos,
+                  dragToChild: isDragToChildFlag,
+                  offsetIndex: dragOffsetIndex,
+                  _index: {
+                    newIndex: nafIndex,
+                    oldIndex: oafIndex
+                  }
+                }, evnt);
+              }
               if (isSyncColumn) {
                 $xeTable.handleColDragSwapColumn();
               }
-            }).catch(() => {});
+              return {
+                status: true
+              };
+            }).catch(() => {
+              return errRest;
+            });
           }
         }
-        return Promise.resolve();
+        return Promise.resolve(errRest);
       },
       handleHeaderCellDragDragendEvent(evnt) {
         const {
@@ -26357,7 +26512,6 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
         const treeOpts = computeTreeOpts.value;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let targetRow;
-        evnt.preventDefault();
         if (currentRow) {
           if (treeConfig) {
             const {
@@ -26383,6 +26537,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           targetRow = afterFullData[0];
         }
         if (targetRow) {
+          evnt.preventDefault();
           const params = {
             $table: $xeTable,
             row: targetRow,
@@ -26392,6 +26547,36 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           $xeTable.scrollToRow(targetRow).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
         }
       },
+      // 处理当前列方向键移动
+      moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
+        const {
+          currentColumn
+        } = reactData;
+        const {
+          visibleColumn
+        } = internalData;
+        let targetCol = null;
+        if (currentColumn) {
+          const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+          if (isLeftArrow && _columnIndex > 0) {
+            targetCol = visibleColumn[_columnIndex - 1];
+          } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+            targetCol = visibleColumn[_columnIndex + 1];
+          }
+        } else {
+          targetCol = visibleColumn[0];
+        }
+        if (targetCol) {
+          evnt.preventDefault();
+          const params = {
+            $table: $xeTable,
+            column: targetCol,
+            columnIndex: $xeTable.getColumnIndex(targetCol),
+            $columnIndex: $xeTable.getVMColumnIndex(targetCol)
+          };
+          $xeTable.scrollToColumn(targetCol).then(() => $xeTable.triggerCurrentColumnEvent(evnt, params));
+        }
+      },
       // 处理可编辑方向键移动
       moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
         const {
@@ -29369,7 +29554,7 @@ const {
   renderEmptyElement: grid_renderEmptyElement
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(src_props);
-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 = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
@@ -29843,6 +30028,23 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       }
       return null;
     };
+    const getConfigSlot = slotConfigs => {
+      const slotConf = {};
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectMap(slotConfigs, (slotFunc, slotKey) => {
+        if (slotFunc) {
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(slotFunc)) {
+            if (slots[slotFunc]) {
+              slotConf[slotKey] = slots[slotFunc];
+            } else {
+              errLog('vxe.error.notSlot', [slotFunc]);
+            }
+          } else {
+            slotConf[slotKey] = slotFunc;
+          }
+        }
+      });
+      return slotConf;
+    };
     /**
      * 渲染表单
      */
@@ -30056,43 +30258,22 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       } = 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((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIPagerComponent, {
-              ref: refPager,
-              ...pagerOpts,
-              ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {}),
-              onPageChange: pageChangeEvent
-            }, pagerSlots));
-          }
-        }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           ref: refPagerWrapper,
           key: 'pager',
           class: 'vxe-grid--pager-wrapper'
-        }, slotVNs);
+        }, pagerSlot ? pagerSlot({
+          $grid: $xeGrid
+        }) : [VxeUIPagerComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIPagerComponent, {
+          ref: refPager,
+          ...pagerOpts,
+          ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {}),
+          onPageChange: pageChangeEvent
+        }, getConfigSlot(pagerOpts.slots)) : grid_renderEmptyElement($xeGrid)]);
       }
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
+      return grid_renderEmptyElement($xeGrid);
     };
     const renderChildLayout = layoutKeys => {
       const childVNs = [];
@@ -30218,6 +30399,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     };
     const gridMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 提交指令，支持 code 或 button
        * @param {String/Object} code 字符串或对象
@@ -30757,18 +30941,23 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           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 : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - gridPrivateMethods.getExcludeHeight();
+          const parentEl = el.parentElement;
+          return (reactData.isZMax ? getDomNode().visibleHeight : parentEl ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentEl).height) : 0) - gridPrivateMethods.getExcludeHeight();
         }
         return 0;
       },