vxe-table 3.12.0-beta.4 → 3.12.0-beta.6

package/es/table/src/body.js

@@ -48,12 +48,12 @@ function renderLine(h, _vm, $xetable, params) {
 /**
  * 渲染列
  */
-function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
-    const { $listeners: tableListeners, fullAllDataRowIdData, afterFullData, tableData, height, columnKey, overflowX, sYOpts, scrollXLoad, scrollYLoad, highlightCurrentRow, showOverflow: allColumnOverflow, isAllOverflow, align: allAlign, currentColumn, cellClassName: allCellClassName, cellStyle, mergeList, spanMethod, radioOpts, checkboxOpts, expandOpts, treeOpts, tooltipOpts, mouseConfig, editConfig, editOpts, editRules, validOpts, editStore, tooltipConfig, rowOpts, columnOpts, mouseOpts, areaOpts, validErrorMaps } = $xetable;
-    const rowDragOpts = $xetable.computeRowDragOpts;
+function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+    const { $listeners: tableListeners, fullAllDataRowIdData, afterFullData, tableData, height, columnKey, overflowX, sYOpts, scrollXLoad, scrollYLoad, highlightCurrentRow, showOverflow: allColumnOverflow, isAllOverflow, align: allAlign, currentColumn, cellClassName: allCellClassName, cellStyle, mergeList, spanMethod, radioOpts, checkboxOpts, expandOpts, treeOpts, tooltipOpts, mouseConfig, editConfig, editOpts, editRules, validOpts, editStore, tooltipConfig, rowOpts, columnOpts, mouseOpts, areaOpts, validErrorMaps } = $xeTable;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     const { disabledMethod: dragDisabledMethod } = rowDragOpts;
     const { selectCellToRow } = areaOpts;
-    const cellOpts = $xetable.computeCellOpts;
+    const cellOpts = $xeTable.computeCellOpts;
     const { type, cellRender, editRender, align, showOverflow, className, treeNode, slots } = column;
     const { verticalAlign } = cellOpts;
     const { actived } = editStore;
@@ -64,8 +64,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : '';
     const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : '';
     const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
-    const columnIndex = $xetable.getColumnIndex(column);
-    const _columnIndex = $xetable.getVTColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(column);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
     const isEdit = isEnableConf(editRender);
     let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
     const cellOverflow = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
@@ -84,19 +84,19 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     const bindMouseenter = tableListeners['cell-mouseenter'];
     const bindMouseleave = tableListeners['cell-mouseleave'];
     const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick');
-    const params = { $table: $xetable, $grid: $xetable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items };
-    let isColDragCell = false;
+    const params = { $table: $xeTable, $grid: $xeTable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items };
+    let isRowDragCell = false;
     let isDisabledDrag = false;
     if (rowOpts.drag) {
-        isColDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
+        isRowDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
     }
-    if (isColDragCell) {
+    if (isRowDragCell) {
         isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
     }
     // hover 进入事件
     if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
         tdOns.mouseenter = (evnt) => {
-            if (isVMScrollProcess($xetable)) {
+            if (isVMScrollProcess($xeTable)) {
                 return;
             }
             if (showTitle) {
@@ -104,33 +104,37 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
             }
             else if (showTooltip || showAllTip) {
                 // 如果配置了显示 tooltip
-                $xetable.triggerBodyTooltipEvent(evnt, params);
+                $xeTable.triggerBodyTooltipEvent(evnt, params);
             }
             if (bindMouseenter) {
-                $xetable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+                $xeTable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt);
             }
         };
     }
     // hover 退出事件
     if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
         tdOns.mouseleave = (evnt) => {
-            if (isVMScrollProcess($xetable)) {
+            if (isVMScrollProcess($xeTable)) {
                 return;
             }
             if (showTooltip || showAllTip) {
-                $xetable.handleTargetLeaveEvent(evnt);
+                $xeTable.handleTargetLeaveEvent(evnt);
             }
             if (bindMouseleave) {
-                $xetable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+                $xeTable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt);
             }
         };
     }
     // 按下事件处理
-    if (isColDragCell || checkboxOpts.range || mouseConfig) {
+    if (isRowDragCell || checkboxOpts.range || mouseConfig) {
         tdOns.mousedown = (evnt) => {
-            $xetable.triggerCellMousedownEvent(evnt, params);
+            $xeTable.triggerCellMousedownEvent(evnt, params);
         };
     }
+    // 拖拽列事件
+    if (isRowDragCell) {
+        tdOns.mouseup = $xeTable.triggerCellMouseupEvent;
+    }
     // 点击事件处理
     if ((rowOpts.isCurrent || highlightCurrentRow) ||
         tableListeners['cell-click'] ||
@@ -140,13 +144,13 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         (checkboxOpts.trigger === 'row' || (column.type === 'checkbox' && checkboxOpts.trigger === 'cell')) ||
         (treeOpts.trigger === 'row' || (column.treeNode && treeOpts.trigger === 'cell'))) {
         tdOns.click = (evnt) => {
-            $xetable.triggerCellClickEvent(evnt, params);
+            $xeTable.triggerCellClickEvent(evnt, params);
         };
     }
     // 双击事件处理
     if (triggerDblclick || tableListeners['cell-dblclick']) {
         tdOns.dblclick = (evnt) => {
-            $xetable.triggerCellDblclickEvent(evnt, params);
+            $xeTable.triggerCellDblclickEvent(evnt, params);
         };
     }
     // 合并行或列
@@ -186,7 +190,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }
     // 如果编辑列开启显示状态
     if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-        isDirty = $xetable.isUpdateByRow(row, column.field);
+        isDirty = $xeTable.isUpdateByRow(row, column.field);
     }
     const tdVNs = [];
     if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -203,7 +207,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, _vm, $xetable, params), h('div', {
+        tdVNs.push(...renderLine(h, _vm, $xeTable, params), h('div', {
             class: ['vxe-cell', {
                     'c--title': showTitle,
                     'c--tooltip': showTooltip,
@@ -213,7 +217,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
             },
             attrs: {
-                title: showTitle ? $xetable.getCellLabel(row, column) : null
+                title: showTitle ? $xeTable.getCellLabel(row, column) : null
             }
         }, column.renderCell(h, params)));
         if (showValidTip && errorValidItem) {
@@ -232,7 +236,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                     class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
                 }, [
                     validSlot
-                        ? $xetable.callSlot(validSlot, validParams, h)
+                        ? $xeTable.callSlot(validSlot, validParams, h)
                         : [
                             h('span', {
                                 class: 'vxe-cell--valid-error-msg'
@@ -274,7 +278,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 'col--ellipsis': hasEllipsis,
                 'fixed--width': !isAutoCellWidth,
                 'fixed--hidden': fixedHiddenColumn,
-                'is--drag-cell': isColDragCell,
+                'is--drag-cell': isRowDragCell,
                 'is--drag-disabled': isDisabledDrag,
                 'col--dirty': isDirty,
                 'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
@@ -500,7 +504,7 @@ export default {
         const { tId, $scopedSlots } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
         const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps;
-        const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
+        const { isGroup, tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
         const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData;
         const rowOpts = $xeTable.computeRowOpts;
         const sYOpts = $xeTable.computeSYOpts;
@@ -547,7 +551,7 @@ export default {
                 }
             }
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/footer.js

@@ -220,7 +220,7 @@ export default {
         const { fixedType, fixedColumn, tableColumn } = props;
         const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
         const { visibleColumn, fullColumnIdData } = tableInternalData;
-        const { scrollXLoad, scrollYLoad, scrollbarWidth, dragCol } = tableReactData;
+        const { isGroup, scrollXLoad, scrollYLoad, scrollbarWidth, dragCol } = tableReactData;
         let renderColumnList = tableColumn;
         // 如果是使用优化模式
         if (fixedType) {
@@ -238,7 +238,7 @@ export default {
                 renderColumnList = visibleColumn;
             }
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/header.js

@@ -228,7 +228,7 @@ export default {
             }
             renderHeaderList = [renderColumnList];
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/methods.js

@@ -333,6 +333,19 @@ function getOrderField(_vm, column) {
         return cellValue;
     };
 }
+function clearDragStatus($xeTable) {
+    const reactData = $xeTable;
+    const { dragRow, dragCol } = reactData;
+    if (dragRow || dragCol) {
+        clearColDropOrigin($xeTable);
+        clearRowDropOrigin($xeTable);
+        hideDropTip($xeTable);
+        reactData.dragRow = null;
+        reactData.dragCol = null;
+        reactData.isDragColMove = false;
+        reactData.isDragRowMove = false;
+    }
+}
 function clearRowDropOrigin($xeTable) {
     const el = $xeTable.$el;
     if (el) {
@@ -5196,6 +5209,10 @@ const Methods = {
             $xeTable.closeMenu();
         }
     },
+    triggerCellMouseupEvent() {
+        const $xeTable = this;
+        clearDragStatus($xeTable);
+    },
     /**
      * 行拖拽
      */
@@ -5446,12 +5463,7 @@ const Methods = {
     },
     handleCellDragMouseupEvent() {
         const $xeTable = this;
-        const reactData = $xeTable;
-        clearRowDropOrigin($xeTable);
-        hideDropTip($xeTable);
-        reactData.dragRow = null;
-        reactData.dragCol = null;
-        reactData.isDragRowMove = false;
+        clearDragStatus($xeTable);
     },
     /**
      * 列拖拽

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.0-beta.4";
+export const version = "3.12.0-beta.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.12.0-beta.4"}`;
+const version = `table v${"3.12.0-beta.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0-beta.4";
+const version = "3.12.0-beta.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.4"}`;
+const log_version = `table v${"3.12.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5322,6 +5322,22 @@ function getOrderField(_vm, column) {
     return cellValue;
   };
 }
+function clearDragStatus($xeTable) {
+  const reactData = $xeTable;
+  const {
+    dragRow,
+    dragCol
+  } = reactData;
+  if (dragRow || dragCol) {
+    clearColDropOrigin($xeTable);
+    clearRowDropOrigin($xeTable);
+    hideDropTip($xeTable);
+    reactData.dragRow = null;
+    reactData.dragCol = null;
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
+  }
+}
 function clearRowDropOrigin($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -11054,6 +11070,10 @@ const Methods = {
       $xeTable.closeMenu();
     }
   },
+  triggerCellMouseupEvent() {
+    const $xeTable = this;
+    clearDragStatus($xeTable);
+  },
   /**
    * 行拖拽
    */
@@ -11346,12 +11366,7 @@ const Methods = {
   },
   handleCellDragMouseupEvent() {
     const $xeTable = this;
-    const reactData = $xeTable;
-    clearRowDropOrigin($xeTable);
-    hideDropTip($xeTable);
-    reactData.dragRow = null;
-    reactData.dragCol = null;
-    reactData.isDragRowMove = false;
+    clearDragStatus($xeTable);
   },
   /**
    * 列拖拽
@@ -13807,7 +13822,7 @@ function renderLine(h, _vm, $xetable, params) {
 /**
  * 渲染列
  */
-function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
   const {
     $listeners: tableListeners,
     fullAllDataRowIdData,
@@ -13845,15 +13860,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     mouseOpts,
     areaOpts,
     validErrorMaps
-  } = $xetable;
-  const rowDragOpts = $xetable.computeRowDragOpts;
+  } = $xeTable;
+  const rowDragOpts = $xeTable.computeRowDragOpts;
   const {
     disabledMethod: dragDisabledMethod
   } = rowDragOpts;
   const {
     selectCellToRow
   } = areaOpts;
-  const cellOpts = $xetable.computeCellOpts;
+  const cellOpts = $xeTable.computeCellOpts;
   const {
     type,
     cellRender,
@@ -13881,8 +13896,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : '';
   const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
   const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
-  const columnIndex = $xetable.getColumnIndex(column);
-  const _columnIndex = $xetable.getVTColumnIndex(column);
+  const columnIndex = $xeTable.getColumnIndex(column);
+  const _columnIndex = $xeTable.getVTColumnIndex(column);
   const isEdit = isEnableConf(editRender);
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
   const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
@@ -13904,8 +13919,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const bindMouseleave = tableListeners['cell-mouseleave'];
   const triggerDblclick = editRender && editConfig && editOpts.trigger === 'dblclick';
   const params = {
-    $table: $xetable,
-    $grid: $xetable.$xegrid,
+    $table: $xeTable,
+    $grid: $xeTable.$xegrid,
     isEdit: false,
     seq,
     rowid,
@@ -13925,28 +13940,28 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     data: tableData,
     items
   };
-  let isColDragCell = false;
+  let isRowDragCell = false;
   let isDisabledDrag = false;
   if (rowOpts.drag) {
-    isColDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
+    isRowDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
   }
-  if (isColDragCell) {
+  if (isRowDragCell) {
     isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
   }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
-      if (isVMScrollProcess($xetable)) {
+      if (isVMScrollProcess($xeTable)) {
         return;
       }
       if (showTitle) {
         updateCellTitle(evnt.currentTarget, column);
       } else if (showTooltip || showAllTip) {
         // 如果配置了显示 tooltip
-        $xetable.triggerBodyTooltipEvent(evnt, params);
+        $xeTable.triggerBodyTooltipEvent(evnt, params);
       }
       if (bindMouseenter) {
-        $xetable.emitEvent('cell-mouseenter', Object.assign({
+        $xeTable.emitEvent('cell-mouseenter', Object.assign({
           cell: evnt.currentTarget
         }, params), evnt);
       }
@@ -13955,35 +13970,39 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = evnt => {
-      if (isVMScrollProcess($xetable)) {
+      if (isVMScrollProcess($xeTable)) {
         return;
       }
       if (showTooltip || showAllTip) {
-        $xetable.handleTargetLeaveEvent(evnt);
+        $xeTable.handleTargetLeaveEvent(evnt);
       }
       if (bindMouseleave) {
-        $xetable.emitEvent('cell-mouseleave', Object.assign({
+        $xeTable.emitEvent('cell-mouseleave', Object.assign({
           cell: evnt.currentTarget
         }, params), evnt);
       }
     };
   }
   // 按下事件处理
-  if (isColDragCell || checkboxOpts.range || mouseConfig) {
+  if (isRowDragCell || checkboxOpts.range || mouseConfig) {
     tdOns.mousedown = evnt => {
-      $xetable.triggerCellMousedownEvent(evnt, params);
+      $xeTable.triggerCellMousedownEvent(evnt, params);
     };
   }
+  // 拖拽列事件
+  if (isRowDragCell) {
+    tdOns.mouseup = $xeTable.triggerCellMouseupEvent;
+  }
   // 点击事件处理
   if (rowOpts.isCurrent || highlightCurrentRow || tableListeners['cell-click'] || editRender && editConfig || expandOpts.trigger === 'row' || expandOpts.trigger === 'cell' || radioOpts.trigger === 'row' || column.type === 'radio' && radioOpts.trigger === 'cell' || checkboxOpts.trigger === 'row' || column.type === 'checkbox' && checkboxOpts.trigger === 'cell' || treeOpts.trigger === 'row' || column.treeNode && treeOpts.trigger === 'cell') {
     tdOns.click = evnt => {
-      $xetable.triggerCellClickEvent(evnt, params);
+      $xeTable.triggerCellClickEvent(evnt, params);
     };
   }
   // 双击事件处理
   if (triggerDblclick || tableListeners['cell-dblclick']) {
     tdOns.dblclick = evnt => {
-      $xetable.triggerCellDblclickEvent(evnt, params);
+      $xeTable.triggerCellDblclickEvent(evnt, params);
     };
   }
   // 合并行或列
@@ -14028,7 +14047,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }
   // 如果编辑列开启显示状态
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-    isDirty = $xetable.isUpdateByRow(row, column.field);
+    isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const tdVNs = [];
   if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -14044,7 +14063,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, $xetable, params), h('div', {
+    tdVNs.push(...renderLine(h, _vm, $xeTable, params), h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
@@ -14054,7 +14073,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
       },
       attrs: {
-        title: showTitle ? $xetable.getCellLabel(row, column) : null
+        title: showTitle ? $xeTable.getCellLabel(row, column) : null
       }
     }, column.renderCell(h, params)));
     if (showValidTip && errorValidItem) {
@@ -14072,7 +14091,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         } : null
       }, [h('div', {
         class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
-      }, [validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
+      }, [validSlot ? $xeTable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
       }, errorValidItem.content)]])]));
     }
@@ -14104,7 +14123,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       'col--ellipsis': hasEllipsis,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
-      'is--drag-cell': isColDragCell,
+      'is--drag-cell': isRowDragCell,
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
       'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
@@ -14392,6 +14411,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       mouseConfig
     } = tableProps;
     const {
+      isGroup,
       tableData,
       scrollXLoad,
       scrollYLoad,
@@ -14448,7 +14468,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         }
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15084,7 +15104,7 @@ function renderHeads(h, _vm, headerGroups) {
       }
       renderHeaderList = [renderColumnList];
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {
@@ -15604,6 +15624,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       fullColumnIdData
     } = tableInternalData;
     const {
+      isGroup,
       scrollXLoad,
       scrollYLoad,
       scrollbarWidth,
@@ -15624,7 +15645,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         renderColumnList = visibleColumn;
       }
     }
-    if (!fixedType) {
+    if (!fixedType && !isGroup) {
       // 列拖拽
       if (scrollXLoad && dragCol) {
         if (renderColumnList.length > 2) {