vxe-table 3.11.30 → 3.11.32

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.30";
+const version = "3.11.32";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2790,7 +2790,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.30"}`;
+const log_version = `table v${"3.11.32"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3564,23 +3564,26 @@ function renderCellDragIcon(h, params) {
   const rowDragOpts = $table.computeRowDragOpts;
   const {
     icon,
+    trigger,
     disabledMethod
   } = rowDragOpts;
   const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
   const isDisabled = rDisabledMethod && rDisabledMethod(params);
+  const ons = {};
+  if (trigger !== 'cell') {
+    ons.mousedown = evnt => {
+      if (!isDisabled) {
+        $table.handleCellDragMousedownEvent(evnt, params);
+      }
+    };
+    ons.mouseup = $table.handleCellDragMouseupEvent;
+  }
   return h('span', {
     key: 'dg',
     class: ['vxe-cell--drag-handle', {
       'is--disabled': isDisabled
     }],
-    on: {
-      mousedown(evnt) {
-        if (!isDisabled) {
-          $table.handleCellDragMousedownEvent(evnt, params);
-        }
-      },
-      mouseup: $table.handleCellDragMouseupEvent
-    }
+    on: ons
   }, [h('i', {
     class: icon || (dragConfig ? dragConfig.rowIcon : '') || cell_getIcon().TABLE_DRAG_ROW
   })]);
@@ -3629,26 +3632,29 @@ function renderHeaderCellDragIcon(h, 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.mousedown = evnt => {
+          if (!isDisabled) {
+            $table.handleHeaderCellDragMousedownEvent(evnt, params);
+          }
+        };
+        ons.mouseup = $table.handleHeaderCellDragMouseupEvent;
+      }
       return h('span', {
         key: 'dg',
         class: ['vxe-cell--drag-handle', {
           'is--disabled': isDisabled
         }],
-        on: {
-          mousedown(evnt) {
-            if (!isDisabled) {
-              $table.handleHeaderCellDragMousedownEvent(evnt, params);
-            }
-          },
-          mouseup: $table.handleHeaderCellDragMouseupEvent
-        }
+        on: ons
       }, [h('i', {
         class: icon || cell_getIcon().TABLE_DRAG_COLUMN
       })]);
@@ -5802,7 +5808,6 @@ const Methods = {
    */
   loadData(datas) {
     const {
-      inited,
       initStatus
     } = this;
     return this.loadTableData(datas).then(() => {
@@ -5811,9 +5816,6 @@ const Methods = {
       if (!initStatus) {
         this.handleLoadDefaults();
       }
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -5822,18 +5824,12 @@ const Methods = {
    * @param {Array} datas 数据
    */
   reloadData(datas) {
-    const {
-      inited
-    } = this;
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
       return this.loadTableData(datas);
     }).then(() => {
       this.handleLoadDefaults();
-      if (!inited) {
-        this.handleInitDefaults();
-      }
       return this.recalculate();
     });
   },
@@ -9560,29 +9556,84 @@ const Methods = {
    * @param {Array/Row} rows 行数据
    * @param {Boolean} value 是否选中
    */
-  setCheckboxRow(rows, value) {
+  setCheckboxRow(rows, checked) {
+    const $xeTable = this;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
-    return this.handleCheckedCheckboxRow(rows, value, true);
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
+  },
+  setCheckboxRowKey(keys, checked) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (keys && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(keys)) {
+      keys = [keys];
+    }
+    const rows = [];
+    keys.forEach(rowid => {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        rows.push(rowRest.row);
+      }
+    });
+    return $xeTable.handleCheckedCheckboxRow(rows, checked, true);
   },
   isCheckedByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       selectCheckboxMaps
-    } = this;
+    } = reactData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField
-    } = this.checkboxOpts;
+    } = checkboxOpts;
     if (checkField) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     }
-    return !!selectCheckboxMaps[getRowid(this, row)];
+    return !!selectCheckboxMaps[getRowid($xeTable, row)];
+  },
+  isCheckedByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      selectCheckboxMaps
+    } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const {
+      checkField
+    } = checkboxOpts;
+    if (checkField) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rowRest.row, checkField);
+      }
+      return false;
+    }
+    return !!selectCheckboxMaps[rowid];
   },
   isIndeterminateByCheckboxRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       treeIndeterminateMaps
-    } = this;
-    return !!treeIndeterminateMaps[getRowid(this, row)] && !this.isCheckedByCheckboxRow(row);
+    } = reactData;
+    return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+  },
+  isIndeterminateByCheckboxRowKey(rowid) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      treeIndeterminateMaps
+    } = reactData;
+    return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
   },
   /**
    * 切换选中
@@ -10490,7 +10541,26 @@ const Methods = {
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
-    return this.selectRadioRow === row;
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (row && selectRadioRow) {
+      return $xeTable.eqRow(selectRadioRow, row);
+    }
+    return false;
+  },
+  isCheckedByRadioRowKey(key) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      selectRadioRow
+    } = reactData;
+    if (selectRadioRow) {
+      return key === getRowid($xeTable, selectRadioRow);
+    }
+    return false;
   },
   handleCheckedRadioRow(row, isForce) {
     const {
@@ -10512,7 +10582,24 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setRadioRow(row) {
-    return this.handleCheckedRadioRow(row, true);
+    const $xeTable = this;
+    return $xeTable.handleCheckedRadioRow(row, true);
+  },
+  /**
+   * 用于单选行，设置某一行为选中状态
+   * @param key 行主键
+   */
+  setRadioRowKey(rowid) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
+      return $xeTable.handleCheckedRadioRow(rowRest.row, true);
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于当前行，手动清空当前高亮的状态
@@ -10667,6 +10754,7 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent(evnt, params) {
+    const $xeTable = this;
     const {
       highlightCurrentRow,
       editStore,
@@ -10756,6 +10844,20 @@ const Methods = {
         }
       }
     }
+    // 如果是双击编辑模式
+    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);
+          }
+        }
+      }
+    }
     this.emitEvent('cell-click', params, evnt);
   },
   /**
@@ -10869,6 +10971,94 @@ const Methods = {
       $xeTable.handleColumnSortEvent(evnt, column);
     }
   },
+  /**
+   * 表头单元格按下事件
+   */
+  triggerHeaderCellMousedownEvent(evnt, params) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const {
+      mouseConfig
+    } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
+    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 $xeTable = this;
+    const {
+      column
+    } = params;
+    const {
+      type,
+      treeNode
+    } = column;
+    const isRadioType = type === 'radio';
+    const isCheckboxType = type === 'checkbox';
+    const isExpandType = type === 'expand';
+    const rowOpts = $xeTable.computeRowOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    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();
+    }
+  },
   /**
    * 行拖拽
    */
@@ -11129,18 +11319,20 @@ const Methods = {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
+    evnt.stopPropagation();
     const {
       dragConfig
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     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;
@@ -11400,15 +11592,17 @@ const Methods = {
   handleHeaderCellDragMousedownEvent(evnt, params) {
     const $xeTable = this;
     const reactData = $xeTable;
+    evnt.stopPropagation();
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     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($xeTable);
     if (dragStartMethod && !dragStartMethod(params)) {
@@ -11435,66 +11629,67 @@ const Methods = {
     reactData.isDragColMove = false;
   },
   setPendingRow(rows, status) {
-    const pendingMaps = {
-      ...this.pendingRowMaps
-    };
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    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];
     }
     if (status) {
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (rowid && !pendingMaps[rowid]) {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       });
     } else {
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (rowid && pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         }
       });
     }
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   togglePendingRow(rows) {
-    const pendingMaps = {
-      ...this.pendingRowMaps
-    };
-    const pendingList = [...this.pendingRowList];
+    const $xeTable = this;
+    const reactData = $xeTable;
+    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];
     }
     rows.forEach(row => {
-      const rowid = getRowid(this, row);
+      const rowid = getRowid($xeTable, row);
       if (rowid) {
         if (pendingMaps[rowid]) {
-          const pendingIndex = this.findRowIndexOf(pendingList, row);
-          if (pendingIndex > -1) {
-            pendingList.splice(pendingIndex, 1);
-          }
           delete pendingMaps[rowid];
         } else {
-          pendingList.push(row);
           pendingMaps[rowid] = row;
         }
       }
     });
-    this.pendingRowMaps = pendingMaps;
-    this.pendingRowList = pendingList;
-    return this.$nextTick();
+    reactData.pendingRowMaps = pendingMaps;
+    return $xeTable.$nextTick();
   },
   getPendingRecords() {
-    return this.pendingRowList.slice(0);
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      pendingRowMaps
+    } = reactData;
+    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;
   },
   hasPendingByRow(row) {
     const {
@@ -11505,7 +11700,6 @@ const Methods = {
   },
   clearPendingRow() {
     this.pendingRowMaps = {};
-    this.pendingRowList = [];
     return this.$nextTick();
   },
   sort(sortConfs, sortOrder) {
@@ -12645,6 +12839,8 @@ const Methods = {
       }
       internalData.lastScrollTop = scrollTop;
     }
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
     reactData.lastScrollTime = Date.now();
     const evntParams = {
       scrollTop,
@@ -13600,6 +13796,10 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     areaOpts,
     validErrorMaps
   } = $xetable;
+  const rowDragOpts = $xetable.computeRowDragOpts;
+  const {
+    disabledMethod: dragDisabledMethod
+  } = rowDragOpts;
   const {
     selectCellToRow
   } = areaOpts;
@@ -13675,6 +13875,14 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     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 || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
@@ -13711,7 +13919,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     };
   }
   // 按下事件处理
-  if (checkboxOpts.range || mouseConfig) {
+  if (isColDragCell || checkboxOpts.range || mouseConfig) {
     tdOns.mousedown = evnt => {
       $xetable.triggerCellMousedownEvent(evnt, params);
     };
@@ -13844,6 +14052,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       '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,
@@ -13879,7 +14089,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     hasFixedColumn,
     fullAllDataRowIdData,
     rowOpts,
-    pendingRowList,
     pendingRowMaps,
     columnOpts,
     isDragColMove
@@ -13972,7 +14181,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
       'row--radio': radioOpts.highlight && $xeTable.selectRadioRow === row,
       'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-      'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
+      'row--pending': !!pendingRowMaps[rowid]
     }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''];
     const tdVNs = tableColumn.map((column, $columnIndex) => {
       return renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
@@ -14484,12 +14693,12 @@ const {
 } = core_.VxeUI;
 const cellType = 'header';
 const header_renderRows = (h, _vm, cols, $rowIndex) => {
+  const $xeTable = _vm.$parent;
+  const $xeGrid = $xeTable.xegrid;
   const {
-    $parent: $xetable,
     fixedType
   } = _vm;
   const {
-    $listeners: tableListeners,
     resizable: allResizable,
     border,
     columnKey,
@@ -14498,15 +14707,17 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
     showHeaderOverflow: allColumnHeaderOverflow,
     headerAlign: allHeaderAlign,
     align: allAlign,
-    highlightCurrentColumn,
     currentColumn,
     scrollXLoad,
     overflowX,
     scrollbarWidth,
-    sortOpts,
     mouseConfig,
     columnOpts
-  } = $xetable;
+  } = $xeTable;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const {
+    disabledMethod: dragDisabledMethod
+  } = columnDragOpts;
   return cols.map((column, $columnIndex) => {
     const {
       type,
@@ -14529,13 +14740,12 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
     let hasEllipsis = showTitle || showTooltip || showEllipsis;
-    const thOns = {};
     const hasFilter = column.filters && column.filters.some(item => item.checked);
-    const columnIndex = $xetable.getColumnIndex(column);
-    const _columnIndex = $xetable.getVTColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(column);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
     const params = {
-      $table: $xetable,
-      $grid: $xetable.xegrid,
+      $table: $xeTable,
+      $grid: $xeGrid,
       $rowIndex,
       column,
       columnIndex,
@@ -14546,25 +14756,36 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
       isHidden: fixedHiddenColumn,
       hasFilter
     };
+    const thAttrs = {
+      colid,
+      colspan: column.colSpan > 1 ? column.colSpan : null,
+      rowspan: column.rowSpan > 1 ? column.rowSpan : null
+    };
+    const thOns = {
+      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
+      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+    };
     // 虚拟滚动不支持动态高度
     if (scrollXLoad && !hasEllipsis) {
       showEllipsis = hasEllipsis = true;
     }
-    if (columnOpts.isCurrent || highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
-      thOns.click = evnt => $xetable.triggerHeaderCellClickEvent(evnt, params);
-    }
-    if (tableListeners['header-cell-dblclick']) {
-      thOns.dblclick = evnt => $xetable.triggerHeaderCellDblclickEvent(evnt, params);
+    const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
+    let isDisabledDrag = false;
+    if (isColDragCell) {
+      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
     }
     // 按下事件处理
-    if (mouseConfig) {
-      thOns.mousedown = evnt => $xetable.triggerHeaderCellMousedownEvent(evnt, params);
+    if (mouseConfig || isColDragCell) {
+      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
     }
-    // 拖拽行事件
+    // 拖拽列事件
     if (columnOpts.drag) {
-      thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent;
-      thOns.dragend = $xetable.handleHeaderCellDragDragendEvent;
-      thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent;
+      thOns.dragstart = $xeTable.handleHeaderCellDragDragstartEvent;
+      thOns.dragend = $xeTable.handleHeaderCellDragDragendEvent;
+      thOns.dragover = $xeTable.handleHeaderCellDragDragoverEvent;
+      if (isColDragCell) {
+        thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
+      }
     }
     return h('th', {
       class: ['vxe-header--column', colid, {
@@ -14578,13 +14799,10 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
         'is--sortable': column.sortable,
         'col--filter': !!column.filters,
         'is--filter-active': hasFilter,
+        'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, getClass(headerClassName, params), getClass(headerCellClassName, params)],
-      attrs: {
-        colid,
-        colspan: column.colSpan > 1 ? column.colSpan : null,
-        rowspan: column.rowSpan > 1 ? column.rowSpan : null
-      },
+      attrs: thAttrs,
       style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
       on: thOns,
       key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
@@ -21665,38 +21883,6 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         this.handleSelected(params, evnt);
       });
     },
-    /**
-     * 表头单元格按下事件
-     */
-    triggerHeaderCellMousedownEvent(evnt, params) {
-      const {
-        mouseConfig,
-        mouseOpts
-      } = this;
-      if (mouseConfig && mouseOpts.area && this.handleHeaderCellAreaEvent) {
-        const cell = evnt.currentTarget;
-        const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
-        const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
-        this.handleHeaderCellAreaEvent(evnt, Object.assign({
-          cell,
-          triggerSort,
-          triggerFilter
-        }, params));
-      }
-      this.focus();
-      this.closeMenu();
-    },
-    /**
-     * 单元格按下事件
-     */
-    triggerCellMousedownEvent(evnt, params) {
-      const cell = evnt.currentTarget;
-      params.cell = cell;
-      this.handleCellMousedownEvent(evnt, params);
-      this.focus();
-      this.closeFilter();
-      this.closeMenu();
-    },
     handleCellMousedownEvent(evnt, params) {
       const {
         editConfig,
@@ -23111,8 +23297,6 @@ function handleUupdateResize(_vm) {
       reColumnFlag: 0,
       // 已标记的对象集
       pendingRowMaps: {},
-      // 已标记的行
-      pendingRowList: [],
       // 自定义列相关的信息
       customStore: {
         btnEl: null,
@@ -23629,6 +23813,19 @@ function handleUupdateResize(_vm) {
         y: overflowY && scrollYLoad
       };
     },
+    computeTableStyle() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        tableData
+      } = reactData;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const stys = {};
+      if (columnOpts.drag) {
+        stys['--vxe-ui-table-drag-column-move-delay'] = `${Math.max(0.06, Math.min(0.3, tableData.length / 800))}s`;
+      }
+      return stys;
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -23638,7 +23835,6 @@ function handleUupdateResize(_vm) {
   watch: {
     data(value) {
       const {
-        inited,
         initStatus
       } = this;
       this.loadTableData(value).then(() => {
@@ -23647,9 +23843,6 @@ function handleUupdateResize(_vm) {
         if (!initStatus) {
           this.handleLoadDefaults();
         }
-        if (!inited) {
-          this.handleInitDefaults();
-        }
         // const checkboxColumn = this.tableFullColumn.find(column => column.type === 'checkbox')
         // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
@@ -23930,7 +24123,7 @@ function handleUupdateResize(_vm) {
       if (this.editRules && !this._validate) {
         errLog('vxe.error.reqModule', ['Validator']);
       }
-      if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.triggerCellMousedownEvent) {
+      if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
         errLog('vxe.error.reqModule', ['Keyboard']);
       }
       if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
@@ -23953,8 +24146,8 @@ function handleUupdateResize(_vm) {
         this.inited = true;
         this.initStatus = true;
         this.handleLoadDefaults();
-        this.handleInitDefaults();
       }
+      this.handleInitDefaults();
       this.updateStyle();
     });
     table_globalEvents.on(this, 'paste', this.handleGlobalPasteEvent);
@@ -24107,6 +24300,8 @@ function handleUupdateResize(_vm) {
     const vSize = computeSize;
     const virtualScrollBars = $xeTable.computeVirtualScrollBars;
     const isArea = mouseConfig && mouseOpts.area;
+    const tableStyle = $xeTable.computeTableStyle;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
     return h('div', {
       ref: 'refElem',
       class: ['vxe-table', 'vxe-table--render-default', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
@@ -24122,6 +24317,7 @@ function handleUupdateResize(_vm) {
         '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,
@@ -24139,9 +24335,7 @@ function handleUupdateResize(_vm) {
         'is--virtual-x': scrollXLoad,
         'is--virtual-y': scrollYLoad
       }],
-      style: {
-        '--vxe-ui-table-drag-column-move-delay': `${Math.max(0.05, Math.min(0.3, tableData.length / 800))}s`
-      },
+      style: tableStyle,
       attrs: {
         spellcheck: false
       },
@@ -25636,6 +25830,11 @@ Object.keys(table.methods).forEach(name => {
         tableProps.editConfig = Object.assign({}, editConfig);
       }
       return tableProps;
+    },
+    computePageConfFlag() {
+      const $xeGrid = this;
+      const pagerOpts = $xeGrid.computePagerOpts;
+      return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
     }
   },
   watch: {
@@ -25655,7 +25854,7 @@ Object.keys(table.methods).forEach(name => {
     proxyConfig() {
       this.initProxy();
     },
-    pagerConfig() {
+    computePageConfFlag() {
       this.initPages();
     }
   },
@@ -26523,7 +26722,9 @@ Object.keys(table.methods).forEach(name => {
       const {
         proxyConfig
       } = this;
+      const $xeTable = this.$refs.xTable;
       if (proxyConfig) {
+        $xeTable.clearScroll();
         this.commitProxy('reload').then(rest => {
           this.$emit('proxy-query', {
             ...rest,