vxe-table 4.9.26 → 4.9.28

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.26";
+const version = "4.9.28";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2409,7 +2409,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.26"}`;
+const log_version = `table v${"4.9.28"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3405,21 +3405,26 @@ function renderCellDragIcon(params) {
   const rowDragOpts = computeRowDragOpts.value;
   const {
     icon,
+    trigger,
     disabledMethod
   } = rowDragOpts;
   const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
   const isDisabled = rDisabledMethod && rDisabledMethod(params);
+  const ons = {};
+  if (trigger !== 'cell') {
+    ons.onMousedown = evnt => {
+      if (!isDisabled) {
+        $table.handleCellDragMousedownEvent(evnt, params);
+      }
+    };
+    ons.onMouseup = $table.handleCellDragMouseupEvent;
+  }
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
     key: 'dg',
     class: ['vxe-cell--drag-handle', {
       'is--disabled': isDisabled
     }],
-    onMousedown(evnt) {
-      if (!isDisabled) {
-        $table.handleCellDragMousedownEvent(evnt, params);
-      }
-    },
-    onMouseup: $table.handleCellDragMouseupEvent
+    ...ons
   }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
     class: icon || (dragConfig ? dragConfig.rowIcon : '') || cell_getIcon().TABLE_DRAG_ROW
   })]);
@@ -3476,24 +3481,29 @@ function renderHeaderCellDragIcon(params) {
   const {
     showIcon,
     icon,
+    trigger,
     isCrossDrag,
     visibleMethod,
     disabledMethod
   } = columnDragOpts;
-  const isDisabled = disabledMethod && disabledMethod(params);
   if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
     if (!column.fixed && (isCrossDrag || !column.parentId)) {
+      const isDisabled = disabledMethod && disabledMethod(params);
+      const ons = {};
+      if (trigger !== 'cell') {
+        ons.onMousedown = evnt => {
+          if (!isDisabled) {
+            $table.handleHeaderCellDragMousedownEvent(evnt, params);
+          }
+        };
+        ons.onMouseup = $table.handleHeaderCellDragMouseupEvent;
+      }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         key: 'dg',
         class: ['vxe-cell--drag-handle', {
           'is--disabled': isDisabled
         }],
-        onMousedown(evnt) {
-          if (!isDisabled) {
-            $table.handleHeaderCellDragMousedownEvent(evnt, params);
-          }
-        },
-        onMouseup: $table.handleHeaderCellDragMouseupEvent
+        ...ons
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: icon || cell_getIcon().TABLE_DRAG_COLUMN
       })]);
@@ -4882,7 +4892,8 @@ const lineOffsetSizes = {
       computeCellOpts,
       computeValidOpts,
       computeRowOpts,
-      computeColumnOpts
+      computeColumnOpts,
+      computeRowDragOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refBodyTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -5019,6 +5030,10 @@ const lineOffsetSizes = {
       const editOpts = computeEditOpts.value;
       const tooltipOpts = computeTooltipOpts.value;
       const rowOpts = computeRowOpts.value;
+      const rowDragOpts = computeRowDragOpts.value;
+      const {
+        disabledMethod: dragDisabledMethod
+      } = rowDragOpts;
       const sYOpts = computeSYOpts.value;
       const columnOpts = computeColumnOpts.value;
       const mouseOpts = computeMouseOpts.value;
@@ -5095,6 +5110,14 @@ const lineOffsetSizes = {
         data: tableData,
         items
       };
+      let isColDragCell = false;
+      let isDisabledDrag = false;
+      if (rowOpts.drag) {
+        isColDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
+      }
+      if (isColDragCell) {
+        isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+      }
       // hover 进入事件
       if (showTitle || showTooltip || showAllTip || tooltipConfig) {
         tdOns.onMouseenter = evnt => {
@@ -5127,7 +5150,7 @@ const lineOffsetSizes = {
         };
       }
       // 按下事件处理
-      if (checkboxOpts.range || mouseConfig) {
+      if (isColDragCell || checkboxOpts.range || mouseConfig) {
         tdOns.onMousedown = evnt => {
           $xeTable.triggerCellMousedownEvent(evnt, params);
         };
@@ -5254,6 +5277,8 @@ const lineOffsetSizes = {
           'col--edit': isEdit,
           'col--ellipsis': hasEllipsis,
           'fixed--hidden': fixedHiddenColumn,
+          'is--drag-cell': isColDragCell,
+          'is--drag-disabled': isDisabledDrag,
           'col--dirty': isDirty,
           'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
           'col--valid-error': !!errorValidItem,
@@ -5286,7 +5311,6 @@ const lineOffsetSizes = {
         expandColumn,
         selectRadioRow,
         pendingRowMaps,
-        pendingRowList,
         isDragColMove
       } = tableReactData;
       const {
@@ -5380,7 +5404,7 @@ const lineOffsetSizes = {
           'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
           'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
           'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-          'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
+          'row--pending': !!pendingRowMaps[rowid]
         }, getPropClass(rowClassName, params)];
         const tdVNs = tableColumn.map((column, $columnIndex) => {
           return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
@@ -5886,6 +5910,7 @@ const header_renderType = 'header';
     } = $xeTable.getRefMaps();
     const {
       computeColumnOpts,
+      computeColumnDragOpts,
       computeResizableOpts
     } = $xeTable.getComputeMaps();
     const headerColumn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)([]);
@@ -6051,6 +6076,10 @@ const header_renderType = 'header';
         scrollbarWidth
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
+      const columnDragOpts = computeColumnDragOpts.value;
+      const {
+        disabledMethod: dragDisabledMethod
+      } = columnDragOpts;
       return cols.map((column, $columnIndex) => {
         const {
           type,
@@ -6088,6 +6117,11 @@ const header_renderType = 'header';
           isHidden: fixedHiddenColumn,
           hasFilter
         };
+        const thAttrs = {
+          colid,
+          colspan: column.colSpan > 1 ? column.colSpan : null,
+          rowspan: column.rowSpan > 1 ? column.rowSpan : null
+        };
         const thOns = {
           onClick: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
           onDblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
@@ -6096,15 +6130,23 @@ const header_renderType = 'header';
         if (scrollXLoad && !hasEllipsis) {
           showEllipsis = hasEllipsis = true;
         }
+        const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
+        let isDisabledDrag = false;
+        if (isColDragCell) {
+          isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+        }
         // 按下事件处理
-        if (mouseConfig) {
+        if (mouseConfig || isColDragCell) {
           thOns.onMousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
         }
-        // 拖拽行事件
+        // 拖拽列事件
         if (columnOpts.drag) {
           thOns.onDragstart = $xeTable.handleHeaderCellDragDragstartEvent;
           thOns.onDragend = $xeTable.handleHeaderCellDragDragendEvent;
           thOns.onDragover = $xeTable.handleHeaderCellDragDragoverEvent;
+          if (isColDragCell) {
+            thOns.onMouseup = $xeTable.handleHeaderCellDragMouseupEvent;
+          }
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
           class: ['vxe-header--column', colid, {
@@ -6118,12 +6160,11 @@ const header_renderType = 'header';
             'is--sortable': column.sortable,
             'col--filter': !!column.filters,
             'is--filter-active': hasFilter,
+            'is--drag-disabled': isDisabledDrag,
             'col--current': currentColumn === column
           }, headerClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerClassName) ? headerClassName(params) : headerClassName : '', headerCellClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName : ''],
-          colid,
-          colspan: column.colSpan > 1 ? column.colSpan : null,
-          rowspan: column.rowSpan > 1 ? column.rowSpan : null,
           style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
+          ...thAttrs,
           ...thOns,
           key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -9122,8 +9163,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       reColumnFlag: 0,
       // 已标记的对象集
       pendingRowMaps: {},
-      // 已标记的行
-      pendingRowList: [],
       // 初始化标识
       initStore: {
         filter: false,
@@ -12708,7 +12747,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       loadData(datas) {
         const {
-          inited,
           initStatus
         } = internalData;
         return loadTableData(datas).then(() => {
@@ -12717,9 +12755,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (!initStatus) {
             handleLoadDefaults();
           }
-          if (!inited) {
-            handleInitDefaults();
-          }
           return tableMethods.recalculate();
         });
       },
@@ -12728,18 +12763,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * @param {Array} datas 数据
        */
       reloadData(datas) {
-        const {
-          inited
-        } = internalData;
         return tableMethods.clearAll().then(() => {
           internalData.inited = true;
           internalData.initStatus = true;
           return loadTableData(datas);
         }).then(() => {
           handleLoadDefaults();
-          if (!inited) {
-            handleInitDefaults();
-          }
           return tableMethods.recalculate();
         });
       },
@@ -14147,10 +14176,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       setPendingRow(rows, status) {
-        const pendingMaps = {
-          ...reactData.pendingRowMaps
-        };
-        const pendingList = [...reactData.pendingRowList];
+        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
         if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
           rows = [rows];
         }
@@ -14158,7 +14184,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           rows.forEach(row => {
             const rowid = getRowid($xeTable, row);
             if (rowid && !pendingMaps[rowid]) {
-              pendingList.push(row);
               pendingMaps[rowid] = row;
             }
           });
@@ -14166,23 +14191,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           rows.forEach(row => {
             const rowid = getRowid($xeTable, row);
             if (rowid && pendingMaps[rowid]) {
-              const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-              if (pendingIndex > -1) {
-                pendingList.splice(pendingIndex, 1);
-              }
               delete pendingMaps[rowid];
             }
           });
         }
         reactData.pendingRowMaps = pendingMaps;
-        reactData.pendingRowList = pendingList;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       togglePendingRow(rows) {
-        const pendingMaps = {
-          ...reactData.pendingRowMaps
-        };
-        const pendingList = [...reactData.pendingRowList];
+        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
         if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
           rows = [rows];
         }
@@ -14190,19 +14207,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const rowid = getRowid($xeTable, row);
           if (rowid) {
             if (pendingMaps[rowid]) {
-              const pendingIndex = $xeTable.findRowIndexOf(pendingList, row);
-              if (pendingIndex > -1) {
-                pendingList.splice(pendingIndex, 1);
-              }
               delete pendingMaps[rowid];
             } else {
-              pendingList.push(row);
               pendingMaps[rowid] = row;
             }
           }
         });
         reactData.pendingRowMaps = pendingMaps;
-        reactData.pendingRowList = pendingList;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       hasPendingByRow(row) {
@@ -14217,13 +14228,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       getPendingRecords() {
         const {
-          pendingRowList
+          pendingRowMaps
         } = reactData;
-        return pendingRowList.slice(0);
+        const {
+          fullAllDataRowIdData
+        } = internalData;
+        const insertRecords = [];
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(pendingRowMaps, (row, rowid) => {
+          if (fullAllDataRowIdData[rowid]) {
+            insertRecords.push(row);
+          }
+        });
+        return insertRecords;
       },
       clearPendingRow() {
         reactData.pendingRowMaps = {};
-        reactData.pendingRowList = [];
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       sort(sortConfs, sortOrder) {
@@ -16984,6 +17003,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             }
           }
         }
+        // 如果是双击编辑模式
+        if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
+          if (actived.row && actived.column) {
+            if (editOpts.mode === 'row') {
+              if (!$xeTable.eqRow(actived.row, row)) {
+                $xeTable.handleClearEdit(evnt);
+              }
+            } else if (editOpts.mode === 'cell') {
+              if (!$xeTable.eqRow(actived.row, row) || actived.column.id !== column.id) {
+                $xeTable.handleClearEdit(evnt);
+              }
+            }
+          }
+        }
         dispatchEvent('cell-click', params, evnt);
       },
       /**
@@ -17303,6 +17336,91 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           $xeTable.handleColumnSortEvent(evnt, column);
         }
       },
+      /**
+       * 表头单元格按下事件
+       */
+      triggerHeaderCellMousedownEvent(evnt, params) {
+        const {
+          mouseConfig
+        } = props;
+        const mouseOpts = computeMouseOpts.value;
+        const columnOpts = computeColumnOpts.value;
+        const columnDragOpts = computeColumnDragOpts.value;
+        const {
+          trigger,
+          disabledMethod
+        } = columnDragOpts;
+        const cell = evnt.currentTarget;
+        const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+        const triggerCheckbox = getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
+        const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
+        const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
+        let triggerDrag = false;
+        if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
+          if (columnOpts.drag && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+            triggerDrag = true;
+            $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
+          }
+        }
+        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
+          $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
+            cell,
+            triggerSort,
+            triggerFilter
+          }, params));
+        }
+        $xeTable.focus();
+        if ($xeTable.closeMenu) {
+          $xeTable.closeMenu();
+        }
+      },
+      /**
+       * 单元格按下事件
+       */
+      triggerCellMousedownEvent(evnt, params) {
+        const {
+          column
+        } = params;
+        const {
+          type,
+          treeNode
+        } = column;
+        const isRadioType = type === 'radio';
+        const isCheckboxType = type === 'checkbox';
+        const isExpandType = type === 'expand';
+        const rowOpts = computeRowOpts.value;
+        const rowDragOpts = computeRowDragOpts.value;
+        const {
+          trigger,
+          disabledMethod
+        } = rowDragOpts;
+        const cell = evnt.currentTarget;
+        params.cell = cell;
+        const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+        const triggerRadio = isRadioType && getEventTargetNode(evnt, cell, 'vxe-cell--radio').flag;
+        const triggerCheckbox = isCheckboxType && getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag;
+        const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+        const triggerExpandNode = isExpandType && getEventTargetNode(evnt, cell, 'vxe-table--expanded').flag;
+        let isColDragCell = false;
+        if (rowOpts.drag) {
+          isColDragCell = trigger === 'row' || column.dragSort && trigger === 'cell';
+        }
+        let triggerDrag = false;
+        if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
+          if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+            triggerDrag = true;
+            $xeTable.handleCellDragMousedownEvent(evnt, params);
+          }
+        }
+        if (!triggerDrag && $xeTable.handleCellMousedownEvent) {
+          $xeTable.handleCellMousedownEvent(evnt, params);
+        }
+        $xeTable.focus();
+        $xeTable.closeFilter();
+        if ($xeTable.closeMenu) {
+          $xeTable.closeMenu();
+        }
+      },
       /**
        * 行拖拽
        */
@@ -17552,21 +17670,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       handleCellDragMousedownEvent(evnt, params) {
+        evnt.stopPropagation();
         const {
           dragConfig
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
+          trigger,
           dragStartMethod
         } = rowDragOpts;
         const {
           row
         } = params;
         const dragEl = evnt.currentTarget;
-        const tdEl = dragEl.parentElement?.parentElement;
+        const tdEl = trigger === 'cell' || trigger === 'row' ? dragEl : dragEl.parentElement?.parentElement;
         const trEl = tdEl.parentElement;
         const dStartMethod = dragStartMethod || (dragConfig ? dragConfig.dragStartMethod : null);
-        reactData.isDragRowMove = false;
         clearRowDropOrigin();
         if (dStartMethod && !dStartMethod(params)) {
           trEl.draggable = false;
@@ -17820,15 +17939,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       handleHeaderCellDragMousedownEvent(evnt, params) {
+        evnt.stopPropagation();
         const columnDragOpts = computeColumnDragOpts.value;
         const {
+          trigger,
           dragStartMethod
         } = columnDragOpts;
         const {
           column
         } = params;
         const dragEl = evnt.currentTarget;
-        const thEl = dragEl.parentElement?.parentElement;
+        const thEl = trigger === 'cell' ? dragEl : dragEl.parentElement?.parentElement;
         reactData.isDragColMove = false;
         clearColDropOrigin();
         if (dragStartMethod && !dragStartMethod(params)) {
@@ -17917,6 +18038,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           internalData.lastScrollTop = scrollTop;
         }
+        reactData.isDragColMove = false;
+        reactData.isDragRowMove = false;
         reactData.lastScrollTime = Date.now();
         const evntParams = {
           scrollTop,
@@ -18425,6 +18548,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const resizableOpts = computeResizableOpts.value;
       const isArea = mouseConfig && mouseOpts.area;
       const tableStyle = computeTableStyle.value;
+      const columnDragOpts = computeColumnDragOpts.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -18441,6 +18565,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           'column--highlight': columnOpts.isHover || highlightHoverColumn,
           'checkbox--range': checkboxOpts.range,
           'column--calc': isCalcColumn,
+          'col--drag-cell': columnOpts.drag && columnDragOpts.trigger === 'cell',
           'is--header': showHeader,
           'is--footer': showFooter,
           'is--group': isGroup,
@@ -18661,7 +18786,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(dataFlag, () => {
       const {
-        inited,
         initStatus
       } = internalData;
       loadTableData(props.data || []).then(() => {
@@ -18675,9 +18799,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (!initStatus) {
           handleLoadDefaults();
         }
-        if (!inited) {
-          handleInitDefaults();
-        }
         if (true) {
           // const checkboxOpts = computeCheckboxOpts.value
           // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')
@@ -18953,7 +19074,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (props.editRules && !$xeTable.validate) {
             errLog('vxe.error.reqModule', ['Validator']);
           }
-          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
+          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
             errLog('vxe.error.reqModule', ['Keyboard']);
           }
           if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
@@ -18976,8 +19097,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             internalData.inited = true;
             internalData.initStatus = true;
             handleLoadDefaults();
-            handleInitDefaults();
           }
+          handleInitDefaults();
           updateStyle();
         });
         if (props.autoResize) {
@@ -19021,7 +19142,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         $table: $xeTable
       });
     });
-    window.aaaa = $xeTable;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {
       if (resizeObserver) {
         resizeObserver.disconnect();
@@ -20441,9 +20561,10 @@ edit_hook_hooks.add('tableEditModule', {
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const {
           actived,
-          removeMaps,
-          insertMaps
+          removeMaps
         } = editStore;
+        const insertDataRowMaps = Object.assign({}, editStore.insertMaps);
+        const pendingDataRowMaps = Object.assign({}, reactData.pendingRowMaps);
         const {
           checkField
         } = checkboxOpts;
@@ -20535,10 +20656,15 @@ edit_hook_hooks.add('tableEditModule', {
         // 从新增中移除已删除的数据
         rows.forEach(row => {
           const rowid = getRowid($xeTable, row);
-          if (insertMaps[rowid]) {
-            delete insertMaps[rowid];
+          if (insertDataRowMaps[rowid]) {
+            delete insertDataRowMaps[rowid];
+          }
+          if (pendingDataRowMaps[rowid]) {
+            delete pendingDataRowMaps[rowid];
           }
         });
+        editStore.insertMaps = insertDataRowMaps;
+        reactData.pendingRowMaps = pendingDataRowMaps;
         $xeTable.updateFooter();
         $xeTable.cacheRowMap();
         $xeTable.handleTableData(treeConfig && transform);
@@ -23216,42 +23342,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           $xeTable.handleSelected(params, evnt);
         });
       },
-      /**
-       * 表头单元格按下事件
-       */
-      triggerHeaderCellMousedownEvent(evnt, params) {
-        const {
-          mouseConfig
-        } = props;
-        const mouseOpts = computeMouseOpts.value;
-        if (mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
-          const cell = evnt.currentTarget;
-          const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
-          const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
-          $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
-            cell,
-            triggerSort,
-            triggerFilter
-          }, params));
-        }
-        $xeTable.focus();
-        if ($xeTable.closeMenu) {
-          $xeTable.closeMenu();
-        }
-      },
-      /**
-       * 单元格按下事件
-       */
-      triggerCellMousedownEvent(evnt, params) {
-        const cell = evnt.currentTarget;
-        params.cell = cell;
-        handleCellMousedownEvent(evnt, params);
-        $xeTable.focus();
-        $xeTable.closeFilter();
-        if ($xeTable.closeMenu) {
-          $xeTable.closeMenu();
-        }
-      }
+      handleCellMousedownEvent
     };
     return keyboardMethods;
   }
@@ -26074,6 +26165,10 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       }
       return grid_getConfig().grid.layouts || ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
     });
+    const computePageConfFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const pagerOpts = computePagerOpts.value;
+      return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
+    });
     const refMaps = {
       refElem,
       refTable,
@@ -26293,7 +26388,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         $event
       } = params;
       const proxyOpts = computeProxyOpts.value;
+      const $xeTable = refTable.value;
       if (proxyConfig && isEnableConf(proxyOpts)) {
+        $xeTable.clearScroll();
         gridMethods.commitProxy('reload').then(rest => {
           gridMethods.dispatchEvent('proxy-query', {
             ...rest,
@@ -27307,7 +27404,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.toolbarConfig, () => {
       initToolbar();
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.pagerConfig, () => {
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(computePageConfFlag, () => {
       initPages();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.proxyConfig, () => {