vxe-table 4.12.0-beta.1 → 4.12.0-beta.11

package/lib/table/src/table.js

@@ -499,6 +499,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 +514,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 +823,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeScrollbarXToTop,
       computeScrollbarYToLeft,
       computeColumnOpts,
+      computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
       computeDefaultRowHeight,
@@ -824,6 +831,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeHeaderCellOpts,
       computeFooterCellOpts,
       computeRowOpts,
+      computeCurrentRowOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
       computeResizeOpts,
@@ -1439,14 +1447,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
-      if (process.env.NODE_ENV === 'development') {
-        if (htmlColumn) {
-          if (!columnOpts.useKey) {
-            (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
-          }
-          if (!rowOpts.useKey) {
-            (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
-          }
+      if (htmlColumn) {
+        if (!columnOpts.useKey) {
+          (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+        }
+        if (!rowOpts.useKey) {
+          (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
         }
       }
       reactData.isGroup = isGroup;
@@ -2630,6 +2636,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reserve,
         checkMethod
       } = checkboxOpts;
+      // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
       /**
@@ -2950,12 +2957,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
             rowIndex: tableMethods.getRowIndex(row),
             $rowIndex: tableMethods.getVMRowIndex(row)
           }).then(() => {
-            const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
+            const rowTempExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
             if (rowRest) {
               rowRest.expandLoaded = true;
             }
-            rExpandedMaps[rowid] = row;
-            reactData.rowExpandedMaps = rExpandedMaps;
+            rowTempExpandedMaps[rowid] = row;
+            reactData.rowExpandedMaps = rowTempExpandedMaps;
           }).catch(() => {
             if (rowRest) {
               rowRest.expandLoaded = false;
@@ -3122,32 +3129,30 @@ 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 (treeConfig) {
         if (transform) {
           // 树结构自动转换
-          if (process.env.NODE_ENV === 'development') {
-            if (!treeOpts.rowField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
-            }
-            if (!treeOpts.parentField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
-            }
-            if (!childrenField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
-            }
-            if (!treeOpts.mapChildrenField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-            }
-            if (childrenField === treeOpts.mapChildrenField) {
-              (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-            }
-            // fullData.forEach(row => {
-            //   if (row[treeOpts.children] && row[treeOpts.children].length) {
-            //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
-            //   }
-            // })
+          if (!treeOpts.rowField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
+          }
+          if (!treeOpts.parentField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
           }
+          if (!childrenField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
+          }
+          if (!treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+          }
+          if (childrenField === treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+          }
+          // fullData.forEach(row => {
+          //   if (row[treeOpts.children] && row[treeOpts.children].length) {
+          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+          //   }
+          // })
           treeData = _xeUtils.default.toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
@@ -3211,16 +3216,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           //     }
           //   }
           // }
-          if (process.env.NODE_ENV === 'development') {
-            if (!(props.height || props.maxHeight)) {
-              (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-            }
-            // if (!props.showOverflow) {
-            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-            // }
-            if (props.spanMethod) {
-              (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
-            }
+          if (!(props.height || props.maxHeight)) {
+            (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+          }
+          // if (!props.showOverflow) {
+          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+          // }
+          if (props.spanMethod) {
+            (0, _log.errLog)('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -4024,6 +4027,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     tableMethods = {
       dispatchEvent,
+      getEl() {
+        return refElem.value;
+      },
       /**
        * 重置表格的一切数据状态
        */
@@ -4358,23 +4364,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         return tableMethods.createData(records).then(rows => isArr ? rows : rows[0]);
       },
-      // toOriginalRecords (rows: any[]) {
-      //   const { treeConfig } = props
-      //   const treeOpts = computeTreeOpts.value
-      //   const { transform, mapChildrenField } = treeOpts
-      //   const rowkey = getRowkey($xeTable)
-      //   if (treeConfig) {
-      //     if (transform) {
-      //       return []
-      //     }
-      //     return []
-      //   }
-      //   return rows.map(item => {
-      //     const obj = Object.assign({}, item)
-      //     delete obj.rowkey
-      //     return obj
-      //   })
-      // },
       /**
        * 还原数据
        * 如果不传任何参数，则还原整个表格
@@ -4384,15 +4373,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       revertData(rows, field) {
         const {
-          keepSource
+          keepSource,
+          treeConfig
         } = props;
         const {
+          editStore
+        } = reactData;
+        const {
+          fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
-          sourceDataRowIdData
+          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)();
         }
@@ -4404,25 +4406,52 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           targetRows = _xeUtils.default.toArray($xeTable.getUpdateRecords());
         }
+        let reDelFlag = false;
         if (targetRows.length) {
-          targetRows.forEach(row => {
-            if (!tableMethods.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));
+          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;
+                  }
                 }
               }
             }
           });
         }
         if (rows) {
-          return (0, _vue.nextTick)();
+          if (reDelFlag) {
+            editStore.removeMaps = removeTempMaps;
+            $xeTable.updateFooter();
+            $xeTable.cacheRowMap(false);
+            $xeTable.handleTableData(treeConfig && transform);
+            if (!(treeConfig && transform)) {
+              $xeTable.updateAfterDataIndex();
+            }
+            $xeTable.checkSelectionStatus();
+            if (reactData.scrollYLoad) {
+              $xeTable.updateScrollYSpace();
+            }
+          }
+          return (0, _vue.nextTick)().then(() => {
+            $xeTable.updateCellAreas();
+            return $xeTable.recalculate();
+          });
         }
-        return tableMethods.reloadData(tableSourceData);
+        return $xeTable.reloadData(tableSourceData);
       },
       /**
        * 清空单元格内容
@@ -4555,6 +4584,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const rowid = (0, _util.getRowid)($xeTable, row);
         return !!editStore.insertMaps[rowid];
       },
+      isRemoveByRow(row) {
+        const {
+          editStore
+        } = reactData;
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        return !!editStore.removeMaps[rowid];
+      },
       /**
        * 删除所有新增的临时数据
        * @returns
@@ -4568,10 +4604,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;
@@ -4581,11 +4617,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) {
@@ -4649,6 +4687,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);
+      },
       /**
        * 获取表格的全量列
        */
@@ -4672,6 +4812,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
+        const {
+          selectCheckboxMaps
+        } = reactData;
         const {
           tableFullData,
           afterFullData,
@@ -4691,19 +4834,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]) {
@@ -5486,6 +5627,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkField,
           reserve
         } = checkboxOpts;
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
           const handleClearChecked = item => {
@@ -5626,13 +5768,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();
+          }
+        });
       },
       /**
        * 用于当前列，手动清空当前高亮的状态
@@ -5883,12 +6034,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           column,
           visible
         } = filterStore;
-        Object.assign(filterStore, {
-          isAllSelected: false,
-          isIndeterminate: false,
-          options: [],
-          visible: false
-        });
+        // Object.assign(filterStore, {
+        //   isAllSelected: false,
+        //   isIndeterminate: false,
+        //   options: [],
+        //   visible: false
+        // })
         if (visible) {
           dispatchEvent('filter-visible', {
             column,
@@ -6940,7 +7091,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             keyboardConfig,
             treeConfig,
             editConfig,
-            highlightCurrentRow
+            highlightCurrentRow,
+            highlightCurrentColumn
           } = props;
           const {
             ctxMenuStore,
@@ -6958,6 +7110,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
@@ -7125,10 +7278,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 键切换
@@ -7631,7 +7789,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;
       },
@@ -7733,30 +7899,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
-        const treeOpts = computeTreeOpts.value;
+        const {
+          treeExpandedMaps
+        } = reactData;
         const {
           fullAllDataRowIdData,
           tableFullData,
           tableFullTreeData
         } = internalData;
+        const treeOpts = computeTreeOpts.value;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+        const {
+          lazy
+        } = treeOpts;
         const rowkey = (0, _util.getRowkey)($xeTable);
-        const isLazy = treeConfig && treeOpts.lazy;
-        const fullAllDataRowIdMaps = {};
+        const isDeepKey = rowkey.indexOf('.') > -1;
+        const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
-        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 (isLazy && row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
-            row[childrenField] = null;
-          }
-          let rowRest = fullAllDataRowIdData[rowid];
+        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
+        const handleRowId = isDeepKey ? _util.updateDeepRowKey : _util.updateFastRowKey;
+        const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+          let rowRest = fullAllDataRowIdMaps[rowid];
           if (!rowRest) {
             rowRest = {
               row,
@@ -7774,24 +7938,46 @@ var _default = exports.default = (0, _vue.defineComponent)({
               oTop: 0,
               expandHeight: 0
             };
+            fullDataRowIdMaps[rowid] = rowRest;
+            fullAllDataRowIdMaps[rowid] = rowRest;
           }
+          rowRest.treeLoaded = false;
+          rowRest.expandLoaded = false;
           rowRest.row = row;
           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;
         };
-        internalData.fullDataRowIdData = fullDataRowIdMaps;
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
-          _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
+          _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+            const rowid = handleRowId(row, rowkey);
+            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, handleRowId(row, rowkey), 0, index + 1);
+          });
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        reactData.treeExpandedMaps = treeTempExpandedMaps;
       },
       cacheSourceMap(fullData) {
         const {
@@ -8540,6 +8726,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkStrictly,
           checkMethod
         } = checkboxOpts;
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
           // 树结构
@@ -8753,6 +8940,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const sortOpts = computeSortOpts.value;
         const columnOpts = computeColumnOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
         const {
           column
         } = params;
@@ -8761,7 +8949,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,
@@ -8769,8 +8957,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) {
@@ -8786,6 +8974,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerCellClickEvent(evnt, params) {
         const {
           highlightCurrentRow,
+          highlightCurrentColumn,
           editConfig
         } = props;
         const {
@@ -8802,6 +8991,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
@@ -8832,29 +9023,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);
             }
           }
           // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -9390,6 +9587,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) {
@@ -9404,7 +9604,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;
@@ -9435,11 +9635,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;
@@ -9450,19 +9650,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;
@@ -9473,7 +9673,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                               content: getI18n('vxe.error.treeDragChild')
                             });
                           }
-                          return;
+                          return errRest;
                         }
                       }
                     } else {
@@ -9531,26 +9731,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 {
@@ -9719,6 +9927,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) {
@@ -9735,7 +9946,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;
@@ -9749,11 +9960,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;
@@ -9764,19 +9975,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;
@@ -9787,7 +9998,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         content: getI18n('vxe.error.treeDragChild')
                       });
                     }
-                    return;
+                    return errRest;
                   }
                 }
               } else {
@@ -9856,25 +10067,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 {
@@ -10818,18 +11036,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
     };
     // 检测对应模块是否安装
-    if (process.env.NODE_ENV === 'development') {
-      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
-        $xeTable[name] = function () {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
-        };
-      });
-      'clearValidate,fullValidate,validate'.split(',').forEach(name => {
-        $xeTable[name] = function () {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
-        };
-      });
-    }
+    'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+      $xeTable[name] = function () {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
+      };
+    });
+    'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+      $xeTable[name] = function () {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
+      };
+    });
     Object.assign($xeTable, tableMethods, tablePrivateMethods);
     /**
      * 渲染浮固定列
@@ -11808,20 +12024,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
         $table: $xeTable
       });
     });
-    if (process.env.NODE_ENV === 'development') {
-      (0, _vue.nextTick)(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !slots.loading) {
-            (0, _log.errLog)('vxe.error.reqComp', ['vxe-loading']);
-          }
+    (0, _vue.nextTick)(() => {
+      if (props.loading) {
+        if (!VxeUILoadingComponent && !slots.loading) {
+          (0, _log.errLog)('vxe.error.reqComp', ['vxe-loading']);
         }
-        if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
-          if (!VxeUITooltipComponent) {
-            (0, _log.errLog)('vxe.error.reqComp', ['vxe-tooltip']);
-          }
+      }
+      if (props.showOverflow === true || props.showOverflow === 'tooltip' || props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip' || props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip' || props.tooltipConfig || props.editRules) {
+        if (!VxeUITooltipComponent) {
+          (0, _log.errLog)('vxe.error.reqComp', ['vxe-tooltip']);
         }
-      });
-    }
+      }
+    });
     (0, _vue.provide)('$xeColgroup', null);
     (0, _vue.provide)('$xeTable', $xeTable);
     $xeTable.renderVN = renderVN;