vxe-table 4.12.0-beta.2 → 4.12.0-beta.20

package/lib/table/src/table.js

@@ -39,6 +39,7 @@ const {
   useFns,
   renderEmptyElement
 } = _ui.VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -499,6 +500,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const computeColumnOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.columnConfig, props.columnConfig);
     });
+    const computeCurrentColumnOpts = (0, _vue.computed)(() => {
+      return Object.assign({}, getConfig().table.currentColumnConfig, props.currentColumnConfig);
+    });
     const computeCellOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.cellConfig, props.cellConfig);
     });
@@ -511,6 +515,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const computeRowOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
     });
+    const computeCurrentRowOpts = (0, _vue.computed)(() => {
+      return Object.assign({}, getConfig().table.currentRowConfig, props.currentRowConfig);
+    });
     const computeRowDragOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.rowDragConfig, props.rowDragConfig);
     });
@@ -817,6 +824,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeScrollbarXToTop,
       computeScrollbarYToLeft,
       computeColumnOpts,
+      computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
       computeDefaultRowHeight,
@@ -824,6 +832,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeHeaderCellOpts,
       computeFooterCellOpts,
       computeRowOpts,
+      computeCurrentRowOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
       computeResizeOpts,
@@ -1375,7 +1384,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullColumnFieldData[field] = rest;
         } else {
           if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
           }
         }
         if (!hasFixed && fixed) {
@@ -2628,6 +2637,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reserve,
         checkMethod
       } = checkboxOpts;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
+      // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
       /**
@@ -2672,7 +2685,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (isForce || !checkMethod || checkMethod({
                 row
               })) {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               }
             }, {
               children: childrenField
@@ -2684,7 +2698,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               _xeUtils.default.eachTree(afterFullData, row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -2704,7 +2718,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (selectCheckboxMaps[rowid] || checkMethod({
                   row
                 })) {
@@ -2713,7 +2727,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               });
             } else {
               afterFullData.forEach(row => {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               });
             }
           } else {
@@ -2724,7 +2739,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -3120,7 +3135,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let treeData = [];
-      let fullData = (0, _vue.reactive)(datas ? datas.slice(0) : []); // 转为响应式
+      let fullData = (0, _vue.reactive)(datas ? datas.slice(0) : []); // 转为响应式数据
+      if (fullData.length > supportMaxRow) {
+        (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
+      }
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
@@ -3214,7 +3232,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
           // }
           if (props.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
+            (0, _log.errLog)('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -3661,9 +3679,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleCheckedAllCheckboxRow(value);
       if (evnt) {
         dispatchEvent('checkbox-all', {
-          records: $xeTable.getCheckboxRecords(),
-          reserves: $xeTable.getCheckboxReserveRecords(),
-          indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+          records: () => $xeTable.getCheckboxRecords(),
+          reserves: () => $xeTable.getCheckboxReserveRecords(),
+          indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
           checked: value
         }, evnt);
       }
@@ -4018,6 +4036,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     tableMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 重置表格的一切数据状态
        */
@@ -4364,20 +4385,25 @@ var _default = exports.default = (0, _vue.defineComponent)({
           keepSource,
           treeConfig
         } = props;
+        const {
+          editStore
+        } = reactData;
         const {
           fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
           sourceDataRowIdData,
           tableFullData,
           afterFullData
         } = internalData;
+        const removeTempMaps = Object.assign({}, editStore.removeMaps);
         const treeOpts = computeTreeOpts.value;
         const {
           transform
         } = treeOpts;
         if (!keepSource) {
           if (process.env.NODE_ENV === 'development') {
-            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
+            (0, _log.errLog)('vxe.error.reqProp', ['keep-source']);
           }
           return (0, _vue.nextTick)();
         }
@@ -4391,22 +4417,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         let reDelFlag = false;
         if (targetRows.length) {
-          targetRows.forEach(row => {
-            if (!$xeTable.isInsertByRow(row)) {
-              const rowid = (0, _util.getRowid)($xeTable, row);
-              const oRow = sourceDataRowIdData[rowid];
-              if (oRow && row) {
-                if (field) {
-                  _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
-                } else {
-                  _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
-                }
-                if ($xeTable.isRemoveByRow(row)) {
-                  const rowRest = fullAllDataRowIdData[rowid];
-                  if (rowRest) {
-                    const reRow = rowRest.row;
-                    tableFullData.unshift(reRow);
-                    afterFullData.unshift(reRow);
+          targetRows.forEach(item => {
+            const rowid = (0, _util.getRowid)($xeTable, item);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+              const row = rowRest.row;
+              if (!$xeTable.isInsertByRow(row)) {
+                const oRow = sourceDataRowIdData[rowid];
+                if (oRow && row) {
+                  if (field) {
+                    _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
+                  } else {
+                    _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
+                  }
+                  if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    delete removeTempMaps[rowid];
+                    tableFullData.unshift(row);
+                    afterFullData.unshift(row);
                     reDelFlag = true;
                   }
                 }
@@ -4416,6 +4443,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         if (rows) {
           if (reDelFlag) {
+            editStore.removeMaps = removeTempMaps;
             $xeTable.updateFooter();
             $xeTable.cacheRowMap(false);
             $xeTable.handleTableData(treeConfig && transform);
@@ -4585,10 +4613,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       /**
        * 检查行或列数据是否发生改变
-       * @param {Row} row 行对象
+       * @param {Row} rowidOrRow 行对象、行主键
        * @param {String} field 字段名
        */
-      isUpdateByRow(row, field) {
+      isUpdateByRow(rowidOrRow, field) {
         const {
           keepSource
         } = props;
@@ -4598,11 +4626,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           sourceDataRowIdData
         } = internalData;
         if (keepSource) {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = _xeUtils.default.isString(rowidOrRow) || _xeUtils.default.isNumber(rowidOrRow) ? rowidOrRow : (0, _util.getRowid)($xeTable, rowidOrRow);
+          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) {
@@ -4666,6 +4696,108 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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 = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+        let prevDragCol = null;
+        const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+        let defPos = 'left';
+        if (_xeUtils.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 = (0, _util.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 = (0, _util.handleRowidOrRow)($xeTable, rowidOrRow);
+        let prevDragRow = null;
+        let defPos = 'top';
+        const rowRest = dragRow ? fullAllDataRowIdData[(0, _util.getRowid)($xeTable, dragRow)] : null;
+        if (_xeUtils.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 = (0, _util.handleRowidOrRow)($xeTable, targetRowidOrRow);
+          const targetRowRest = prevDragRow ? fullAllDataRowIdData[(0, _util.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);
+      },
       /**
        * 获取表格的全量列
        */
@@ -4689,6 +4821,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
+        const {
+          selectCheckboxMaps
+        } = reactData;
         const {
           tableFullData,
           afterFullData,
@@ -4708,19 +4843,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let rowList = [];
-        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
         if (checkField) {
           if (treeConfig) {
+            const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
             rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
               children: transform ? mapChildrenField : childrenField
             });
           } else {
+            const currTableData = isFull ? tableFullData : afterFullData;
             rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
           }
         } else {
-          const {
-            selectCheckboxMaps
-          } = reactData;
           _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
             if (isFull) {
               if (fullDataRowIdData[rowid]) {
@@ -5503,6 +5636,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkField,
           reserve
         } = checkboxOpts;
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
           const handleClearChecked = item => {
@@ -5643,13 +5777,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 用于当前列，设置某列行为高亮状态
        */
       setCurrentColumn(fieldOrColumn) {
+        const {
+          mouseConfig
+        } = props;
+        const mouseOpts = computeMouseOpts.value;
+        const isMouseSelected = mouseConfig && mouseOpts.selected;
         const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
         if (column) {
-          // tableMethods.clearCurrentRow()
-          tableMethods.clearCurrentColumn();
+          $xeTable.clearCurrentColumn();
           reactData.currentColumn = column;
         }
-        return (0, _vue.nextTick)();
+        return (0, _vue.nextTick)().then(() => {
+          // 更新状选中态
+          if (isMouseSelected) {
+            $xeTable.addCellSelectedClass();
+          }
+        });
       },
       /**
        * 用于当前列，手动清空当前高亮的状态
@@ -5911,7 +6054,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             column,
             property: column.field,
             field: column.field,
-            filterList: $xeTable.getCheckedFilters(),
+            filterList: () => $xeTable.getCheckedFilters(),
             visible: false
           }, null);
         }
@@ -6634,8 +6777,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           collectColumn
         } = internalData;
         const {
+          storage,
           checkMethod
         } = customOpts;
+        const isAllCustom = storage === true;
+        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+        const isCustomResizable = isAllCustom || storageOpts.resizable;
+        const isCustomVisible = isAllCustom || storageOpts.visible;
+        const isCustomFixed = isAllCustom || storageOpts.fixed;
+        const isCustomSort = isAllCustom || storageOpts.sort;
         const resizableData = {};
         const sortData = {};
         const visibleData = {};
@@ -6655,45 +6805,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let hasFixed = 0;
         let hasVisible = 0;
         _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+          const colKey = column.getKey();
+          if (!colKey) {
+            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+            return;
+          }
           // 只支持一级
           if (!parentColumn) {
-            collectColumn.forEach(column => {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasSort = 1;
-                sortData[colKey] = column.renderSortNumber;
-              }
-            });
-            if (column.fixed !== column.defaultFixed) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasFixed = 1;
-                fixedData[colKey] = column.fixed;
-              }
+            if (isCustomSort) {
+              hasSort = 1;
+              sortData[colKey] = column.renderSortNumber;
             }
-          }
-          if (column.resizeWidth) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasResizable = 1;
-              resizableData[colKey] = column.renderWidth;
+            if (isCustomFixed && column.fixed !== column.defaultFixed) {
+              hasFixed = 1;
+              fixedData[colKey] = column.fixed;
             }
           }
-          if (!checkMethod || checkMethod({
+          if (isCustomResizable && column.resizeWidth) {
+            hasResizable = 1;
+            resizableData[colKey] = column.renderWidth;
+          }
+          if (isCustomVisible && (!checkMethod || checkMethod({
             column
-          })) {
+          }))) {
             if (!column.visible && column.defaultVisible) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasVisible = 1;
-                visibleData[colKey] = false;
-              }
+              hasVisible = 1;
+              visibleData[colKey] = false;
             } else if (column.visible && !column.defaultVisible) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasVisible = 1;
-                visibleData[colKey] = true;
-              }
+              hasVisible = 1;
+              visibleData[colKey] = true;
             }
           }
         });
@@ -6957,7 +7097,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             keyboardConfig,
             treeConfig,
             editConfig,
-            highlightCurrentRow
+            highlightCurrentRow,
+            highlightCurrentColumn
           } = props;
           const {
             ctxMenuStore,
@@ -6975,6 +7116,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const treeOpts = computeTreeOpts.value;
           const menuList = computeMenuList.value;
           const rowOpts = computeRowOpts.value;
+          const columnOpts = computeColumnOpts.value;
           const {
             selected,
             actived
@@ -7142,10 +7284,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
               // 如果按下了方向键
               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);
               }
+              // 当前行按键左右移动
+              if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+              }
             }
           } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
             // 如果按下了 Tab 键切换
@@ -7648,7 +7795,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (el) {
           const parentElem = el.parentNode;
           const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
-          return Math.floor($xeGrid ? $xeGrid.getParentHeight() : _xeUtils.default.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+          let parentWrapperHeight = 0;
+          if (parentElem) {
+            if ($xeGrid && (0, _dom.hasClass)(parentElem, 'vxe-grid--table-wrapper')) {
+              parentWrapperHeight = $xeGrid.getParentHeight();
+            } else {
+              parentWrapperHeight = parentElem.clientHeight;
+            }
+          }
+          return Math.floor(parentWrapperHeight - parentPaddingSize);
         }
         return 0;
       },
@@ -7761,30 +7916,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const treeOpts = computeTreeOpts.value;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const rowkey = (0, _util.getRowkey)($xeTable);
+        const {
+          lazy
+        } = treeOpts;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-        const handleRow = (row, index, items, path, parentRow, nodes) => {
-          let rowid = (0, _util.getRowid)($xeTable, row);
-          const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
-          const level = nodes ? nodes.length - 1 : 0;
-          if ((0, _utils.eqEmptyValue)(rowid)) {
-            rowid = (0, _util.getRowUniqueId)();
-            _xeUtils.default.set(row, rowkey, rowid);
-          }
-          if (treeConfig && treeOpts.lazy) {
-            const treeExpRest = treeExpandedMaps[rowid];
-            if (row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
-              row[childrenField] = null;
-            }
-            if (treeExpRest) {
-              if (!row[childrenField] || !row[childrenField].length) {
-                delete treeTempExpandedMaps[rowid];
-              }
-            }
-          }
-          let rowRest = fullAllDataRowIdData[rowid];
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
+        const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+          let rowRest = fullAllDataRowIdMaps[rowid];
           if (!rowRest) {
             rowRest = {
               row,
@@ -7802,6 +7944,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               oTop: 0,
               expandHeight: 0
             };
+            fullDataRowIdMaps[rowid] = rowRest;
+            fullAllDataRowIdMaps[rowid] = rowRest;
           }
           rowRest.treeLoaded = false;
           rowRest.expandLoaded = false;
@@ -7809,16 +7953,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
           rowRest.items = items;
           rowRest.parent = parentRow;
           rowRest.level = level;
-          rowRest.index = treeConfig && parentRow ? -1 : index;
+          rowRest.index = currIndex;
+          rowRest.treeIndex = index;
           fullDataRowIdMaps[rowid] = rowRest;
           fullAllDataRowIdMaps[rowid] = rowRest;
         };
         if (treeConfig) {
-          _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
+          _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+            const rowid = handleUpdateRowId(row);
+            if (treeConfig && lazy) {
+              const treeExpRest = treeTempExpandedMaps[rowid];
+              if (row[hasChildField] && row[childrenField] === undefined) {
+                row[childrenField] = null;
+              }
+              if (treeExpRest) {
+                if (!row[childrenField] || !row[childrenField].length) {
+                  delete treeTempExpandedMaps[rowid];
+                }
+              }
+            }
+            handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, (0, _util.toTreePathSeq)(path));
+          }, {
             children: childrenField
           });
         } else {
-          tableFullData.forEach(handleRow);
+          tableFullData.forEach((row, index, items) => {
+            handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
+          });
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
@@ -7829,19 +7990,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const treeOpts = computeTreeOpts.value;
-        let {
-          sourceDataRowIdData
-        } = internalData;
         const sourceData = _xeUtils.default.clone(fullData, true);
-        const rowkey = (0, _util.getRowkey)($xeTable);
-        sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
+        const sourceRowIdData = {};
         const handleSourceRow = row => {
-          let rowid = (0, _util.getRowid)($xeTable, row);
-          if ((0, _utils.eqEmptyValue)(rowid)) {
-            rowid = (0, _util.getRowUniqueId)();
-            _xeUtils.default.set(row, rowkey, rowid);
-          }
-          sourceDataRowIdData[rowid] = row;
+          const rowid = handleUpdateRowId(row);
+          sourceRowIdData[rowid] = row;
         };
         // 源数据缓存
         if (treeConfig) {
@@ -7852,6 +8008,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           sourceData.forEach(handleSourceRow);
         }
+        internalData.sourceDataRowIdData = sourceRowIdData;
         internalData.tableSourceData = sourceData;
       },
       /**
@@ -8358,12 +8515,25 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         // 兼容老版本
-        let rest;
-        if (!evntList.some(func => func(Object.assign({
-          $grid: $xeGrid,
-          $table: $xeTable,
-          $event: evnt
-        }, args)) === false)) {
+        let rest = null;
+        let isStop = false;
+        for (let i = 0; i < evntList.length; i++) {
+          const func = evntList[i];
+          const fnRest = func(Object.assign({
+            $grid: $xeGrid,
+            $table: $xeTable,
+            $event: evnt
+          }, args));
+          if (fnRest === false) {
+            isStop = true;
+            break;
+          } else if (fnRest && fnRest.status === false) {
+            rest = fnRest.result;
+            isStop = true;
+            break;
+          }
+        }
+        if (!isStop) {
           if (next) {
             rest = next();
           }
@@ -8403,10 +8573,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         // 树结构
         if (treeConfig) {
+          const {
+            handleGetRowId
+          } = (0, _util.createHandleGetRowId)($xeTable);
           const childRowMaps = {};
           const childRowList = [];
           _xeUtils.default.eachTree(afterTreeFullData, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             const childList = row[transform ? mapChildrenField : childrenField];
             if (childList && childList.length && !childRowMaps[rowid]) {
               childRowMaps[rowid] = 1;
@@ -8423,7 +8596,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let hLen = 0; // 半选
             let vLen = 0; // 有效行
             childList.forEach(checkMethod ? item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
+              const childRowid = handleGetRowId(item);
               const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
               if (checkMethod({
                 row: item
@@ -8442,7 +8615,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 }
               }
             } : item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
+              const childRowid = handleGetRowId(item);
               const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
               if (isSelect) {
                 sLen++;
@@ -8501,12 +8674,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           afterTreeFullData,
           checkboxReserveRowMap
         } = internalData;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         let sLen = 0; // 已选
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         const rootList = treeConfig ? afterTreeFullData : afterFullData;
         rootList.forEach(checkMethod ? row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
             row
@@ -8525,7 +8701,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           }
         } : row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (selected) {
             sLen++;
@@ -8571,6 +8747,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkStrictly,
           checkMethod
         } = checkboxOpts;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
           // 树结构
@@ -8609,7 +8789,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (treeConfig && !checkStrictly) {
           // 更新子节点状态
           _xeUtils.default.eachTree(rows, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (isForce || !checkMethod || checkMethod({
               row
             })) {
@@ -8630,7 +8810,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         // 列表
         rows.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
@@ -8784,6 +8964,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const sortOpts = computeSortOpts.value;
         const columnOpts = computeColumnOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
         const {
           column
         } = params;
@@ -8792,7 +8973,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const triggerSort = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--sort').flag;
         const triggerFilter = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--filter').flag;
         if (sortOpts.trigger === 'cell' && !(triggerResizable || triggerSort || triggerFilter)) {
-          tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column));
+          $xeTable.triggerSortEvent(evnt, column, getNextSortOrder(column));
         }
         dispatchEvent('header-cell-click', Object.assign({
           triggerResizable,
@@ -8800,8 +8981,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           triggerFilter,
           cell
         }, params), evnt);
-        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
-          tablePrivateMethods.triggerCurrentColumnEvent(evnt, params);
+        if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
+          $xeTable.triggerCurrentColumnEvent(evnt, params);
         }
       },
       triggerHeaderCellDblclickEvent(evnt, params) {
@@ -8817,6 +8998,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerCellClickEvent(evnt, params) {
         const {
           highlightCurrentRow,
+          highlightCurrentColumn,
           editConfig
         } = props;
         const {
@@ -8833,6 +9015,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const checkboxOpts = computeCheckboxOpts.value;
         const keyboardOpts = computeKeyboardOpts.value;
         const rowOpts = computeRowOpts.value;
+        const columnOpts = computeColumnOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
         const {
           actived,
           focused
@@ -8863,29 +9047,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!triggerCheckbox && !triggerRadio) {
           // 如果是展开行
           if (!triggerExpandNode && (expandOpts.trigger === 'row' || isExpandType && expandOpts.trigger === 'cell')) {
-            tablePrivateMethods.triggerRowExpandEvent(evnt, params);
+            $xeTable.triggerRowExpandEvent(evnt, params);
           }
           // 如果是树形表格
           if (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell') {
-            tablePrivateMethods.triggerTreeExpandEvent(evnt, params);
+            $xeTable.triggerTreeExpandEvent(evnt, params);
           }
         }
         // 如果点击了树节点
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
-            // 如果是高亮行
+            // 如果是当前行
             if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
-                tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
+                $xeTable.triggerCurrentRowEvent(evnt, params);
+              }
+            }
+            // 如果是当前列
+            if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+              if (!triggerCheckbox && !triggerRadio) {
+                $xeTable.triggerCurrentColumnEvent(evnt, params);
               }
             }
             // 如果是单选框
             if (!triggerRadio && (radioOpts.trigger === 'row' || isRadioType && radioOpts.trigger === 'cell')) {
-              tablePrivateMethods.triggerRadioRowEvent(evnt, params);
+              $xeTable.triggerRadioRowEvent(evnt, params);
             }
             // 如果是复选框
             if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || isCheckboxType && checkboxOpts.trigger === 'cell')) {
-              tablePrivateMethods.handleToggleCheckRowEvent(evnt, params);
+              $xeTable.handleToggleCheckRowEvent(evnt, params);
             }
           }
           // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -8991,13 +9181,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       },
       triggerCheckRowEvent(evnt, params, checked) {
-        const checkboxOpts = computeCheckboxOpts.value;
         const {
           row
         } = params;
         const {
           afterFullData
         } = internalData;
+        const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkMethod,
           trigger
@@ -9007,15 +9197,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         evnt.stopPropagation();
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
-          const checkboxRecords = tableMethods.getCheckboxRecords();
+          const checkboxRecords = $xeTable.getCheckboxRecords();
           if (checkboxRecords.length) {
             const firstRow = checkboxRecords[0];
-            const _rowIndex = tableMethods.getVTRowIndex(row);
-            const _firstRowIndex = tableMethods.getVTRowIndex(firstRow);
+            const _rowIndex = $xeTable.getVTRowIndex(row);
+            const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
             if (_rowIndex !== _firstRowIndex) {
-              tableMethods.setAllCheckboxRow(false);
+              $xeTable.setAllCheckboxRow(false);
               const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-              handleCheckedCheckboxRow(rangeRows, true, false);
+              (0, _vue.nextTick)(() => {
+                handleCheckedCheckboxRow(rangeRows, true, false);
+              });
               dispatchEvent('checkbox-range-select', Object.assign({
                 rangeRecords: rangeRows
               }, params), evnt);
@@ -9026,12 +9218,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!checkMethod || checkMethod({
           row
         })) {
-          tablePrivateMethods.handleBatchSelectRows([row], checked);
-          tablePrivateMethods.checkSelectionStatus();
+          $xeTable.handleBatchSelectRows([row], checked);
+          $xeTable.checkSelectionStatus();
           dispatchEvent('checkbox-change', Object.assign({
-            records: tableMethods.getCheckboxRecords(),
-            reserves: tableMethods.getCheckboxReserveRecords(),
-            indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+            records: () => $xeTable.getCheckboxRecords(),
+            reserves: () => $xeTable.getCheckboxReserveRecords(),
+            indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
             checked
           }, params), evnt);
         }
@@ -9421,6 +9613,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -9435,7 +9630,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
@@ -9466,11 +9661,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                       if (isPeerDrag && !isCrossDrag) {
                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                           // 非同级
-                          return;
+                          return errRest;
                         }
                       } else {
                         if (!isCrossDrag) {
-                          return;
+                          return errRest;
                         }
                         if (oldAllMaps[newRowid]) {
                           isSelfToChildStatus = true;
@@ -9481,19 +9676,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
                                 content: 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;
@@ -9504,7 +9699,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                               content: getI18n('vxe.error.treeDragChild')
                             });
                           }
-                          return;
+                          return errRest;
                         }
                       }
                     } else {
@@ -9562,26 +9757,34 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (reactData.scrollYLoad) {
                 $xeTable.updateScrollYSpace();
               }
-              (0, _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, _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 {
@@ -9750,6 +9953,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           collectColumn
         } = internalData;
         const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+        const errRest = {
+          status: false
+        };
         if (prevDragCol && dragCol) {
           // 判断是否有拖动
           if (prevDragCol !== dragCol) {
@@ -9766,7 +9972,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
@@ -9780,11 +9986,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 if (isPeerDrag && !isCrossDrag) {
                   if (dragColumn.parentId !== newColumn.parentId) {
                     // 非同级
-                    return;
+                    return errRest;
                   }
                 } else {
                   if (!isCrossDrag) {
-                    return;
+                    return errRest;
                   }
                   if (oldAllMaps[newColumn.id]) {
                     isSelfToChildStatus = true;
@@ -9795,19 +10001,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
                           content: 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;
@@ -9818,7 +10024,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         content: getI18n('vxe.error.treeDragChild')
                       });
                     }
-                    return;
+                    return errRest;
                   }
                 }
               } else {
@@ -9887,25 +10093,32 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   $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 {
@@ -10358,11 +10571,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = _props.default;
         const {
           scrollXLoad,
-          scrollYLoad
+          scrollYLoad,
+          expandColumn
         } = reactData;
         const leftFixedWidth = computeLeftFixedWidth.value;
         const rightFixedWidth = computeRightFixedWidth.value;
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
           return;
         }
         const {